From 0afebdc531be2aaa3d60c4b671543230aa0c9fba Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Fri, 20 Jul 2018 18:08:18 +0200 Subject: [PATCH] The Great Blink mv for source files, part 2. https://chromium-review.googlesource.com/1001153 --- BUILD.gn | 4 +-- atom/browser/api/atom_api_web_contents.cc | 4 +-- .../osr/osr_render_widget_host_view.cc | 2 +- .../browser/osr/osr_render_widget_host_view.h | 2 +- atom/browser/osr/osr_web_contents_view.cc | 2 +- atom/common/api/remote_object_freer.cc | 2 +- atom/common/keyboard_util.cc | 2 +- .../native_mate_converters/blink_converter.cc | 10 +++--- .../native_mate_converters/blink_converter.h | 6 ++-- .../content_converter.h | 2 +- atom/renderer/api/atom_api_renderer_ipc.cc | 2 +- .../api/atom_api_spell_check_client.cc | 4 +-- .../api/atom_api_spell_check_client.h | 6 ++-- atom/renderer/api/atom_api_web_frame.cc | 22 ++++++------ atom/renderer/api/atom_api_web_frame.h | 2 +- atom/renderer/atom_autofill_agent.cc | 12 +++---- atom/renderer/atom_autofill_agent.h | 8 ++--- atom/renderer/atom_render_frame_observer.cc | 12 +++---- atom/renderer/atom_render_frame_observer.h | 2 +- atom/renderer/atom_render_view_observer.cc | 2 +- atom/renderer/atom_renderer_client.cc | 4 +-- .../atom_sandboxed_renderer_client.cc | 4 +-- atom/renderer/content_settings_observer.cc | 6 ++-- atom/renderer/content_settings_observer.h | 2 +- atom/renderer/renderer_client_base.cc | 14 ++++---- atom/renderer/renderer_client_base.h | 2 +- .../browser/ssl/security_state_tab_helper.h | 2 +- chromium_src/chrome/common/print_messages.h | 2 +- .../printing/print_web_view_helper.cc | 36 +++++++++---------- .../renderer/printing/print_web_view_helper.h | 8 ++--- .../printing/print_web_view_helper_linux.cc | 2 +- .../printing/print_web_view_helper_mac.mm | 4 +-- .../printing/print_web_view_helper_pdf_win.cc | 2 +- .../chrome/renderer/tts_dispatcher.cc | 8 ++--- chromium_src/chrome/renderer/tts_dispatcher.h | 4 +-- electron_paks.gni | 4 +-- 36 files changed, 106 insertions(+), 106 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 73df03b75980..fd8f46a59ce4 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -232,7 +232,7 @@ static_library("electron_lib") { "//ppapi/shared_impl", "//printing", "//skia", - "//third_party/WebKit/public:blink", + "//third_party/blink/public:blink", "//third_party/boringssl", "//third_party/electron_node:node_lib", "//third_party/leveldatabase", @@ -258,7 +258,7 @@ static_library("electron_lib") { # TODO(nornagon): replace usage of SchemeRegistry by an actually exported # API of blink, then remove this from the include_dirs. - "//third_party/WebKit/Source", + "//third_party/blink/renderer", ] defines = [] diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index 7e341522ab72..8d2442c576e6 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/atom/browser/api/atom_api_web_contents.cc @@ -92,8 +92,8 @@ #include "native_mate/dictionary.h" #include "native_mate/object_template_builder.h" #include "net/url_request/url_request_context.h" -#include "third_party/WebKit/public/platform/WebInputEvent.h" -#include "third_party/WebKit/public/web/WebFindOptions.h" +#include "third_party/blink/public/platform/web_input_event.h" +#include "third_party/blink/public/web/web_find_options.h" #include "ui/display/screen.h" #include "ui/events/base_event_utils.h" diff --git a/atom/browser/osr/osr_render_widget_host_view.cc b/atom/browser/osr/osr_render_widget_host_view.cc index 4a2a0747fe2e..45482039a3fd 100644 --- a/atom/browser/osr/osr_render_widget_host_view.cc +++ b/atom/browser/osr/osr_render_widget_host_view.cc @@ -27,7 +27,7 @@ #include "content/public/browser/context_factory.h" #include "content/public/browser/render_process_host.h" #include "media/base/video_frame.h" -#include "third_party/WebKit/public/platform/WebInputEvent.h" +#include "third_party/blink/public/platform/web_input_event.h" #include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_type.h" diff --git a/atom/browser/osr/osr_render_widget_host_view.h b/atom/browser/osr/osr_render_widget_host_view.h index b81f6310f864..f901a86b12dd 100644 --- a/atom/browser/osr/osr_render_widget_host_view.h +++ b/atom/browser/osr/osr_render_widget_host_view.h @@ -31,7 +31,7 @@ #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/renderer_host/render_widget_host_view_base.h" #include "content/browser/web_contents/web_contents_view.h" -#include "third_party/WebKit/public/platform/WebVector.h" +#include "third_party/blink/public/platform/web_vector.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/ime/text_input_client.h" #include "ui/compositor/compositor.h" diff --git a/atom/browser/osr/osr_web_contents_view.cc b/atom/browser/osr/osr_web_contents_view.cc index c8223df0d8c6..e621d99aaf54 100644 --- a/atom/browser/osr/osr_web_contents_view.cc +++ b/atom/browser/osr/osr_web_contents_view.cc @@ -7,7 +7,7 @@ #include "atom/common/api/api_messages.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/render_view_host.h" -#include "third_party/WebKit/public/platform/WebScreenInfo.h" +#include "third_party/blink/public/platform/web_screen_info.h" #include "ui/display/screen.h" namespace atom { diff --git a/atom/common/api/remote_object_freer.cc b/atom/common/api/remote_object_freer.cc index 032b5cc50c8a..7429a93bad28 100644 --- a/atom/common/api/remote_object_freer.cc +++ b/atom/common/api/remote_object_freer.cc @@ -8,7 +8,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "content/public/renderer/render_frame.h" -#include "third_party/WebKit/public/web/WebLocalFrame.h" +#include "third_party/blink/public/web/web_local_frame.h" using blink::WebLocalFrame; diff --git a/atom/common/keyboard_util.cc b/atom/common/keyboard_util.cc index d0a12cb6d91b..1f42ad735a01 100644 --- a/atom/common/keyboard_util.cc +++ b/atom/common/keyboard_util.cc @@ -7,7 +7,7 @@ #include "atom/common/keyboard_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "third_party/WebKit/public/platform/WebInputEvent.h" +#include "third_party/blink/public/platform/web_input_event.h" #include "ui/events/event_constants.h" namespace atom { diff --git a/atom/common/native_mate_converters/blink_converter.cc b/atom/common/native_mate_converters/blink_converter.cc index f52ec9af2e40..6ea5a6e49fe8 100644 --- a/atom/common/native_mate_converters/blink_converter.cc +++ b/atom/common/native_mate_converters/blink_converter.cc @@ -13,11 +13,11 @@ #include "base/strings/utf_string_conversions.h" #include "content/public/browser/native_web_keyboard_event.h" #include "native_mate/dictionary.h" -#include "third_party/WebKit/public/platform/WebInputEvent.h" -#include "third_party/WebKit/public/platform/WebMouseEvent.h" -#include "third_party/WebKit/public/platform/WebMouseWheelEvent.h" -#include "third_party/WebKit/public/web/WebDeviceEmulationParams.h" -#include "third_party/WebKit/public/web/WebFindOptions.h" +#include "third_party/blink/public/platform/web_input_event.h" +#include "third_party/blink/public/platform/web_mouse_event.h" +#include "third_party/blink/public/platform/web_mouse_wheel_event.h" +#include "third_party/blink/public/web/web_device_emulation_params.h" +#include "third_party/blink/public/web/web_find_options.h" #include "ui/base/clipboard/clipboard.h" #include "ui/events/keycodes/dom/keycode_converter.h" #include "ui/events/keycodes/keyboard_code_conversion.h" diff --git a/atom/common/native_mate_converters/blink_converter.h b/atom/common/native_mate_converters/blink_converter.h index 5e6315d9b249..ecec11f44549 100644 --- a/atom/common/native_mate_converters/blink_converter.h +++ b/atom/common/native_mate_converters/blink_converter.h @@ -6,9 +6,9 @@ #define ATOM_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_ #include "native_mate/converter.h" -#include "third_party/WebKit/public/platform/WebCache.h" -#include "third_party/WebKit/public/platform/WebInputEvent.h" -#include "third_party/WebKit/public/web/WebContextMenuData.h" +#include "third_party/blink/public/platform/web_cache.h" +#include "third_party/blink/public/platform/web_input_event.h" +#include "third_party/blink/public/web/web_context_menu_data.h" namespace blink { class WebMouseEvent; diff --git a/atom/common/native_mate_converters/content_converter.h b/atom/common/native_mate_converters/content_converter.h index 18a2d5f1a7c8..f02c0a976b91 100644 --- a/atom/common/native_mate_converters/content_converter.h +++ b/atom/common/native_mate_converters/content_converter.h @@ -12,7 +12,7 @@ #include "content/public/common/referrer.h" #include "content/public/common/stop_find_action.h" #include "native_mate/converter.h" -#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h" +#include "third_party/blink/public/platform/modules/permissions/permission_status.mojom.h" namespace content { struct ContextMenuParams; diff --git a/atom/renderer/api/atom_api_renderer_ipc.cc b/atom/renderer/api/atom_api_renderer_ipc.cc index d066a7265c7f..5f1947be2020 100644 --- a/atom/renderer/api/atom_api_renderer_ipc.cc +++ b/atom/renderer/api/atom_api_renderer_ipc.cc @@ -10,7 +10,7 @@ #include "atom/common/node_includes.h" #include "content/public/renderer/render_frame.h" #include "native_mate/dictionary.h" -#include "third_party/WebKit/public/web/WebLocalFrame.h" +#include "third_party/blink/public/web/web_local_frame.h" using blink::WebLocalFrame; using content::RenderFrame; diff --git a/atom/renderer/api/atom_api_spell_check_client.cc b/atom/renderer/api/atom_api_spell_check_client.cc index 5f7985be2f82..059f7f7017b4 100644 --- a/atom/renderer/api/atom_api_spell_check_client.cc +++ b/atom/renderer/api/atom_api_spell_check_client.cc @@ -13,8 +13,8 @@ #include "chrome/renderer/spellchecker/spellcheck_worditerator.h" #include "native_mate/converter.h" #include "native_mate/dictionary.h" -#include "third_party/WebKit/public/web/WebTextCheckingCompletion.h" -#include "third_party/WebKit/public/web/WebTextCheckingResult.h" +#include "third_party/blink/public/web/web_text_checking_completion.h" +#include "third_party/blink/public/web/web_text_checking_result.h" #include "third_party/icu/source/common/unicode/uscript.h" namespace atom { diff --git a/atom/renderer/api/atom_api_spell_check_client.h b/atom/renderer/api/atom_api_spell_check_client.h index c8b5f7f4ab16..b908571429ab 100644 --- a/atom/renderer/api/atom_api_spell_check_client.h +++ b/atom/renderer/api/atom_api_spell_check_client.h @@ -12,9 +12,9 @@ #include "base/memory/weak_ptr.h" #include "chrome/renderer/spellchecker/spellcheck_worditerator.h" #include "native_mate/scoped_persistent.h" -#include "third_party/WebKit/public/platform/WebSpellCheckPanelHostClient.h" -#include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/public/web/WebTextCheckClient.h" +#include "third_party/blink/public/platform/web_spell_check_panel_host_client.h" +#include "third_party/blink/public/platform/web_vector.h" +#include "third_party/blink/public/web/web_text_check_client.h" namespace blink { struct WebTextCheckingResult; diff --git a/atom/renderer/api/atom_api_web_frame.cc b/atom/renderer/api/atom_api_web_frame.cc index f0f7ef249d73..0e96bc135053 100644 --- a/atom/renderer/api/atom_api_web_frame.cc +++ b/atom/renderer/api/atom_api_web_frame.cc @@ -18,17 +18,17 @@ #include "content/public/renderer/render_view.h" #include "native_mate/dictionary.h" #include "native_mate/object_template_builder.h" -#include "third_party/WebKit/Source/platform/weborigin/SchemeRegistry.h" -#include "third_party/WebKit/public/platform/WebCache.h" -#include "third_party/WebKit/public/web/WebDocument.h" -#include "third_party/WebKit/public/web/WebElement.h" -#include "third_party/WebKit/public/web/WebFrameWidget.h" -#include "third_party/WebKit/public/web/WebImeTextSpan.h" -#include "third_party/WebKit/public/web/WebInputMethodController.h" -#include "third_party/WebKit/public/web/WebLocalFrame.h" -#include "third_party/WebKit/public/web/WebScriptExecutionCallback.h" -#include "third_party/WebKit/public/web/WebScriptSource.h" -#include "third_party/WebKit/public/web/WebView.h" +#include "third_party/blink/public/platform/web_cache.h" +#include "third_party/blink/public/web/web_document.h" +#include "third_party/blink/public/web/web_element.h" +#include "third_party/blink/public/web/web_frame_widget.h" +#include "third_party/blink/public/web/web_ime_text_span.h" +#include "third_party/blink/public/web/web_input_method_controller.h" +#include "third_party/blink/public/web/web_local_frame.h" +#include "third_party/blink/public/web/web_script_execution_callback.h" +#include "third_party/blink/public/web/web_script_source.h" +#include "third_party/blink/public/web/web_view.h" +#include "third_party/blink/renderer/platform/weborigin/scheme_registry.h" #include "atom/common/node_includes.h" diff --git a/atom/renderer/api/atom_api_web_frame.h b/atom/renderer/api/atom_api_web_frame.h index 4cc6386abcb4..9fbdb165e697 100644 --- a/atom/renderer/api/atom_api_web_frame.h +++ b/atom/renderer/api/atom_api_web_frame.h @@ -11,7 +11,7 @@ #include "native_mate/handle.h" #include "native_mate/wrappable.h" -#include "third_party/WebKit/public/platform/WebCache.h" +#include "third_party/blink/public/platform/web_cache.h" namespace blink { class WebLocalFrame; diff --git a/atom/renderer/atom_autofill_agent.cc b/atom/renderer/atom_autofill_agent.cc index 5a8d712a82aa..7316fdf0bd65 100644 --- a/atom/renderer/atom_autofill_agent.cc +++ b/atom/renderer/atom_autofill_agent.cc @@ -9,12 +9,12 @@ #include "atom/common/api/api_messages.h" #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_view.h" -#include "third_party/WebKit/public/platform/WebKeyboardEvent.h" -#include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/public/web/WebDocument.h" -#include "third_party/WebKit/public/web/WebLocalFrame.h" -#include "third_party/WebKit/public/web/WebOptionElement.h" -#include "third_party/WebKit/public/web/WebUserGestureIndicator.h" +#include "third_party/blink/public/platform/web_keyboard_event.h" +#include "third_party/blink/public/platform/web_string.h" +#include "third_party/blink/public/web/web_document.h" +#include "third_party/blink/public/web/web_local_frame.h" +#include "third_party/blink/public/web/web_option_element.h" +#include "third_party/blink/public/web/web_user_gesture_indicator.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/geometry/rect_f.h" diff --git a/atom/renderer/atom_autofill_agent.h b/atom/renderer/atom_autofill_agent.h index 3dbacb21d3c1..d16d64e57c17 100644 --- a/atom/renderer/atom_autofill_agent.h +++ b/atom/renderer/atom_autofill_agent.h @@ -10,10 +10,10 @@ #include "base/memory/weak_ptr.h" #include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_view_observer.h" -#include "third_party/WebKit/public/web/WebAutofillClient.h" -#include "third_party/WebKit/public/web/WebFormControlElement.h" -#include "third_party/WebKit/public/web/WebInputElement.h" -#include "third_party/WebKit/public/web/WebNode.h" +#include "third_party/blink/public/web/web_autofill_client.h" +#include "third_party/blink/public/web/web_form_control_element.h" +#include "third_party/blink/public/web/web_input_element.h" +#include "third_party/blink/public/web/web_node.h" namespace atom { diff --git a/atom/renderer/atom_render_frame_observer.cc b/atom/renderer/atom_render_frame_observer.cc index a7eea2e7c025..8a2162c1811e 100644 --- a/atom/renderer/atom_render_frame_observer.cc +++ b/atom/renderer/atom_render_frame_observer.cc @@ -19,12 +19,12 @@ #include "native_mate/dictionary.h" #include "net/base/net_module.h" #include "net/grit/net_resources.h" -#include "third_party/WebKit/public/web/WebDocument.h" -#include "third_party/WebKit/public/web/WebDraggableRegion.h" -#include "third_party/WebKit/public/web/WebElement.h" -#include "third_party/WebKit/public/web/WebKit.h" -#include "third_party/WebKit/public/web/WebLocalFrame.h" -#include "third_party/WebKit/public/web/WebScriptSource.h" +#include "third_party/blink/public/web/web_document.h" +#include "third_party/blink/public/web/web_draggable_region.h" +#include "third_party/blink/public/web/web_element.h" +#include "third_party/blink/public/web/blink.h" +#include "third_party/blink/public/web/web_local_frame.h" +#include "third_party/blink/public/web/web_script_source.h" #include "ui/base/resource/resource_bundle.h" namespace atom { diff --git a/atom/renderer/atom_render_frame_observer.h b/atom/renderer/atom_render_frame_observer.h index 8c0ed6b4c03f..d085c277b750 100644 --- a/atom/renderer/atom_render_frame_observer.h +++ b/atom/renderer/atom_render_frame_observer.h @@ -10,7 +10,7 @@ #include "atom/renderer/renderer_client_base.h" #include "base/strings/string16.h" #include "content/public/renderer/render_frame_observer.h" -#include "third_party/WebKit/public/web/WebLocalFrame.h" +#include "third_party/blink/public/web/web_local_frame.h" namespace base { class ListValue; diff --git a/atom/renderer/atom_render_view_observer.cc b/atom/renderer/atom_render_view_observer.cc index 1a425dfa1d40..89abe602a431 100644 --- a/atom/renderer/atom_render_view_observer.cc +++ b/atom/renderer/atom_render_view_observer.cc @@ -7,7 +7,7 @@ #include "atom/common/api/api_messages.h" #include "content/public/renderer/render_view.h" #include "ipc/ipc_message_macros.h" -#include "third_party/WebKit/public/web/WebView.h" +#include "third_party/blink/public/web/web_view.h" namespace atom { diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc index 204f17c2cf0d..e2ddfbde244a 100644 --- a/atom/renderer/atom_renderer_client.cc +++ b/atom/renderer/atom_renderer_client.cc @@ -18,8 +18,8 @@ #include "base/command_line.h" #include "content/public/renderer/render_frame.h" #include "native_mate/dictionary.h" -#include "third_party/WebKit/public/web/WebDocument.h" -#include "third_party/WebKit/public/web/WebLocalFrame.h" +#include "third_party/blink/public/web/web_document.h" +#include "third_party/blink/public/web/web_local_frame.h" #include "atom/common/node_includes.h" #include "atom_natives.h" // NOLINT: This file is generated with js2c diff --git a/atom/renderer/atom_sandboxed_renderer_client.cc b/atom/renderer/atom_sandboxed_renderer_client.cc index f820b88cf28f..346d181b285a 100644 --- a/atom/renderer/atom_sandboxed_renderer_client.cc +++ b/atom/renderer/atom_sandboxed_renderer_client.cc @@ -20,8 +20,8 @@ #include "chrome/renderer/printing/print_web_view_helper.h" #include "content/public/renderer/render_frame.h" #include "native_mate/dictionary.h" -#include "third_party/WebKit/public/web/WebDocument.h" -#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/blink/public/web/web_document.h" +#include "third_party/blink/public/web/blink.h" #include "atom/common/node_includes.h" #include "atom_natives.h" // NOLINT: This file is generated with js2c diff --git a/atom/renderer/content_settings_observer.cc b/atom/renderer/content_settings_observer.cc index e5a50fa5e20d..ecf76347b29d 100644 --- a/atom/renderer/content_settings_observer.cc +++ b/atom/renderer/content_settings_observer.cc @@ -5,9 +5,9 @@ #include "atom/renderer/content_settings_observer.h" #include "content/public/renderer/render_frame.h" -#include "third_party/WebKit/public/platform/URLConversion.h" -#include "third_party/WebKit/public/platform/WebSecurityOrigin.h" -#include "third_party/WebKit/public/web/WebLocalFrame.h" +#include "third_party/blink/public/platform/url_conversion.h" +#include "third_party/blink/public/platform/web_security_origin.h" +#include "third_party/blink/public/web/web_local_frame.h" namespace atom { diff --git a/atom/renderer/content_settings_observer.h b/atom/renderer/content_settings_observer.h index c540226d1947..2267550e8a5a 100644 --- a/atom/renderer/content_settings_observer.h +++ b/atom/renderer/content_settings_observer.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "content/public/renderer/render_frame_observer.h" -#include "third_party/WebKit/public/platform/WebContentSettingsClient.h" +#include "third_party/blink/public/platform/web_content_settings_client.h" namespace atom { diff --git a/atom/renderer/renderer_client_base.cc b/atom/renderer/renderer_client_base.cc index 9c68469c45d4..07e52f5a7475 100644 --- a/atom/renderer/renderer_client_base.cc +++ b/atom/renderer/renderer_client_base.cc @@ -26,13 +26,13 @@ #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_view.h" #include "native_mate/dictionary.h" -#include "third_party/WebKit/Source/platform/weborigin/SchemeRegistry.h" -#include "third_party/WebKit/public/web/WebCustomElement.h" // NOLINT(build/include_alpha) -#include "third_party/WebKit/public/web/WebFrameWidget.h" -#include "third_party/WebKit/public/web/WebKit.h" -#include "third_party/WebKit/public/web/WebPluginParams.h" -#include "third_party/WebKit/public/web/WebScriptSource.h" -#include "third_party/WebKit/public/web/WebSecurityPolicy.h" +#include "third_party/blink/platform/weborigin/scheme_registry.h" +#include "third_party/blink/public/web/blink.h" +#include "third_party/blink/public/web/web_custom_element.h" // NOLINT(build/include_alpha) +#include "third_party/blink/public/web/web_frame_widget.h" +#include "third_party/blink/public/web/web_plugin_params.h" +#include "third_party/blink/public/web/web_script_source.h" +#include "third_party/blink/public/web/web_security_policy.h" #if defined(OS_MACOSX) #include "base/strings/sys_string_conversions.h" diff --git a/atom/renderer/renderer_client_base.h b/atom/renderer/renderer_client_base.h index 2b495d613a7f..fdfb6d99047c 100644 --- a/atom/renderer/renderer_client_base.h +++ b/atom/renderer/renderer_client_base.h @@ -10,7 +10,7 @@ #include "chrome/renderer/media/chrome_key_systems_provider.h" #include "content/public/renderer/content_renderer_client.h" -#include "third_party/WebKit/public/web/WebLocalFrame.h" +#include "third_party/blink/public/web/web_local_frame.h" namespace atom { diff --git a/chromium_src/chrome/browser/ssl/security_state_tab_helper.h b/chromium_src/chrome/browser/ssl/security_state_tab_helper.h index 2fcb9ffbd1c2..6a890d22e115 100644 --- a/chromium_src/chrome/browser/ssl/security_state_tab_helper.h +++ b/chromium_src/chrome/browser/ssl/security_state_tab_helper.h @@ -11,7 +11,7 @@ #include "components/security_state/core/security_state.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" -#include "third_party/WebKit/public/platform/WebSecurityStyle.h" +#include "third_party/blink/public/platform/web_security_style.h" namespace content { class NavigationHandle; diff --git a/chromium_src/chrome/common/print_messages.h b/chromium_src/chrome/common/print_messages.h index 1ca21544c252..ae42b58c4564 100644 --- a/chromium_src/chrome/common/print_messages.h +++ b/chromium_src/chrome/common/print_messages.h @@ -13,7 +13,7 @@ #include "ipc/ipc_message_macros.h" #include "printing/page_size_margins.h" #include "printing/print_job_constants.h" -#include "third_party/WebKit/public/web/WebPrintScalingOption.h" +#include "third_party/blink/public/web/web_print_scaling_option.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/native_widget_types.h" diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc index 506223fc82e6..87933807a711 100644 --- a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc +++ b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc @@ -25,24 +25,24 @@ #include "net/base/escape.h" #include "printing/pdf_metafile_skia.h" #include "printing/units.h" -#include "third_party/WebKit/public/mojom/page/page_visibility_state.mojom.h" -#include "third_party/WebKit/public/platform/WebDoubleSize.h" -#include "third_party/WebKit/public/platform/WebSize.h" -#include "third_party/WebKit/public/platform/WebURLRequest.h" -#include "third_party/WebKit/public/web/WebConsoleMessage.h" -#include "third_party/WebKit/public/web/WebDocument.h" -#include "third_party/WebKit/public/web/WebElement.h" -#include "third_party/WebKit/public/web/WebFrameClient.h" -#include "third_party/WebKit/public/web/WebFrameWidget.h" -#include "third_party/WebKit/public/web/WebLocalFrame.h" -#include "third_party/WebKit/public/web/WebPlugin.h" -#include "third_party/WebKit/public/web/WebPluginDocument.h" -#include "third_party/WebKit/public/web/WebPrintParams.h" -#include "third_party/WebKit/public/web/WebPrintScalingOption.h" -#include "third_party/WebKit/public/web/WebScriptSource.h" -#include "third_party/WebKit/public/web/WebSettings.h" -#include "third_party/WebKit/public/web/WebView.h" -#include "third_party/WebKit/public/web/WebViewClient.h" +#include "third_party/blink/public/mojom/page/page_visibility_state.mojom.h" +#include "third_party/blink/public/platform/web_double_size.h" +#include "third_party/blink/public/platform/web_size.h" +#include "third_party/blink/public/platform/web_url_request.h" +#include "third_party/blink/public/web/web_console_message.h" +#include "third_party/blink/public/web/web_document.h" +#include "third_party/blink/public/web/web_element.h" +#include "third_party/blink/public/web/web_frame_client.h" +#include "third_party/blink/public/web/web_frame_widget.h" +#include "third_party/blink/public/web/web_local_frame.h" +#include "third_party/blink/public/web/web_plugin.h" +#include "third_party/blink/public/web/web_plugin_document.h" +#include "third_party/blink/public/web/web_print_params.h" +#include "third_party/blink/public/web/web_print_scaling_option.h" +#include "third_party/blink/public/web/web_script_source.h" +#include "third_party/blink/public/web/web_settings.h" +#include "third_party/blink/public/web/web_view.h" +#include "third_party/blink/public/web/web_view_client.h" #include "third_party/skia/include/core/SkCanvas.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper.h b/chromium_src/chrome/renderer/printing/print_web_view_helper.h index f69ab823751b..b6bc0f4a9336 100644 --- a/chromium_src/chrome/renderer/printing/print_web_view_helper.h +++ b/chromium_src/chrome/renderer/printing/print_web_view_helper.h @@ -16,10 +16,10 @@ #include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_frame_observer_tracker.h" #include "printing/pdf_metafile_skia.h" -#include "third_party/WebKit/public/platform/WebCanvas.h" -#include "third_party/WebKit/public/web/WebLocalFrame.h" -#include "third_party/WebKit/public/web/WebNode.h" -#include "third_party/WebKit/public/web/WebPrintParams.h" +#include "third_party/blink/public/platform/web_canvas.h" +#include "third_party/blink/public/web/web_local_frame.h" +#include "third_party/blink/public/web/web_node.h" +#include "third_party/blink/public/web/web_print_params.h" #include "ui/gfx/geometry/size.h" struct PrintMsg_Print_Params; diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc index aedc042e6d61..018e72839b41 100644 --- a/chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc +++ b/chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc @@ -12,7 +12,7 @@ #include "printing/metafile_skia_wrapper.h" #include "printing/page_size_margins.h" #include "printing/pdf_metafile_skia.h" -#include "third_party/WebKit/public/web/WebLocalFrame.h" +#include "third_party/blink/public/web/web_local_frame.h" #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) #include "base/process/process_handle.h" diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm b/chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm index 31dea2ea33cf..022da12bd7a2 100644 --- a/chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm +++ b/chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm @@ -12,8 +12,8 @@ #include "chrome/common/print_messages.h" #include "printing/metafile_skia_wrapper.h" #include "printing/page_size_margins.h" -#include "third_party/WebKit/public/platform/WebCanvas.h" -#include "third_party/WebKit/public/web/WebLocalFrame.h" +#include "third_party/blink/public/platform/web_canvas.h" +#include "third_party/blink/public/web/web_local_frame.h" namespace printing { diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc index bbd65ebb15b1..073923d6b0b8 100644 --- a/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc +++ b/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc @@ -14,7 +14,7 @@ #include "printing/page_size_margins.h" #include "printing/pdf_metafile_skia.h" #include "printing/units.h" -#include "third_party/WebKit/public/web/WebLocalFrame.h" +#include "third_party/blink/public/web/web_local_frame.h" namespace printing { diff --git a/chromium_src/chrome/renderer/tts_dispatcher.cc b/chromium_src/chrome/renderer/tts_dispatcher.cc index 4aa82b555238..caaa1dd3093d 100644 --- a/chromium_src/chrome/renderer/tts_dispatcher.cc +++ b/chromium_src/chrome/renderer/tts_dispatcher.cc @@ -8,10 +8,10 @@ #include "chrome/common/tts_messages.h" #include "chrome/common/tts_utterance_request.h" #include "content/public/renderer/render_thread.h" -#include "third_party/WebKit/public/platform/WebSpeechSynthesisUtterance.h" -#include "third_party/WebKit/public/platform/WebSpeechSynthesisVoice.h" -#include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/public/platform/WebVector.h" +#include "third_party/blink/public/platform/web_speech_synthesis_utterance.h" +#include "third_party/blink/public/platform/web_speech_synthesis_voice.h" +#include "third_party/blink/public/platform/web_string.h" +#include "third_party/blink/public/platform/web_vector.h" using blink::WebSpeechSynthesisUtterance; using blink::WebSpeechSynthesisVoice; diff --git a/chromium_src/chrome/renderer/tts_dispatcher.h b/chromium_src/chrome/renderer/tts_dispatcher.h index 57928a3d2316..f77a32045e6f 100644 --- a/chromium_src/chrome/renderer/tts_dispatcher.h +++ b/chromium_src/chrome/renderer/tts_dispatcher.h @@ -9,8 +9,8 @@ #include "base/containers/hash_tables.h" #include "content/public/renderer/render_thread_observer.h" -#include "third_party/WebKit/public/platform/WebSpeechSynthesizer.h" -#include "third_party/WebKit/public/platform/WebSpeechSynthesizerClient.h" +#include "third_party/blink/public/platform/web_speech_synthesizer.h" +#include "third_party/blink/public/platform/web_speech_synthesizer_client.h" namespace IPC { class Message; diff --git a/electron_paks.gni b/electron_paks.gni index 989cb3834ca0..e2b769907707 100644 --- a/electron_paks.gni +++ b/electron_paks.gni @@ -26,7 +26,7 @@ template("electron_repack_percent") { deps = [ "//components/resources", "//content/app/resources", - "//third_party/WebKit/public:scaled_resources_${percent}_percent", + "//third_party/blink/public:scaled_resources_${percent}_percent", "//ui/resources", ] @@ -66,7 +66,7 @@ template("electron_extra_paks") { "//content/browser/tracing:resources", "//mojo/public/js:resources", "//net:net_resources", - "//third_party/WebKit/public:resources", + "//third_party/blink/public:resources", ] if (defined(invoker.deps)) { deps += invoker.deps