Move DevToolsEmulator from web/ to core/inspector/.

Bug: 712963 Change-Id: Ib2a85a23d3403f85c2f7c3abcc37a3d0bd84017c Reviewed-on: https://chromium-review.googlesource.com/517807 Commit-Queue: Stuart Langley <slangley@chromium.org> Reviewed-by: Kentaro Hara <haraken@chromium.org> Cr-Commit-Position: refs/heads/master@{#475721}
Denger-Network · May 31, 2017 · 64a9be3 · 64a9be3
1 parent ca6a6de
commit 64a9be3
Show file tree

Hide file tree

Showing 11 changed files with 118 additions and 121 deletions.
diff --git a/third_party/WebKit/Source/core/inspector/BUILD.gn b/third_party/WebKit/Source/core/inspector/BUILD.gn
@@ -20,6 +20,8 @@ blink_core_sources("inspector") {
     "DOMEditor.h",
     "DOMPatchSupport.cpp",
     "DOMPatchSupport.h",
+    "DevToolsEmulator.cpp",
+    "DevToolsEmulator.h",
     "DevToolsHost.cpp",
     "DevToolsHost.h",
     "IdentifiersFactory.cpp",

diff --git a/...ty/WebKit/Source/web/DevToolsEmulator.cpp → ...ource/core/inspector/DevToolsEmulator.cpp b/...ty/WebKit/Source/web/DevToolsEmulator.cpp → ...ource/core/inspector/DevToolsEmulator.cpp
diff --git a/...arty/WebKit/Source/web/DevToolsEmulator.h → .../Source/core/inspector/DevToolsEmulator.h b/...arty/WebKit/Source/web/DevToolsEmulator.h → .../Source/core/inspector/DevToolsEmulator.h
@@ -6,14 +6,14 @@
 #define DevToolsEmulator_h
 
 #include <memory>
+#include "core/CoreExport.h"
 #include "platform/heap/Handle.h"
 #include "platform/wtf/Forward.h"
 #include "platform/wtf/Optional.h"
 #include "public/platform/PointerProperties.h"
 #include "public/platform/WebFloatPoint.h"
 #include "public/platform/WebViewportStyle.h"
 #include "public/web/WebDeviceEmulationParams.h"
-#include "web/WebExport.h"
 
 namespace blink {
 
@@ -23,7 +23,7 @@ class TransformationMatrix;
 class WebInputEvent;
 class WebViewBase;
 
-class WEB_EXPORT DevToolsEmulator final
+class CORE_EXPORT DevToolsEmulator final
     : public GarbageCollectedFinalized<DevToolsEmulator> {
  public:
   ~DevToolsEmulator();
@@ -78,7 +78,7 @@ class WEB_EXPORT DevToolsEmulator final
   void ApplyViewportOverride(TransformationMatrix*);
   void UpdateRootLayerTransform();
 
-  WebViewBase* web_view_impl_;
+  WebViewBase* web_view_;
 
   bool device_metrics_enabled_;
   bool emulate_mobile_enabled_;

diff --git a/third_party/WebKit/Source/web/BUILD.gn b/third_party/WebKit/Source/web/BUILD.gn
@@ -55,8 +55,6 @@ component("web") {
     "ContextMenuClientImpl.h",
     "DedicatedWorkerMessagingProxyProviderImpl.cpp",
     "DedicatedWorkerMessagingProxyProviderImpl.h",
-    "DevToolsEmulator.cpp",
-    "DevToolsEmulator.h",
     "EditorClientImpl.cpp",
     "EditorClientImpl.h",
     "ExternalDateTimeChooser.cpp",

diff --git a/third_party/WebKit/Source/web/ChromeClientImpl.cpp b/third_party/WebKit/Source/web/ChromeClientImpl.cpp
@@ -53,6 +53,7 @@
 #include "core/html/forms/DateTimeChooser.h"
 #include "core/html/forms/DateTimeChooserClient.h"
 #include "core/html/forms/DateTimeChooserImpl.h"
+#include "core/inspector/DevToolsEmulator.h"
 #include "core/layout/HitTestResult.h"
 #include "core/layout/LayoutPart.h"
 #include "core/layout/compositing/CompositedSelection.h"
@@ -116,7 +117,6 @@
 #include "web/AudioOutputDeviceClientImpl.h"
 #include "web/ColorChooserPopupUIController.h"
 #include "web/ColorChooserUIController.h"
-#include "web/DevToolsEmulator.h"
 #include "web/ExternalDateTimeChooser.h"
 #include "web/ExternalPopupMenu.h"
 #include "web/IndexedDBClientImpl.h"

diff --git a/third_party/WebKit/Source/web/InspectorEmulationAgent.cpp b/third_party/WebKit/Source/web/InspectorEmulationAgent.cpp
@@ -8,6 +8,7 @@
 #include "core/frame/LocalFrameView.h"
 #include "core/frame/Settings.h"
 #include "core/frame/WebLocalFrameBase.h"
+#include "core/inspector/DevToolsEmulator.h"
 #include "core/inspector/protocol/DOM.h"
 #include "core/page/Page.h"
 #include "platform/geometry/DoubleRect.h"
@@ -16,7 +17,6 @@
 #include "public/platform/Platform.h"
 #include "public/platform/WebFloatPoint.h"
 #include "public/platform/WebThread.h"
-#include "web/DevToolsEmulator.h"
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/web/LocalFrameClientImpl.cpp b/third_party/WebKit/Source/web/LocalFrameClientImpl.cpp
@@ -51,6 +51,7 @@
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/HTMLPlugInElement.h"
 #include "core/input/EventHandler.h"
+#include "core/inspector/DevToolsEmulator.h"
 #include "core/layout/HitTestResult.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoadRequest.h"
@@ -105,7 +106,6 @@
 #include "public/web/WebPluginParams.h"
 #include "public/web/WebViewClient.h"
 #include "v8/include/v8.h"
-#include "web/DevToolsEmulator.h"
 #include "web/WebDevToolsAgentImpl.h"
 #include "web/WebDevToolsFrontendImpl.h"
 #include "web/WebPluginContainerImpl.h"

diff --git a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp
@@ -42,6 +42,7 @@
 #include "core/frame/LocalFrameView.h"
 #include "core/frame/Settings.h"
 #include "core/frame/WebLocalFrameBase.h"
+#include "core/inspector/DevToolsEmulator.h"
 #include "core/inspector/InspectedFrames.h"
 #include "core/inspector/InspectorAnimationAgent.h"
 #include "core/inspector/InspectorApplicationCacheAgent.h"
@@ -85,7 +86,6 @@
 #include "public/platform/WebString.h"
 #include "public/web/WebDevToolsAgentClient.h"
 #include "public/web/WebSettings.h"
-#include "web/DevToolsEmulator.h"
 #include "web/InspectorEmulationAgent.h"
 #include "web/InspectorOverlayAgent.h"
 #include "web/WebFrameWidgetImpl.h"

diff --git a/third_party/WebKit/Source/web/WebSettingsImpl.cpp b/third_party/WebKit/Source/web/WebSettingsImpl.cpp
@@ -33,9 +33,9 @@
 #include "core/frame/Settings.h"
 #include "platform/graphics/DeferredImageDecoder.h"
 
+#include "core/inspector/DevToolsEmulator.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
-#include "web/DevToolsEmulator.h"
 #include "web/WebDevToolsAgentImpl.h"
 
 namespace blink {

diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -73,6 +73,7 @@
 #include "core/input/ContextMenuAllowedScope.h"
 #include "core/input/EventHandler.h"
 #include "core/input/TouchActionUtil.h"
+#include "core/inspector/DevToolsEmulator.h"
 #include "core/layout/LayoutPart.h"
 #include "core/layout/TextAutosizer.h"
 #include "core/layout/api/LayoutViewItem.h"
@@ -165,7 +166,6 @@
 #include "web/AnimationWorkletProxyClientImpl.h"
 #include "web/CompositorWorkerProxyClientImpl.h"
 #include "web/DedicatedWorkerMessagingProxyProviderImpl.h"
-#include "web/DevToolsEmulator.h"
 #include "web/FullscreenController.h"
 #include "web/LinkHighlightImpl.h"
 #include "web/PageOverlay.h"

diff --git a/third_party/WebKit/Source/web/tests/WebViewTest.cpp b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
@@ -51,6 +51,7 @@
 #include "core/html/HTMLIFrameElement.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLTextAreaElement.h"
+#include "core/inspector/DevToolsEmulator.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoadRequest.h"
@@ -106,7 +107,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "web/DevToolsEmulator.h"
 #include "web/WebSettingsImpl.h"
 #include "web/tests/FrameTestHelpers.h"