mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

The Great Blink mv for source files, part 2.

Browse source 
https://chromium-review.googlesource.com/1001153
This commit is contained in:
Aleksei Kuzmin 2018-07-20 18:08:18 +02:00
parent 00423b06c6
commit 0afebdc531
36 changed files with 106 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BUILD.gn
View file

@ -232,7 +232,7 @@ static_library("electron_lib") {
"//ppapi/shared_impl", "//ppapi/shared_impl",
"//printing", "//printing",
"//skia", "//skia",
"//third_party/WebKit/public:blink", "//third_party/blink/public:blink",
"//third_party/boringssl", "//third_party/boringssl",
"//third_party/electron_node:node_lib", "//third_party/electron_node:node_lib",
"//third_party/leveldatabase", "//third_party/leveldatabase",
@ -258,7 +258,7 @@ static_library("electron_lib") {
# TODO(nornagon): replace usage of SchemeRegistry by an actually exported # TODO(nornagon): replace usage of SchemeRegistry by an actually exported
# API of blink, then remove this from the include_dirs. # API of blink, then remove this from the include_dirs.
"//third_party/WebKit/Source", "//third_party/blink/renderer",
] ]
defines = [] defines = []

4
atom/browser/api/atom_api_web_contents.cc
View file

@ -92,8 +92,8 @@
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "native_mate/object_template_builder.h" #include "native_mate/object_template_builder.h"
#include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context.h"
#include "third_party/WebKit/public/platform/WebInputEvent.h" #include "third_party/blink/public/platform/web_input_event.h"
#include "third_party/WebKit/public/web/WebFindOptions.h" #include "third_party/blink/public/web/web_find_options.h"
#include "ui/display/screen.h" #include "ui/display/screen.h"
#include "ui/events/base_event_utils.h" #include "ui/events/base_event_utils.h"

2
atom/browser/osr/osr_render_widget_host_view.cc
View file

@ -27,7 +27,7 @@
#include "content/public/browser/context_factory.h" #include "content/public/browser/context_factory.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
#include "media/base/video_frame.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/compositor.h"
#include "ui/compositor/layer.h" #include "ui/compositor/layer.h"
#include "ui/compositor/layer_type.h" #include "ui/compositor/layer_type.h"

2
atom/browser/osr/osr_render_widget_host_view.h
View file

@ -31,7 +31,7 @@
#include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h" #include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "content/browser/web_contents/web_contents_view.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 "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/ime/text_input_client.h" #include "ui/base/ime/text_input_client.h"
#include "ui/compositor/compositor.h" #include "ui/compositor/compositor.h"

2
atom/browser/osr/osr_web_contents_view.cc
View file

@ -7,7 +7,7 @@
#include "atom/common/api/api_messages.h" #include "atom/common/api/api_messages.h"
#include "content/browser/web_contents/web_contents_impl.h" #include "content/browser/web_contents/web_contents_impl.h"
#include "content/public/browser/render_view_host.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" #include "ui/display/screen.h"
namespace atom { namespace atom {

2
atom/common/api/remote_object_freer.cc
View file

@ -8,7 +8,7 @@
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/values.h" #include "base/values.h"
#include "content/public/renderer/render_frame.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; using blink::WebLocalFrame;

2
atom/common/keyboard_util.cc
View file

@ -7,7 +7,7 @@
#include "atom/common/keyboard_util.h" #include "atom/common/keyboard_util.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.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" #include "ui/events/event_constants.h"
namespace atom { namespace atom {

10
atom/common/native_mate_converters/blink_converter.cc
View file

@ -13,11 +13,11 @@
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/native_web_keyboard_event.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "third_party/WebKit/public/platform/WebInputEvent.h" #include "third_party/blink/public/platform/web_input_event.h"
#include "third_party/WebKit/public/platform/WebMouseEvent.h" #include "third_party/blink/public/platform/web_mouse_event.h"
#include "third_party/WebKit/public/platform/WebMouseWheelEvent.h" #include "third_party/blink/public/platform/web_mouse_wheel_event.h"
#include "third_party/WebKit/public/web/WebDeviceEmulationParams.h" #include "third_party/blink/public/web/web_device_emulation_params.h"
#include "third_party/WebKit/public/web/WebFindOptions.h" #include "third_party/blink/public/web/web_find_options.h"
#include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/clipboard.h"
#include "ui/events/keycodes/dom/keycode_converter.h" #include "ui/events/keycodes/dom/keycode_converter.h"
#include "ui/events/keycodes/keyboard_code_conversion.h" #include "ui/events/keycodes/keyboard_code_conversion.h"

6
atom/common/native_mate_converters/blink_converter.h
View file

@ -6,9 +6,9 @@
#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_ #define ATOM_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_
#include "native_mate/converter.h" #include "native_mate/converter.h"
#include "third_party/WebKit/public/platform/WebCache.h" #include "third_party/blink/public/platform/web_cache.h"
#include "third_party/WebKit/public/platform/WebInputEvent.h" #include "third_party/blink/public/platform/web_input_event.h"
#include "third_party/WebKit/public/web/WebContextMenuData.h" #include "third_party/blink/public/web/web_context_menu_data.h"
namespace blink { namespace blink {
class WebMouseEvent; class WebMouseEvent;

2
atom/common/native_mate_converters/content_converter.h
View file

@ -12,7 +12,7 @@
#include "content/public/common/referrer.h" #include "content/public/common/referrer.h"
#include "content/public/common/stop_find_action.h" #include "content/public/common/stop_find_action.h"
#include "native_mate/converter.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 { namespace content {
struct ContextMenuParams; struct ContextMenuParams;

2
atom/renderer/api/atom_api_renderer_ipc.cc
View file

@ -10,7 +10,7 @@
#include "atom/common/node_includes.h" #include "atom/common/node_includes.h"
#include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame.h"
#include "native_mate/dictionary.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 blink::WebLocalFrame;
using content::RenderFrame; using content::RenderFrame;

4
atom/renderer/api/atom_api_spell_check_client.cc
View file

@ -13,8 +13,8 @@
#include "chrome/renderer/spellchecker/spellcheck_worditerator.h" #include "chrome/renderer/spellchecker/spellcheck_worditerator.h"
#include "native_mate/converter.h" #include "native_mate/converter.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "third_party/WebKit/public/web/WebTextCheckingCompletion.h" #include "third_party/blink/public/web/web_text_checking_completion.h"
#include "third_party/WebKit/public/web/WebTextCheckingResult.h" #include "third_party/blink/public/web/web_text_checking_result.h"
#include "third_party/icu/source/common/unicode/uscript.h" #include "third_party/icu/source/common/unicode/uscript.h"
namespace atom { namespace atom {

6
atom/renderer/api/atom_api_spell_check_client.h
View file

@ -12,9 +12,9 @@
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "chrome/renderer/spellchecker/spellcheck_worditerator.h" #include "chrome/renderer/spellchecker/spellcheck_worditerator.h"
#include "native_mate/scoped_persistent.h" #include "native_mate/scoped_persistent.h"
#include "third_party/WebKit/public/platform/WebSpellCheckPanelHostClient.h" #include "third_party/blink/public/platform/web_spell_check_panel_host_client.h"
#include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/blink/public/platform/web_vector.h"
#include "third_party/WebKit/public/web/WebTextCheckClient.h" #include "third_party/blink/public/web/web_text_check_client.h"
namespace blink { namespace blink {
struct WebTextCheckingResult; struct WebTextCheckingResult;

22
atom/renderer/api/atom_api_web_frame.cc
View file

@ -18,17 +18,17 @@
#include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "native_mate/object_template_builder.h" #include "native_mate/object_template_builder.h"
#include "third_party/WebKit/Source/platform/weborigin/SchemeRegistry.h" #include "third_party/blink/public/platform/web_cache.h"
#include "third_party/WebKit/public/platform/WebCache.h" #include "third_party/blink/public/web/web_document.h"
#include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/blink/public/web/web_element.h"
#include "third_party/WebKit/public/web/WebElement.h" #include "third_party/blink/public/web/web_frame_widget.h"
#include "third_party/WebKit/public/web/WebFrameWidget.h" #include "third_party/blink/public/web/web_ime_text_span.h"
#include "third_party/WebKit/public/web/WebImeTextSpan.h" #include "third_party/blink/public/web/web_input_method_controller.h"
#include "third_party/WebKit/public/web/WebInputMethodController.h" #include "third_party/blink/public/web/web_local_frame.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/blink/public/web/web_script_execution_callback.h"
#include "third_party/WebKit/public/web/WebScriptExecutionCallback.h" #include "third_party/blink/public/web/web_script_source.h"
#include "third_party/WebKit/public/web/WebScriptSource.h" #include "third_party/blink/public/web/web_view.h"
#include "third_party/WebKit/public/web/WebView.h" #include "third_party/blink/renderer/platform/weborigin/scheme_registry.h"
#include "atom/common/node_includes.h" #include "atom/common/node_includes.h"

2
atom/renderer/api/atom_api_web_frame.h
View file

@ -11,7 +11,7 @@
#include "native_mate/handle.h" #include "native_mate/handle.h"
#include "native_mate/wrappable.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 { namespace blink {
class WebLocalFrame; class WebLocalFrame;

12
atom/renderer/atom_autofill_agent.cc
View file

@ -9,12 +9,12 @@
#include "atom/common/api/api_messages.h" #include "atom/common/api/api_messages.h"
#include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view.h"
#include "third_party/WebKit/public/platform/WebKeyboardEvent.h" #include "third_party/blink/public/platform/web_keyboard_event.h"
#include "third_party/WebKit/public/platform/WebString.h" #include "third_party/blink/public/platform/web_string.h"
#include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/blink/public/web/web_document.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/blink/public/web/web_local_frame.h"
#include "third_party/WebKit/public/web/WebOptionElement.h" #include "third_party/blink/public/web/web_option_element.h"
#include "third_party/WebKit/public/web/WebUserGestureIndicator.h" #include "third_party/blink/public/web/web_user_gesture_indicator.h"
#include "ui/events/keycodes/keyboard_codes.h" #include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/geometry/rect_f.h"

8
atom/renderer/atom_autofill_agent.h
View file

@ -10,10 +10,10 @@
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_frame_observer.h"
#include "content/public/renderer/render_view_observer.h" #include "content/public/renderer/render_view_observer.h"
#include "third_party/WebKit/public/web/WebAutofillClient.h" #include "third_party/blink/public/web/web_autofill_client.h"
#include "third_party/WebKit/public/web/WebFormControlElement.h" #include "third_party/blink/public/web/web_form_control_element.h"
#include "third_party/WebKit/public/web/WebInputElement.h" #include "third_party/blink/public/web/web_input_element.h"
#include "third_party/WebKit/public/web/WebNode.h" #include "third_party/blink/public/web/web_node.h"
namespace atom { namespace atom {

12
atom/renderer/atom_render_frame_observer.cc
View file

@ -19,12 +19,12 @@
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "net/base/net_module.h" #include "net/base/net_module.h"
#include "net/grit/net_resources.h" #include "net/grit/net_resources.h"
#include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/blink/public/web/web_document.h"
#include "third_party/WebKit/public/web/WebDraggableRegion.h" #include "third_party/blink/public/web/web_draggable_region.h"
#include "third_party/WebKit/public/web/WebElement.h" #include "third_party/blink/public/web/web_element.h"
#include "third_party/WebKit/public/web/WebKit.h" #include "third_party/blink/public/web/blink.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/blink/public/web/web_local_frame.h"
#include "third_party/WebKit/public/web/WebScriptSource.h" #include "third_party/blink/public/web/web_script_source.h"
#include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_bundle.h"
namespace atom { namespace atom {

2
atom/renderer/atom_render_frame_observer.h
View file

@ -10,7 +10,7 @@
#include "atom/renderer/renderer_client_base.h" #include "atom/renderer/renderer_client_base.h"
#include "base/strings/string16.h" #include "base/strings/string16.h"
#include "content/public/renderer/render_frame_observer.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 { namespace base {
class ListValue; class ListValue;

2
atom/renderer/atom_render_view_observer.cc
View file

@ -7,7 +7,7 @@
#include "atom/common/api/api_messages.h" #include "atom/common/api/api_messages.h"
#include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view.h"
#include "ipc/ipc_message_macros.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 { namespace atom {

4
atom/renderer/atom_renderer_client.cc
View file

@ -18,8 +18,8 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/blink/public/web/web_document.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/blink/public/web/web_local_frame.h"
#include "atom/common/node_includes.h" #include "atom/common/node_includes.h"
#include "atom_natives.h" // NOLINT: This file is generated with js2c #include "atom_natives.h" // NOLINT: This file is generated with js2c

4
atom/renderer/atom_sandboxed_renderer_client.cc
View file

@ -20,8 +20,8 @@
#include "chrome/renderer/printing/print_web_view_helper.h" #include "chrome/renderer/printing/print_web_view_helper.h"
#include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/blink/public/web/web_document.h"
#include "third_party/WebKit/public/web/WebKit.h" #include "third_party/blink/public/web/blink.h"
#include "atom/common/node_includes.h" #include "atom/common/node_includes.h"
#include "atom_natives.h" // NOLINT: This file is generated with js2c #include "atom_natives.h" // NOLINT: This file is generated with js2c

6
atom/renderer/content_settings_observer.cc
View file

@ -5,9 +5,9 @@
#include "atom/renderer/content_settings_observer.h" #include "atom/renderer/content_settings_observer.h"
#include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame.h"
#include "third_party/WebKit/public/platform/URLConversion.h" #include "third_party/blink/public/platform/url_conversion.h"
#include "third_party/WebKit/public/platform/WebSecurityOrigin.h" #include "third_party/blink/public/platform/web_security_origin.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/blink/public/web/web_local_frame.h"
namespace atom { namespace atom {

2
atom/renderer/content_settings_observer.h
View file

@ -7,7 +7,7 @@
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "content/public/renderer/render_frame_observer.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 { namespace atom {

14
atom/renderer/renderer_client_base.cc
View file

@ -26,13 +26,13 @@
#include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "third_party/WebKit/Source/platform/weborigin/SchemeRegistry.h" #include "third_party/blink/platform/weborigin/scheme_registry.h"
#include "third_party/WebKit/public/web/WebCustomElement.h" // NOLINT(build/include_alpha) #include "third_party/blink/public/web/blink.h"
#include "third_party/WebKit/public/web/WebFrameWidget.h" #include "third_party/blink/public/web/web_custom_element.h" // NOLINT(build/include_alpha)
#include "third_party/WebKit/public/web/WebKit.h" #include "third_party/blink/public/web/web_frame_widget.h"
#include "third_party/WebKit/public/web/WebPluginParams.h" #include "third_party/blink/public/web/web_plugin_params.h"
#include "third_party/WebKit/public/web/WebScriptSource.h" #include "third_party/blink/public/web/web_script_source.h"
#include "third_party/WebKit/public/web/WebSecurityPolicy.h" #include "third_party/blink/public/web/web_security_policy.h"
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"

2
atom/renderer/renderer_client_base.h
View file

@ -10,7 +10,7 @@
#include "chrome/renderer/media/chrome_key_systems_provider.h" #include "chrome/renderer/media/chrome_key_systems_provider.h"
#include "content/public/renderer/content_renderer_client.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 { namespace atom {

2
chromium_src/chrome/browser/ssl/security_state_tab_helper.h
View file

@ -11,7 +11,7 @@
#include "components/security_state/core/security_state.h" #include "components/security_state/core/security_state.h"
#include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_observer.h"
#include "content/public/browser/web_contents_user_data.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 { namespace content {
class NavigationHandle; class NavigationHandle;

2
chromium_src/chrome/common/print_messages.h
View file

@ -13,7 +13,7 @@
#include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_macros.h"
#include "printing/page_size_margins.h" #include "printing/page_size_margins.h"
#include "printing/print_job_constants.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/geometry/rect.h"
#include "ui/gfx/native_widget_types.h" #include "ui/gfx/native_widget_types.h"

36
chromium_src/chrome/renderer/printing/print_web_view_helper.cc
View file

@ -25,24 +25,24 @@
#include "net/base/escape.h" #include "net/base/escape.h"
#include "printing/pdf_metafile_skia.h" #include "printing/pdf_metafile_skia.h"
#include "printing/units.h" #include "printing/units.h"
#include "third_party/WebKit/public/mojom/page/page_visibility_state.mojom.h" #include "third_party/blink/public/mojom/page/page_visibility_state.mojom.h"
#include "third_party/WebKit/public/platform/WebDoubleSize.h" #include "third_party/blink/public/platform/web_double_size.h"
#include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/blink/public/platform/web_size.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/blink/public/platform/web_url_request.h"
#include "third_party/WebKit/public/web/WebConsoleMessage.h" #include "third_party/blink/public/web/web_console_message.h"
#include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/blink/public/web/web_document.h"
#include "third_party/WebKit/public/web/WebElement.h" #include "third_party/blink/public/web/web_element.h"
#include "third_party/WebKit/public/web/WebFrameClient.h" #include "third_party/blink/public/web/web_frame_client.h"
#include "third_party/WebKit/public/web/WebFrameWidget.h" #include "third_party/blink/public/web/web_frame_widget.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/blink/public/web/web_local_frame.h"
#include "third_party/WebKit/public/web/WebPlugin.h" #include "third_party/blink/public/web/web_plugin.h"
#include "third_party/WebKit/public/web/WebPluginDocument.h" #include "third_party/blink/public/web/web_plugin_document.h"
#include "third_party/WebKit/public/web/WebPrintParams.h" #include "third_party/blink/public/web/web_print_params.h"
#include "third_party/WebKit/public/web/WebPrintScalingOption.h" #include "third_party/blink/public/web/web_print_scaling_option.h"
#include "third_party/WebKit/public/web/WebScriptSource.h" #include "third_party/blink/public/web/web_script_source.h"
#include "third_party/WebKit/public/web/WebSettings.h" #include "third_party/blink/public/web/web_settings.h"
#include "third_party/WebKit/public/web/WebView.h" #include "third_party/blink/public/web/web_view.h"
#include "third_party/WebKit/public/web/WebViewClient.h" #include "third_party/blink/public/web/web_view_client.h"
#include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkCanvas.h"
#include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_bundle.h"

8
chromium_src/chrome/renderer/printing/print_web_view_helper.h
View file

@ -16,10 +16,10 @@
#include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_frame_observer.h"
#include "content/public/renderer/render_frame_observer_tracker.h" #include "content/public/renderer/render_frame_observer_tracker.h"
#include "printing/pdf_metafile_skia.h" #include "printing/pdf_metafile_skia.h"
#include "third_party/WebKit/public/platform/WebCanvas.h" #include "third_party/blink/public/platform/web_canvas.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/blink/public/web/web_local_frame.h"
#include "third_party/WebKit/public/web/WebNode.h" #include "third_party/blink/public/web/web_node.h"
#include "third_party/WebKit/public/web/WebPrintParams.h" #include "third_party/blink/public/web/web_print_params.h"
#include "ui/gfx/geometry/size.h" #include "ui/gfx/geometry/size.h"
struct PrintMsg_Print_Params; struct PrintMsg_Print_Params;

2
chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc
View file

@ -12,7 +12,7 @@
#include "printing/metafile_skia_wrapper.h" #include "printing/metafile_skia_wrapper.h"
#include "printing/page_size_margins.h" #include "printing/page_size_margins.h"
#include "printing/pdf_metafile_skia.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) #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
#include "base/process/process_handle.h" #include "base/process/process_handle.h"

4
chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm
View file

@ -12,8 +12,8 @@
#include "chrome/common/print_messages.h" #include "chrome/common/print_messages.h"
#include "printing/metafile_skia_wrapper.h" #include "printing/metafile_skia_wrapper.h"
#include "printing/page_size_margins.h" #include "printing/page_size_margins.h"
#include "third_party/WebKit/public/platform/WebCanvas.h" #include "third_party/blink/public/platform/web_canvas.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/blink/public/web/web_local_frame.h"
namespace printing { namespace printing {

2
chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
View file

@ -14,7 +14,7 @@
#include "printing/page_size_margins.h" #include "printing/page_size_margins.h"
#include "printing/pdf_metafile_skia.h" #include "printing/pdf_metafile_skia.h"
#include "printing/units.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 { namespace printing {

8
chromium_src/chrome/renderer/tts_dispatcher.cc
View file

@ -8,10 +8,10 @@
#include "chrome/common/tts_messages.h" #include "chrome/common/tts_messages.h"
#include "chrome/common/tts_utterance_request.h" #include "chrome/common/tts_utterance_request.h"
#include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_thread.h"
#include "third_party/WebKit/public/platform/WebSpeechSynthesisUtterance.h" #include "third_party/blink/public/platform/web_speech_synthesis_utterance.h"
#include "third_party/WebKit/public/platform/WebSpeechSynthesisVoice.h" #include "third_party/blink/public/platform/web_speech_synthesis_voice.h"
#include "third_party/WebKit/public/platform/WebString.h" #include "third_party/blink/public/platform/web_string.h"
#include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/blink/public/platform/web_vector.h"
using blink::WebSpeechSynthesisUtterance; using blink::WebSpeechSynthesisUtterance;
using blink::WebSpeechSynthesisVoice; using blink::WebSpeechSynthesisVoice;

4
chromium_src/chrome/renderer/tts_dispatcher.h
View file

@ -9,8 +9,8 @@
#include "base/containers/hash_tables.h" #include "base/containers/hash_tables.h"
#include "content/public/renderer/render_thread_observer.h" #include "content/public/renderer/render_thread_observer.h"
#include "third_party/WebKit/public/platform/WebSpeechSynthesizer.h" #include "third_party/blink/public/platform/web_speech_synthesizer.h"
#include "third_party/WebKit/public/platform/WebSpeechSynthesizerClient.h" #include "third_party/blink/public/platform/web_speech_synthesizer_client.h"
namespace IPC { namespace IPC {
class Message; class Message;

4
electron_paks.gni
View file

@ -26,7 +26,7 @@ template("electron_repack_percent") {
deps = [ deps = [
"//components/resources", "//components/resources",
"//content/app/resources", "//content/app/resources",
"//third_party/WebKit/public:scaled_resources_${percent}_percent", "//third_party/blink/public:scaled_resources_${percent}_percent",
"//ui/resources", "//ui/resources",
] ]
@ -66,7 +66,7 @@ template("electron_extra_paks") {
"//content/browser/tracing:resources", "//content/browser/tracing:resources",
"//mojo/public/js:resources", "//mojo/public/js:resources",
"//net:net_resources", "//net:net_resources",
"//third_party/WebKit/public:resources", "//third_party/blink/public:resources",
] ]
if (defined(invoker.deps)) { if (defined(invoker.deps)) {
deps += invoker.deps deps += invoker.deps