From 39bf5a7f41ac0cd016c45f02b0550901ee60ad41 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Thu, 20 Nov 2014 15:07:19 -0800 Subject: [PATCH] Start moving files from core/inspector into v8_inspector This was just a test. I'm about to write a script to automate this process. Mostly I just need to fix tools/git/move_source_file.py to work for blink. TBR=abarth@chromium.org BUG=435243 Review URL: https://codereview.chromium.org/745913002 --- engine/bindings/core/v8/v8.gypi | 2 -- engine/core/core.gni | 2 -- engine/v8_inspector/BUILD.gn | 4 ++++ engine/{core/inspector => v8_inspector}/PageDebuggerAgent.cpp | 4 ++-- engine/{core/inspector => v8_inspector}/PageDebuggerAgent.h | 4 ++-- .../core/v8 => v8_inspector}/PageScriptDebugServer.cpp | 2 +- .../core/v8 => v8_inspector}/PageScriptDebugServer.h | 0 engine/v8_inspector/inspector_backend_mojo.cc | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) rename engine/{core/inspector => v8_inspector}/PageDebuggerAgent.cpp (97%) rename engine/{core/inspector => v8_inspector}/PageDebuggerAgent.h (96%) rename engine/{bindings/core/v8 => v8_inspector}/PageScriptDebugServer.cpp (99%) rename engine/{bindings/core/v8 => v8_inspector}/PageScriptDebugServer.h (100%) diff --git a/engine/bindings/core/v8/v8.gypi b/engine/bindings/core/v8/v8.gypi index 850b3e13810..3839dfcaaae 100644 --- a/engine/bindings/core/v8/v8.gypi +++ b/engine/bindings/core/v8/v8.gypi @@ -129,8 +129,6 @@ 'WindowProxy.cpp', 'WindowProxy.h', 'WrapperTypeInfo.h', - 'PageScriptDebugServer.h', - 'PageScriptDebugServer.cpp', ], }, } diff --git a/engine/core/core.gni b/engine/core/core.gni index 87daf505b0a..121156118d4 100644 --- a/engine/core/core.gni +++ b/engine/core/core.gni @@ -1069,8 +1069,6 @@ sky_core_files = [ "inspector/JavaScriptCallFrame.h", "inspector/JSONParser.cpp", "inspector/JSONParser.h", - "inspector/PageDebuggerAgent.cpp", - "inspector/PageDebuggerAgent.h", "inspector/PromiseTracker.cpp", "inspector/PromiseTracker.h", "inspector/ScriptArguments.cpp", diff --git a/engine/v8_inspector/BUILD.gn b/engine/v8_inspector/BUILD.gn index 8aec72bb6f9..1cf63dbeec3 100644 --- a/engine/v8_inspector/BUILD.gn +++ b/engine/v8_inspector/BUILD.gn @@ -30,5 +30,9 @@ component("v8_inspector") { sources = [ "inspector_backend_mojo.cc", "inspector_backend_mojo.h", + "PageDebuggerAgent.cpp", + "PageDebuggerAgent.h", + "PageScriptDebugServer.cpp", + "PageScriptDebugServer.h", ] } diff --git a/engine/core/inspector/PageDebuggerAgent.cpp b/engine/v8_inspector/PageDebuggerAgent.cpp similarity index 97% rename from engine/core/inspector/PageDebuggerAgent.cpp rename to engine/v8_inspector/PageDebuggerAgent.cpp index 7d0d899d0d5..0d9c3ece83d 100644 --- a/engine/core/inspector/PageDebuggerAgent.cpp +++ b/engine/v8_inspector/PageDebuggerAgent.cpp @@ -28,8 +28,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" -#include "core/inspector/PageDebuggerAgent.h" +#include "sky/engine/config.h" +#include "sky/engine/v8_inspector/PageDebuggerAgent.h" #include "sky/engine/bindings/core/v8/DOMWrapperWorld.h" #include "sky/engine/bindings/core/v8/ScriptController.h" diff --git a/engine/core/inspector/PageDebuggerAgent.h b/engine/v8_inspector/PageDebuggerAgent.h similarity index 96% rename from engine/core/inspector/PageDebuggerAgent.h rename to engine/v8_inspector/PageDebuggerAgent.h index a6b21ea66ab..8a519851a3c 100644 --- a/engine/core/inspector/PageDebuggerAgent.h +++ b/engine/v8_inspector/PageDebuggerAgent.h @@ -31,8 +31,8 @@ #ifndef PageDebuggerAgent_h #define PageDebuggerAgent_h -#include "bindings/core/v8/PageScriptDebugServer.h" -#include "core/inspector/InspectorDebuggerAgent.h" +#include "sky/engine/core/inspector/InspectorDebuggerAgent.h" +#include "sky/engine/v8_inspector/PageScriptDebugServer.h" // This whole file will move to namespace inspector. namespace inspector { diff --git a/engine/bindings/core/v8/PageScriptDebugServer.cpp b/engine/v8_inspector/PageScriptDebugServer.cpp similarity index 99% rename from engine/bindings/core/v8/PageScriptDebugServer.cpp rename to engine/v8_inspector/PageScriptDebugServer.cpp index 1d9b867594b..2b549d812a7 100644 --- a/engine/bindings/core/v8/PageScriptDebugServer.cpp +++ b/engine/v8_inspector/PageScriptDebugServer.cpp @@ -29,7 +29,7 @@ */ #include "sky/engine/config.h" -#include "sky/engine/bindings/core/v8/PageScriptDebugServer.h" +#include "sky/engine/v8_inspector/PageScriptDebugServer.h" #include "gen/sky/bindings/core/v8/V8Window.h" #include "sky/engine/bindings/core/v8/DOMWrapperWorld.h" diff --git a/engine/bindings/core/v8/PageScriptDebugServer.h b/engine/v8_inspector/PageScriptDebugServer.h similarity index 100% rename from engine/bindings/core/v8/PageScriptDebugServer.h rename to engine/v8_inspector/PageScriptDebugServer.h diff --git a/engine/v8_inspector/inspector_backend_mojo.cc b/engine/v8_inspector/inspector_backend_mojo.cc index 6eb173f2aea..10c4c87436c 100644 --- a/engine/v8_inspector/inspector_backend_mojo.cc +++ b/engine/v8_inspector/inspector_backend_mojo.cc @@ -11,13 +11,13 @@ #include "mojo/public/cpp/application/connect.h" #include "mojo/public/cpp/application/service_provider_impl.h" #include "mojo/public/interfaces/application/shell.mojom.h" -#include "sky/engine/bindings/core/v8/PageScriptDebugServer.h" #include "sky/engine/core/inspector/InspectorFrontendChannel.h" #include "sky/engine/core/inspector/InspectorState.h" #include "sky/engine/core/inspector/InstrumentingAgents.h" -#include "sky/engine/core/inspector/PageDebuggerAgent.h" #include "sky/engine/platform/JSONValues.h" #include "sky/engine/v8_inspector/inspector_host.h" +#include "sky/engine/v8_inspector/PageDebuggerAgent.h" +#include "sky/engine/v8_inspector/PageScriptDebugServer.h" namespace blink {