From 41796985bcef71a225b9554c3cf660df600098d7 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 2 Dec 2014 13:00:40 -0800 Subject: [PATCH] Move many of v8_inspector dependencies out of core/ This doesn't fully separate v8_inspector from core, but it does lay the path. The next steps to removing v8_inspector is to remove all the # FIXME: Remove lines in the deps section of v8_inspector/BUILD.gn. gn check out/Debug v8_inspector will tell us if we've successfully removed all the dependencies. It's unclear if we want to remove the wtf dependency, but definitely all of the engine/core dependencies should be removed and presumably replaced with abstract interfaces which can be provided to v8_inspector by its host. Given the size of this patch (and that it's largely mechanical) I plan to TBR it. Most of this was done with tools/git/move_source_file.py TBR=yurys@chromium.org Review URL: https://codereview.chromium.org/772563003 --- engine/bindings/core/v8/ScriptController.cpp | 2 +- engine/bindings/core/v8/ScriptProfiler.cpp | 36 -------- engine/bindings/core/v8/ScriptProfiler.h | 3 - engine/bindings/core/v8/V8Binding.cpp | 1 - engine/bindings/core/v8/V8Initializer.cpp | 2 +- engine/bindings/core/v8/V8StringResource.cpp | 1 - .../v8/custom/V8InjectedScriptHostCustom.cpp | 4 +- .../v8/custom/V8InjectedScriptManager.cpp | 4 +- .../core/v8/custom/V8WindowCustom.cpp | 2 +- engine/bindings/core/v8/v8.gypi | 18 ++-- engine/bindings/scripts/scripts.gni | 2 +- engine/core/BUILD.gn | 6 -- engine/core/core.gni | 24 ------ engine/core/dom/Document.cpp | 2 +- engine/core/frame/Console.cpp | 2 +- engine/core/frame/FrameConsole.cpp | 2 +- engine/core/frame/LocalDOMWindow.cpp | 2 +- engine/core/inspector/BUILD.gn | 48 ----------- engine/core/inspector/BindingVisitors.h | 57 ------------- engine/core/inspector/InjectedScriptHost.cpp | 4 +- engine/core/inspector/InspectorNodeIds.cpp | 4 - .../core/inspector/InspectorTraceEvents.cpp | 2 +- engine/core/inspector/ScriptCallFrame.cpp | 11 --- engine/core/inspector/ScriptCallFrame.h | 5 +- engine/core/inspector/ScriptCallStack.cpp | 8 -- engine/core/inspector/ScriptCallStack.h | 3 - .../AsyncCallStackTracker.cpp | 2 +- .../AsyncCallStackTracker.h | 6 +- engine/v8_inspector/BUILD.gn | 84 +++++++++++++++++++ .../CodeGeneratorInspector.py | 0 .../CodeGeneratorInspectorStrings.py | 57 +++++++------ .../ContentSearchUtils.cpp | 4 +- .../ContentSearchUtils.h | 8 +- .../InjectedScript.cpp | 2 +- .../InjectedScript.h | 12 +-- .../InjectedScriptBase.cpp | 2 +- .../InjectedScriptBase.h | 8 +- .../InjectedScriptManager.cpp | 6 +- .../InjectedScriptManager.h | 6 +- .../InjectedScriptSource.js | 0 .../Inspector-1.1.json | 0 .../InspectorBaseAgent.cpp | 4 +- .../InspectorBaseAgent.h | 8 +- .../InspectorDebuggerAgent.cpp | 75 +++++++---------- .../InspectorDebuggerAgent.h | 22 +++-- .../InspectorFrontendChannel.h | 6 +- .../InspectorState.cpp | 5 +- .../InspectorState.h | 6 +- .../InstrumentingAgents.h | 6 +- .../inspector => v8_inspector}/JSONParser.cpp | 2 +- .../inspector => v8_inspector}/JSONParser.h | 6 +- engine/v8_inspector/PageDebuggerAgent.cpp | 2 - engine/v8_inspector/PageDebuggerAgent.h | 2 +- engine/v8_inspector/PageScriptDebugServer.cpp | 11 +-- engine/v8_inspector/PageScriptDebugServer.h | 4 +- .../PromiseTracker.cpp | 2 +- .../PromiseTracker.h | 6 +- .../ScriptBreakpoint.h | 6 +- .../ScriptDebugListener.h | 6 +- .../v8 => v8_inspector}/ScriptDebugServer.cpp | 4 +- .../v8 => v8_inspector}/ScriptDebugServer.h | 12 +-- .../ScriptPreprocessor.cpp | 2 +- .../v8 => v8_inspector}/ScriptPreprocessor.h | 6 +- .../core/v8 => v8_inspector}/ScriptRegexp.cpp | 2 +- .../core/v8 => v8_inspector}/ScriptRegexp.h | 6 +- .../generate-inspector-protocol-version | 0 engine/v8_inspector/inspector_backend_mojo.cc | 10 +-- .../inspector => v8_inspector}/protocol.json | 0 engine/web/WebLocalFrameImpl.cpp | 2 +- 69 files changed, 263 insertions(+), 412 deletions(-) delete mode 100644 engine/core/inspector/BUILD.gn delete mode 100644 engine/core/inspector/BindingVisitors.h rename engine/{core/inspector => v8_inspector}/AsyncCallStackTracker.cpp (99%) rename engine/{core/inspector => v8_inspector}/AsyncCallStackTracker.h (97%) rename engine/{core/inspector => v8_inspector}/CodeGeneratorInspector.py (100%) rename engine/{core/inspector => v8_inspector}/CodeGeneratorInspectorStrings.py (95%) rename engine/{core/inspector => v8_inspector}/ContentSearchUtils.cpp (98%) rename engine/{core/inspector => v8_inspector}/ContentSearchUtils.h (90%) rename engine/{core/inspector => v8_inspector}/InjectedScript.cpp (99%) rename engine/{core/inspector => v8_inspector}/InjectedScript.h (94%) rename engine/{core/inspector => v8_inspector}/InjectedScriptBase.cpp (99%) rename engine/{core/inspector => v8_inspector}/InjectedScriptBase.h (92%) rename engine/{core/inspector => v8_inspector}/InjectedScriptManager.cpp (97%) rename engine/{core/inspector => v8_inspector}/InjectedScriptManager.h (95%) rename engine/{core/inspector => v8_inspector}/InjectedScriptSource.js (100%) rename engine/{core/inspector => v8_inspector}/Inspector-1.1.json (100%) rename engine/{core/inspector => v8_inspector}/InspectorBaseAgent.cpp (94%) rename engine/{core/inspector => v8_inspector}/InspectorBaseAgent.h (92%) rename engine/{core/inspector => v8_inspector}/InspectorDebuggerAgent.cpp (96%) rename engine/{core/inspector => v8_inspector}/InspectorDebuggerAgent.h (95%) rename engine/{core/inspector => v8_inspector}/InspectorFrontendChannel.h (89%) rename engine/{core/inspector => v8_inspector}/InspectorState.cpp (97%) rename engine/{core/inspector => v8_inspector}/InspectorState.h (96%) rename engine/{core/inspector => v8_inspector}/InstrumentingAgents.h (78%) rename engine/{core/inspector => v8_inspector}/JSONParser.cpp (99%) rename engine/{core/inspector => v8_inspector}/JSONParser.h (92%) rename engine/{core/inspector => v8_inspector}/PromiseTracker.cpp (98%) rename engine/{core/inspector => v8_inspector}/PromiseTracker.h (86%) rename engine/{core/inspector => v8_inspector}/ScriptBreakpoint.h (92%) rename engine/{core/inspector => v8_inspector}/ScriptDebugListener.h (94%) rename engine/{bindings/core/v8 => v8_inspector}/ScriptDebugServer.cpp (99%) rename engine/{bindings/core/v8 => v8_inspector}/ScriptDebugServer.h (95%) rename engine/{bindings/core/v8 => v8_inspector}/ScriptPreprocessor.cpp (98%) rename engine/{bindings/core/v8 => v8_inspector}/ScriptPreprocessor.h (93%) rename engine/{bindings/core/v8 => v8_inspector}/ScriptRegexp.cpp (98%) rename engine/{bindings/core/v8 => v8_inspector}/ScriptRegexp.h (92%) rename engine/{core/inspector => v8_inspector}/generate-inspector-protocol-version (100%) rename engine/{core/inspector => v8_inspector}/protocol.json (100%) diff --git a/engine/bindings/core/v8/ScriptController.cpp b/engine/bindings/core/v8/ScriptController.cpp index 8ccc1eda075..8540731d055 100644 --- a/engine/bindings/core/v8/ScriptController.cpp +++ b/engine/bindings/core/v8/ScriptController.cpp @@ -58,13 +58,13 @@ #include "sky/engine/core/html/imports/HTMLImportLoader.h" #include "sky/engine/core/html/parser/HTMLDocumentParser.h" #include "sky/engine/core/inspector/InspectorTraceEvents.h" -#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/core/loader/FrameLoaderClient.h" #include "sky/engine/platform/NotImplemented.h" #include "sky/engine/platform/TraceEvent.h" #include "sky/engine/platform/UserGestureIndicator.h" #include "sky/engine/platform/Widget.h" #include "sky/engine/public/platform/Platform.h" +#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/wtf/CurrentTime.h" #include "sky/engine/wtf/StdLibExtras.h" #include "sky/engine/wtf/StringExtras.h" diff --git a/engine/bindings/core/v8/ScriptProfiler.cpp b/engine/bindings/core/v8/ScriptProfiler.cpp index 7516639781a..c49626fb960 100644 --- a/engine/bindings/core/v8/ScriptProfiler.cpp +++ b/engine/bindings/core/v8/ScriptProfiler.cpp @@ -38,7 +38,6 @@ #include "sky/engine/bindings/core/v8/V8Binding.h" #include "sky/engine/bindings/core/v8/WrapperTypeInfo.h" #include "sky/engine/core/dom/Document.h" -#include "sky/engine/core/inspector/BindingVisitors.h" #include "sky/engine/wtf/ThreadSpecific.h" #include "v8/include/v8-profiler.h" #include "v8/include/v8.h" @@ -258,41 +257,6 @@ void ScriptProfiler::initialize() profiler->SetWrapperClassInfoProvider(WrapperTypeInfo::NodeClassId, &retainedDOMInfo); } -void ScriptProfiler::visitNodeWrappers(WrappedNodeVisitor* visitor) -{ - // visitNodeWrappers() should receive a ScriptState and retrieve an Isolate - // from the ScriptState. - v8::Isolate* isolate = v8::Isolate::GetCurrent(); - v8::HandleScope handleScope(isolate); - - class DOMNodeWrapperVisitor : public v8::PersistentHandleVisitor { - public: - DOMNodeWrapperVisitor(WrappedNodeVisitor* visitor, v8::Isolate* isolate) - : m_visitor(visitor) - , m_isolate(isolate) - { - } - - virtual void VisitPersistentHandle(v8::Persistent* value, uint16_t classId) override - { - if (classId != WrapperTypeInfo::NodeClassId) - return; - // Casting to Handle is safe here, since the Persistent cannot get - // GCd during visiting. - v8::Handle* wrapper = reinterpret_cast*>(value); - ASSERT_UNUSED(m_isolate, V8Node::hasInstance(*wrapper, m_isolate)); - ASSERT((*wrapper)->IsObject()); - m_visitor->visitNode(V8Node::toNative(*wrapper)); - } - - private: - WrappedNodeVisitor* m_visitor; - v8::Isolate* m_isolate; - } wrapperVisitor(visitor, isolate); - - v8::V8::VisitHandlesWithClassIds(&wrapperVisitor); -} - ProfileNameIdleTimeMap* ScriptProfiler::currentProfileNameIdleTimeMap() { AtomicallyInitializedStatic(WTF::ThreadSpecific*, map = new WTF::ThreadSpecific); diff --git a/engine/bindings/core/v8/ScriptProfiler.h b/engine/bindings/core/v8/ScriptProfiler.h index a0105c880d9..848d681d030 100644 --- a/engine/bindings/core/v8/ScriptProfiler.h +++ b/engine/bindings/core/v8/ScriptProfiler.h @@ -40,8 +40,6 @@ namespace blink { -class ExternalStringVisitor; -class WrappedNodeVisitor; class Page; class ScriptValue; @@ -75,7 +73,6 @@ public: static void stopTrackingHeapObjects(); static unsigned requestHeapStatsUpdate(OutputStream*); static void initialize(); - static void visitNodeWrappers(WrappedNodeVisitor*); static HashMap* currentProfileNameIdleTimeMap(); static void setIdle(bool isIdle); }; diff --git a/engine/bindings/core/v8/V8Binding.cpp b/engine/bindings/core/v8/V8Binding.cpp index e394230ab58..5f5de71d450 100644 --- a/engine/bindings/core/v8/V8Binding.cpp +++ b/engine/bindings/core/v8/V8Binding.cpp @@ -43,7 +43,6 @@ #include "sky/engine/core/dom/QualifiedName.h" #include "sky/engine/core/frame/LocalFrame.h" #include "sky/engine/core/frame/Settings.h" -#include "sky/engine/core/inspector/BindingVisitors.h" #include "sky/engine/core/inspector/InspectorTraceEvents.h" #include "sky/engine/core/loader/FrameLoaderClient.h" #include "sky/engine/platform/EventTracer.h" diff --git a/engine/bindings/core/v8/V8Initializer.cpp b/engine/bindings/core/v8/V8Initializer.cpp index ea8fac62979..0818fc758e4 100644 --- a/engine/bindings/core/v8/V8Initializer.cpp +++ b/engine/bindings/core/v8/V8Initializer.cpp @@ -44,10 +44,10 @@ #include "sky/engine/core/frame/ConsoleTypes.h" #include "sky/engine/core/frame/LocalDOMWindow.h" #include "sky/engine/core/frame/LocalFrame.h" -#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/platform/EventDispatchForbiddenScope.h" #include "sky/engine/platform/TraceEvent.h" #include "sky/engine/public/platform/Platform.h" +#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/wtf/RefPtr.h" #include "sky/engine/wtf/text/WTFString.h" #include "v8/include/v8-debug.h" diff --git a/engine/bindings/core/v8/V8StringResource.cpp b/engine/bindings/core/v8/V8StringResource.cpp index 468cb237df0..6324ec28c24 100644 --- a/engine/bindings/core/v8/V8StringResource.cpp +++ b/engine/bindings/core/v8/V8StringResource.cpp @@ -27,7 +27,6 @@ #include "sky/engine/bindings/core/v8/V8StringResource.h" #include "sky/engine/bindings/core/v8/V8Binding.h" -#include "sky/engine/core/inspector/BindingVisitors.h" #include "sky/engine/wtf/MainThread.h" namespace blink { diff --git a/engine/bindings/core/v8/custom/V8InjectedScriptHostCustom.cpp b/engine/bindings/core/v8/custom/V8InjectedScriptHostCustom.cpp index 7553a749831..c5dbb72ab44 100644 --- a/engine/bindings/core/v8/custom/V8InjectedScriptHostCustom.cpp +++ b/engine/bindings/core/v8/custom/V8InjectedScriptHostCustom.cpp @@ -37,7 +37,6 @@ #include "bindings/core/v8/V8NodeList.h" #include "sky/engine/bindings/core/v8/BindingSecurity.h" #include "sky/engine/bindings/core/v8/ExceptionState.h" -#include "sky/engine/bindings/core/v8/ScriptDebugServer.h" #include "sky/engine/bindings/core/v8/ScriptValue.h" #include "sky/engine/bindings/core/v8/V8AbstractEventListener.h" #include "sky/engine/bindings/core/v8/V8Binding.h" @@ -53,10 +52,11 @@ #include "sky/engine/bindings/core/v8/custom/V8Uint8ClampedArrayCustom.h" #include "sky/engine/core/events/EventTarget.h" #include "sky/engine/core/frame/LocalDOMWindow.h" -#include "sky/engine/core/inspector/InjectedScript.h" #include "sky/engine/core/inspector/InjectedScriptHost.h" #include "sky/engine/core/inspector/JavaScriptCallFrame.h" #include "sky/engine/platform/JSONValues.h" +#include "sky/engine/v8_inspector/InjectedScript.h" +#include "sky/engine/v8_inspector/ScriptDebugServer.h" namespace blink { diff --git a/engine/bindings/core/v8/custom/V8InjectedScriptManager.cpp b/engine/bindings/core/v8/custom/V8InjectedScriptManager.cpp index 36b0f5b84cc..945b5f9cf8a 100644 --- a/engine/bindings/core/v8/custom/V8InjectedScriptManager.cpp +++ b/engine/bindings/core/v8/custom/V8InjectedScriptManager.cpp @@ -29,19 +29,19 @@ */ #include "sky/engine/config.h" -#include "sky/engine/core/inspector/InjectedScriptManager.h" +#include "sky/engine/v8_inspector/InjectedScriptManager.h" #include "bindings/core/v8/V8InjectedScriptHost.h" #include "bindings/core/v8/V8Window.h" #include "sky/engine/bindings/core/v8/BindingSecurity.h" #include "sky/engine/bindings/core/v8/ScopedPersistent.h" -#include "sky/engine/bindings/core/v8/ScriptDebugServer.h" #include "sky/engine/bindings/core/v8/ScriptValue.h" #include "sky/engine/bindings/core/v8/V8Binding.h" #include "sky/engine/bindings/core/v8/V8ObjectConstructor.h" #include "sky/engine/bindings/core/v8/V8ScriptRunner.h" #include "sky/engine/core/frame/LocalDOMWindow.h" #include "sky/engine/core/inspector/InjectedScriptHost.h" +#include "sky/engine/v8_inspector/ScriptDebugServer.h" #include "sky/engine/wtf/RefPtr.h" namespace blink { diff --git a/engine/bindings/core/v8/custom/V8WindowCustom.cpp b/engine/bindings/core/v8/custom/V8WindowCustom.cpp index 9534285b780..781862b8d5d 100644 --- a/engine/bindings/core/v8/custom/V8WindowCustom.cpp +++ b/engine/bindings/core/v8/custom/V8WindowCustom.cpp @@ -54,8 +54,8 @@ #include "sky/engine/core/frame/LocalFrame.h" #include "sky/engine/core/frame/Settings.h" #include "sky/engine/core/html/HTMLDocument.h" -#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/platform/PlatformScreen.h" +#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/wtf/ArrayBuffer.h" #include "sky/engine/wtf/Assertions.h" #include "sky/engine/wtf/OwnPtr.h" diff --git a/engine/bindings/core/v8/v8.gypi b/engine/bindings/core/v8/v8.gypi index 3839dfcaaae..d16142cd959 100644 --- a/engine/bindings/core/v8/v8.gypi +++ b/engine/bindings/core/v8/v8.gypi @@ -23,15 +23,15 @@ 'CustomElementConstructorBuilder.h', 'CustomElementWrapper.cpp', 'CustomElementWrapper.h', + 'Dictionary.cpp', + 'Dictionary.h', + 'DictionaryHelperForBindings.h', + 'DictionaryHelperForCore.cpp', 'DOMDataStore.cpp', 'DOMDataStore.h', 'DOMWrapperMap.h', 'DOMWrapperWorld.cpp', 'DOMWrapperWorld.h', - 'Dictionary.cpp', - 'Dictionary.h', - 'DictionaryHelperForBindings.h', - 'DictionaryHelperForCore.cpp', 'ExceptionMessages.cpp', 'ExceptionMessages.h', 'ExceptionState.cpp', @@ -55,22 +55,16 @@ 'ScriptGCEvent.h', 'ScriptHeapSnapshot.cpp', 'ScriptHeapSnapshot.h', - 'ScriptPreprocessor.cpp', - 'ScriptPreprocessor.h', 'ScriptProfiler.cpp', 'ScriptProfiler.h', 'ScriptPromise.cpp', 'ScriptPromise.h', - 'ScriptDebugServer.cpp', - 'ScriptDebugServer.h', - 'ScriptPromiseResolver.cpp', - 'ScriptPromiseResolver.h', 'ScriptPromiseProperties.h', 'ScriptPromiseProperty.h', 'ScriptPromisePropertyBase.cpp', 'ScriptPromisePropertyBase.h', - 'ScriptRegexp.cpp', - 'ScriptRegexp.h', + 'ScriptPromiseResolver.cpp', + 'ScriptPromiseResolver.h', 'ScriptSourceCode.h', 'ScriptState.cpp', 'ScriptState.h', diff --git a/engine/bindings/scripts/scripts.gni b/engine/bindings/scripts/scripts.gni index 431c49710d1..e0d3900fd9a 100644 --- a/engine/bindings/scripts/scripts.gni +++ b/engine/bindings/scripts/scripts.gni @@ -46,10 +46,10 @@ template("compute_interfaces_info_individual") { inputs = [ "$bindings_scripts_dir/utilities.py", - file_list, ] + invoker.sources_static + invoker.sources_generated outputs = [ + file_list, invoker.output_file ] diff --git a/engine/core/BUILD.gn b/engine/core/BUILD.gn index 8619f38c9bb..f0c4029f76f 100644 --- a/engine/core/BUILD.gn +++ b/engine/core/BUILD.gn @@ -43,7 +43,6 @@ source_set("prerequisites") { ":make_core_generated", "//sky/engine/bindings/core/v8:bindings_core_v8_generated", "//sky/engine/platform", - "inspector:protocol_sources", ] forward_dependent_configs_from = [ @@ -111,11 +110,6 @@ source_set("core_generated") { # Additional .cpp files from the make_core_generated rules. "$sky_core_output_dir/CSSGrammar.cpp", - - # Additional .cpp files from the inspector_protocol_sources list. - "$sky_core_output_dir/InspectorFrontend.cpp", - "$sky_core_output_dir/InspectorBackendDispatcher.cpp", - "$sky_core_output_dir/InspectorTypeBuilder.cpp", ] configs += [ diff --git a/engine/core/core.gni b/engine/core/core.gni index 2a3b18a6b90..0ffce25ea6e 100644 --- a/engine/core/core.gni +++ b/engine/core/core.gni @@ -1024,45 +1024,23 @@ sky_core_files = [ "html/VoidCallback.h", "Init.cpp", "Init.h", - "inspector/AsyncCallStackTracker.cpp", - "inspector/AsyncCallStackTracker.h", - "inspector/BindingVisitors.h", "inspector/ConsoleAPITypes.h", "inspector/ConsoleMessage.cpp", "inspector/ConsoleMessage.h", "inspector/ConsoleMessageStorage.cpp", "inspector/ConsoleMessageStorage.h", - "inspector/ContentSearchUtils.cpp", - "inspector/ContentSearchUtils.h", "inspector/IdentifiersFactory.cpp", "inspector/IdentifiersFactory.h", - "inspector/InjectedScript.cpp", - "inspector/InjectedScript.h", - "inspector/InjectedScriptBase.cpp", - "inspector/InjectedScriptBase.h", "inspector/InjectedScriptHost.cpp", "inspector/InjectedScriptHost.h", - "inspector/InjectedScriptManager.cpp", - "inspector/InjectedScriptManager.h", - "inspector/InspectorBaseAgent.cpp", - "inspector/InspectorBaseAgent.h", "inspector/InspectorCounters.cpp", "inspector/InspectorCounters.h", - "inspector/InspectorDebuggerAgent.cpp", - "inspector/InspectorDebuggerAgent.h", - "inspector/InspectorFrontendChannel.h", "inspector/InspectorNodeIds.cpp", "inspector/InspectorNodeIds.h", - "inspector/InspectorState.cpp", - "inspector/InspectorState.h", "inspector/InspectorTraceEvents.cpp", "inspector/InspectorTraceEvents.h", "inspector/JavaScriptCallFrame.cpp", "inspector/JavaScriptCallFrame.h", - "inspector/JSONParser.cpp", - "inspector/JSONParser.h", - "inspector/PromiseTracker.cpp", - "inspector/PromiseTracker.h", "inspector/ScriptArguments.cpp", "inspector/ScriptArguments.h", "inspector/ScriptAsyncCallStack.cpp", @@ -1072,8 +1050,6 @@ sky_core_files = [ "inspector/ScriptCallStack.cpp", "inspector/ScriptCallStack.h", "inspector/ScriptGCEventListener.h", - "inspector/ScriptProfile.cpp", - "inspector/ScriptProfile.h", "loader/DocumentLoadTiming.cpp", "loader/DocumentLoadTiming.h", "loader/EmptyClients.cpp", diff --git a/engine/core/dom/Document.cpp b/engine/core/dom/Document.cpp index bfc947384d1..58d8ba1d7a0 100644 --- a/engine/core/dom/Document.cpp +++ b/engine/core/dom/Document.cpp @@ -115,7 +115,6 @@ #include "sky/engine/core/inspector/ConsoleMessage.h" #include "sky/engine/core/inspector/InspectorCounters.h" #include "sky/engine/core/inspector/InspectorTraceEvents.h" -#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/core/loader/FrameLoaderClient.h" #include "sky/engine/core/loader/ImageLoader.h" #include "sky/engine/core/page/Chrome.h" @@ -137,6 +136,7 @@ #include "sky/engine/platform/text/SegmentedString.h" #include "sky/engine/platform/weborigin/SchemeRegistry.h" #include "sky/engine/public/platform/Platform.h" +#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/wtf/CurrentTime.h" #include "sky/engine/wtf/DateMath.h" #include "sky/engine/wtf/HashFunctions.h" diff --git a/engine/core/frame/Console.cpp b/engine/core/frame/Console.cpp index 66d5b2d57e6..b4f20988db9 100644 --- a/engine/core/frame/Console.cpp +++ b/engine/core/frame/Console.cpp @@ -36,10 +36,10 @@ #include "sky/engine/core/frame/LocalFrame.h" #include "sky/engine/core/inspector/ConsoleAPITypes.h" #include "sky/engine/core/inspector/ScriptArguments.h" -#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/core/page/Chrome.h" #include "sky/engine/core/page/ChromeClient.h" #include "sky/engine/platform/TraceEvent.h" +#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/wtf/text/CString.h" #include "sky/engine/wtf/text/WTFString.h" diff --git a/engine/core/frame/FrameConsole.cpp b/engine/core/frame/FrameConsole.cpp index 5b59d7a88d2..4bb1fe3419a 100644 --- a/engine/core/frame/FrameConsole.cpp +++ b/engine/core/frame/FrameConsole.cpp @@ -35,11 +35,11 @@ #include "sky/engine/core/inspector/ConsoleMessage.h" #include "sky/engine/core/inspector/ConsoleMessageStorage.h" #include "sky/engine/core/inspector/ScriptArguments.h" -#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/core/page/Chrome.h" #include "sky/engine/core/page/ChromeClient.h" #include "sky/engine/core/page/Page.h" #include "sky/engine/platform/network/ResourceResponse.h" +#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/wtf/text/StringBuilder.h" namespace blink { diff --git a/engine/core/frame/LocalDOMWindow.cpp b/engine/core/frame/LocalDOMWindow.cpp index 19bff498370..d9e7160512c 100644 --- a/engine/core/frame/LocalDOMWindow.cpp +++ b/engine/core/frame/LocalDOMWindow.cpp @@ -69,7 +69,6 @@ #include "sky/engine/core/inspector/ConsoleMessage.h" #include "sky/engine/core/inspector/ConsoleMessageStorage.h" #include "sky/engine/core/inspector/InspectorTraceEvents.h" -#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/core/loader/FrameLoaderClient.h" #include "sky/engine/core/page/Chrome.h" #include "sky/engine/core/page/ChromeClient.h" @@ -84,6 +83,7 @@ #include "sky/engine/platform/weborigin/KURL.h" #include "sky/engine/platform/weborigin/SecurityPolicy.h" #include "sky/engine/public/platform/Platform.h" +#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/wtf/MainThread.h" #include "sky/engine/wtf/MathExtras.h" #include "sky/engine/wtf/text/WTFString.h" diff --git a/engine/core/inspector/BUILD.gn b/engine/core/inspector/BUILD.gn deleted file mode 100644 index a044b03f90b..00000000000 --- a/engine/core/inspector/BUILD.gn +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//sky/engine/bindings/bindings.gni") -import("//sky/engine/core/core.gni") - -protocol_file = "protocol.json" - -action("protocol_sources") { - script = "CodeGeneratorInspector.py" - - inputs = [ - # The helper script imported by CodeGeneratorInspector.py. - "CodeGeneratorInspectorStrings.py", - protocol_file, - ] - outputs = [ - "$sky_core_output_dir/InspectorBackendDispatcher.cpp", - "$sky_core_output_dir/InspectorBackendDispatcher.h", - "$sky_core_output_dir/InspectorFrontend.cpp", - "$sky_core_output_dir/InspectorFrontend.h", - "$sky_core_output_dir/InspectorTypeBuilder.cpp", - "$sky_core_output_dir/InspectorTypeBuilder.h", - ] - - args = [ - rebase_path(protocol_file, root_build_dir), - "--output_dir", rebase_path(sky_core_output_dir, root_build_dir), - ] - - deps = [ - ":protocol_version", - ] -} - -action("protocol_version") { - script = "generate-inspector-protocol-version" - - inputs = [ protocol_file ] - output_file = "$sky_core_output_dir/InspectorProtocolVersion.h" - outputs = [ output_file ] - - args = [ - "-o", rebase_path(output_file, root_build_dir), - rebase_path(protocol_file, root_build_dir), - ] -} \ No newline at end of file diff --git a/engine/core/inspector/BindingVisitors.h b/engine/core/inspector/BindingVisitors.h deleted file mode 100644 index 69bd3ce6fd8..00000000000 --- a/engine/core/inspector/BindingVisitors.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2011 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef SKY_ENGINE_CORE_INSPECTOR_BINDINGVISITORS_H_ -#define SKY_ENGINE_CORE_INSPECTOR_BINDINGVISITORS_H_ - -namespace WTF { -class ArrayBufferView; -class StringImpl; -} - -namespace blink { - -class Node; - -class WrappedNodeVisitor { -public: - virtual void visitNode(Node*) = 0; -protected: - virtual ~WrappedNodeVisitor() { } -}; - -class ExternalStringVisitor { -public: - virtual void visitJSExternalString(WTF::StringImpl*) = 0; -protected: - virtual ~ExternalStringVisitor() { } -}; - -} // namespace blink - -#endif // SKY_ENGINE_CORE_INSPECTOR_BINDINGVISITORS_H_ diff --git a/engine/core/inspector/InjectedScriptHost.cpp b/engine/core/inspector/InjectedScriptHost.cpp index 918b5b5827c..3a51bb3d8ce 100644 --- a/engine/core/inspector/InjectedScriptHost.cpp +++ b/engine/core/inspector/InjectedScriptHost.cpp @@ -31,9 +31,9 @@ #include "sky/engine/config.h" #include "sky/engine/core/inspector/InjectedScriptHost.h" -#include "sky/engine/core/inspector/InspectorDebuggerAgent.h" -#include "sky/engine/core/inspector/InstrumentingAgents.h" #include "sky/engine/platform/JSONValues.h" +#include "sky/engine/v8_inspector/InspectorDebuggerAgent.h" +#include "sky/engine/v8_inspector/InstrumentingAgents.h" #include "sky/engine/wtf/RefPtr.h" #include "sky/engine/wtf/text/StringBuilder.h" diff --git a/engine/core/inspector/InspectorNodeIds.cpp b/engine/core/inspector/InspectorNodeIds.cpp index a09d0916f79..49a15f8a27c 100644 --- a/engine/core/inspector/InspectorNodeIds.cpp +++ b/engine/core/inspector/InspectorNodeIds.cpp @@ -5,11 +5,7 @@ #include "sky/engine/config.h" #include "sky/engine/core/inspector/InspectorNodeIds.h" -#if ENABLE(OILPAN) -#include "sky/engine/core/dom/Node.h" -#else #include "sky/engine/core/dom/WeakNodeMap.h" -#endif #include "sky/engine/platform/heap/Handle.h" namespace blink { diff --git a/engine/core/inspector/InspectorTraceEvents.cpp b/engine/core/inspector/InspectorTraceEvents.cpp index d1ef2f9fe52..3aa0952df20 100644 --- a/engine/core/inspector/InspectorTraceEvents.cpp +++ b/engine/core/inspector/InspectorTraceEvents.cpp @@ -15,7 +15,6 @@ #include "sky/engine/core/frame/LocalFrame.h" #include "sky/engine/core/inspector/IdentifiersFactory.h" #include "sky/engine/core/inspector/InspectorNodeIds.h" -#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/core/page/Page.h" #include "sky/engine/core/rendering/RenderImage.h" #include "sky/engine/core/rendering/RenderObject.h" @@ -24,6 +23,7 @@ #include "sky/engine/platform/network/ResourceRequest.h" #include "sky/engine/platform/network/ResourceResponse.h" #include "sky/engine/platform/weborigin/KURL.h" +#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/wtf/Vector.h" namespace blink { diff --git a/engine/core/inspector/ScriptCallFrame.cpp b/engine/core/inspector/ScriptCallFrame.cpp index a7cd273eb69..fb0e6ebd6af 100644 --- a/engine/core/inspector/ScriptCallFrame.cpp +++ b/engine/core/inspector/ScriptCallFrame.cpp @@ -55,15 +55,4 @@ ScriptCallFrame::~ScriptCallFrame() { } -PassRefPtr ScriptCallFrame::buildInspectorObject() const -{ - return TypeBuilder::Console::CallFrame::create() - .setFunctionName(m_functionName) - .setScriptId(m_scriptId) - .setUrl(m_scriptName) - .setLineNumber(m_lineNumber) - .setColumnNumber(m_column) - .release(); -} - } // namespace blink diff --git a/engine/core/inspector/ScriptCallFrame.h b/engine/core/inspector/ScriptCallFrame.h index 766354afab9..1458cb171d1 100644 --- a/engine/core/inspector/ScriptCallFrame.h +++ b/engine/core/inspector/ScriptCallFrame.h @@ -31,13 +31,12 @@ #ifndef SKY_ENGINE_CORE_INSPECTOR_SCRIPTCALLFRAME_H_ #define SKY_ENGINE_CORE_INSPECTOR_SCRIPTCALLFRAME_H_ -#include "gen/sky/core/InspectorTypeBuilder.h" #include "sky/engine/wtf/Forward.h" #include "sky/engine/wtf/text/WTFString.h" namespace blink { -class ScriptCallFrame { +class ScriptCallFrame { public: ScriptCallFrame(); ScriptCallFrame(const String& functionName, const String& scriptId, const String& scriptName, unsigned lineNumber, unsigned column = 0); @@ -49,8 +48,6 @@ public: unsigned lineNumber() const { return m_lineNumber; } unsigned columnNumber() const { return m_column; } - PassRefPtr buildInspectorObject() const; - private: String m_functionName; String m_scriptId; diff --git a/engine/core/inspector/ScriptCallStack.cpp b/engine/core/inspector/ScriptCallStack.cpp index b6cda2c6759..4815bc583dd 100644 --- a/engine/core/inspector/ScriptCallStack.cpp +++ b/engine/core/inspector/ScriptCallStack.cpp @@ -68,12 +68,4 @@ void ScriptCallStack::setAsyncCallStack(PassRefPtr asyncCa m_asyncCallStack = asyncCallStack; } -PassRefPtr > ScriptCallStack::buildInspectorArray() const -{ - RefPtr > frames = TypeBuilder::Array::create(); - for (size_t i = 0; i < m_frames.size(); i++) - frames->addItem(m_frames.at(i).buildInspectorObject()); - return frames; -} - } // namespace blink diff --git a/engine/core/inspector/ScriptCallStack.h b/engine/core/inspector/ScriptCallStack.h index 8e9ca12f959..f763f243d4f 100644 --- a/engine/core/inspector/ScriptCallStack.h +++ b/engine/core/inspector/ScriptCallStack.h @@ -31,7 +31,6 @@ #ifndef SKY_ENGINE_CORE_INSPECTOR_SCRIPTCALLSTACK_H_ #define SKY_ENGINE_CORE_INSPECTOR_SCRIPTCALLSTACK_H_ -#include "gen/sky/core/InspectorTypeBuilder.h" #include "sky/engine/core/inspector/ScriptCallFrame.h" #include "sky/engine/platform/heap/Handle.h" #include "sky/engine/wtf/Forward.h" @@ -55,8 +54,6 @@ public: PassRefPtr asyncCallStack() const; void setAsyncCallStack(PassRefPtr); - PassRefPtr > buildInspectorArray() const; - private: explicit ScriptCallStack(Vector&); diff --git a/engine/core/inspector/AsyncCallStackTracker.cpp b/engine/v8_inspector/AsyncCallStackTracker.cpp similarity index 99% rename from engine/core/inspector/AsyncCallStackTracker.cpp rename to engine/v8_inspector/AsyncCallStackTracker.cpp index fdd47aa41f1..019a5c1ae21 100644 --- a/engine/core/inspector/AsyncCallStackTracker.cpp +++ b/engine/v8_inspector/AsyncCallStackTracker.cpp @@ -29,7 +29,7 @@ */ #include "sky/engine/config.h" -#include "sky/engine/core/inspector/AsyncCallStackTracker.h" +#include "sky/engine/v8_inspector/AsyncCallStackTracker.h" #include "sky/engine/bindings/core/v8/V8Binding.h" #include "sky/engine/bindings/core/v8/V8RecursionScope.h" diff --git a/engine/core/inspector/AsyncCallStackTracker.h b/engine/v8_inspector/AsyncCallStackTracker.h similarity index 97% rename from engine/core/inspector/AsyncCallStackTracker.h rename to engine/v8_inspector/AsyncCallStackTracker.h index 73f07ae46ce..8127407bac1 100644 --- a/engine/core/inspector/AsyncCallStackTracker.h +++ b/engine/v8_inspector/AsyncCallStackTracker.h @@ -28,8 +28,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SKY_ENGINE_CORE_INSPECTOR_ASYNCCALLSTACKTRACKER_H_ -#define SKY_ENGINE_CORE_INSPECTOR_ASYNCCALLSTACKTRACKER_H_ +#ifndef SKY_ENGINE_V8_INSPECTOR_ASYNCCALLSTACKTRACKER_H_ +#define SKY_ENGINE_V8_INSPECTOR_ASYNCCALLSTACKTRACKER_H_ #include "sky/engine/bindings/core/v8/ScriptValue.h" #include "sky/engine/core/dom/ContextLifecycleObserver.h" @@ -158,4 +158,4 @@ private: } // namespace blink -#endif // SKY_ENGINE_CORE_INSPECTOR_ASYNCCALLSTACKTRACKER_H_ +#endif // SKY_ENGINE_V8_INSPECTOR_ASYNCCALLSTACKTRACKER_H_ diff --git a/engine/v8_inspector/BUILD.gn b/engine/v8_inspector/BUILD.gn index b2e1be69469..10837b9bd7d 100644 --- a/engine/v8_inspector/BUILD.gn +++ b/engine/v8_inspector/BUILD.gn @@ -7,10 +7,13 @@ import("//sky/engine/config.gni") visibility = ["//sky/*"] +gen_dir = "$root_gen_dir/v8_inspector" + component("v8_inspector") { output_name = "v8_inspector" deps = [ + ":protocol_sources", "//base", "//mojo/public/cpp/application", "//mojo/public/interfaces/application", @@ -18,6 +21,7 @@ component("v8_inspector") { "//sky/engine/platform", # FIXME: Remove. "//sky/services/inspector:bindings", "//sky/engine/core:core_generated", # FIXME: Remove. + "//sky/engine/wtf", ] configs += [ @@ -27,11 +31,91 @@ component("v8_inspector") { ] sources = [ + "AsyncCallStackTracker.cpp", + "AsyncCallStackTracker.h", + "ContentSearchUtils.cpp", + "ContentSearchUtils.h", + "InjectedScript.cpp", + "InjectedScript.h", + "InjectedScriptBase.cpp", + "InjectedScriptBase.h", + "InjectedScriptManager.cpp", + "InjectedScriptManager.h", "inspector_backend_mojo.cc", "inspector_backend_mojo.h", + "inspector_host.h", + "InspectorBaseAgent.cpp", + "InspectorBaseAgent.h", + "InspectorDebuggerAgent.cpp", + "InspectorDebuggerAgent.h", + "InspectorFrontendChannel.h", + "InspectorState.cpp", + "InspectorState.h", + "InstrumentingAgents.h", + "JSONParser.cpp", + "JSONParser.h", "PageDebuggerAgent.cpp", "PageDebuggerAgent.h", "PageScriptDebugServer.cpp", "PageScriptDebugServer.h", + "PromiseTracker.cpp", + "PromiseTracker.h", + "ScriptBreakpoint.h", + "ScriptDebugListener.h", + "ScriptDebugServer.cpp", + "ScriptDebugServer.h", + "ScriptPreprocessor.cpp", + "ScriptPreprocessor.h", + "ScriptRegexp.cpp", + "ScriptRegexp.h", + ] + + # TODO(eseidel): These should be compiled in a separate _generated target. + sources += [ + "$gen_dir/InspectorFrontend.cpp", + "$gen_dir/InspectorBackendDispatcher.cpp", + "$gen_dir/InspectorTypeBuilder.cpp", + ] +} + +protocol_file = "protocol.json" + +action("protocol_sources") { + script = "CodeGeneratorInspector.py" + + inputs = [ + # The helper script imported by CodeGeneratorInspector.py. + "CodeGeneratorInspectorStrings.py", + protocol_file, + ] + outputs = [ + "$gen_dir/InspectorBackendDispatcher.cpp", + "$gen_dir/InspectorBackendDispatcher.h", + "$gen_dir/InspectorFrontend.cpp", + "$gen_dir/InspectorFrontend.h", + "$gen_dir/InspectorTypeBuilder.cpp", + "$gen_dir/InspectorTypeBuilder.h", + ] + + args = [ + rebase_path(protocol_file, root_build_dir), + "--output_dir", rebase_path(gen_dir, root_build_dir), + ] + + deps = [ + ":protocol_version", + ] +} + +action("protocol_version") { + script = "generate-inspector-protocol-version" + + inputs = [ protocol_file ] + output_file = "$gen_dir/InspectorProtocolVersion.h" + outputs = [ output_file ] + + args = [ + "-o", rebase_path(output_file, root_build_dir), + rebase_path(protocol_file, root_build_dir), ] } diff --git a/engine/core/inspector/CodeGeneratorInspector.py b/engine/v8_inspector/CodeGeneratorInspector.py similarity index 100% rename from engine/core/inspector/CodeGeneratorInspector.py rename to engine/v8_inspector/CodeGeneratorInspector.py diff --git a/engine/core/inspector/CodeGeneratorInspectorStrings.py b/engine/v8_inspector/CodeGeneratorInspectorStrings.py similarity index 95% rename from engine/core/inspector/CodeGeneratorInspectorStrings.py rename to engine/v8_inspector/CodeGeneratorInspectorStrings.py index 33c15031d03..01ed41d14b1 100644 --- a/engine/core/inspector/CodeGeneratorInspectorStrings.py +++ b/engine/v8_inspector/CodeGeneratorInspectorStrings.py @@ -96,11 +96,11 @@ frontend_h = ( """#ifndef InspectorFrontend_h #define InspectorFrontend_h -#include "InspectorTypeBuilder.h" -#include "core/inspector/InspectorFrontendChannel.h" -#include "platform/JSONValues.h" -#include "wtf/PassRefPtr.h" -#include "wtf/text/WTFString.h" +#include "gen/v8_inspector/InspectorTypeBuilder.h" +#include "sky/engine/platform/JSONValues.h" +#include "sky/engine/wtf/PassRefPtr.h" +#include "sky/engine/wtf/text/WTFString.h" +#include "sky/engine/v8_inspector/InspectorFrontendChannel.h" namespace blink { @@ -124,12 +124,11 @@ backend_h = ( """#ifndef InspectorBackendDispatcher_h #define InspectorBackendDispatcher_h -#include "InspectorTypeBuilder.h" +#include "gen/v8_inspector/InspectorTypeBuilder.h" -#include "platform/heap/Handle.h" -#include "wtf/PassRefPtr.h" -#include "wtf/RefCounted.h" -#include "wtf/text/WTFString.h" +#include "sky/engine/wtf/PassRefPtr.h" +#include "sky/engine/wtf/RefCounted.h" +#include "sky/engine/wtf/text/WTFString.h" namespace blink { @@ -208,14 +207,14 @@ private: backend_cpp = ( """ -#include "config.h" -#include "InspectorBackendDispatcher.h" +#include "sky/engine/config.h" +#include "gen/v8_inspector/InspectorBackendDispatcher.h" -#include "core/inspector/InspectorFrontendChannel.h" -#include "core/inspector/JSONParser.h" -#include "platform/JSONValues.h" -#include "wtf/text/CString.h" -#include "wtf/text/WTFString.h" +#include "sky/engine/v8_inspector/InspectorFrontendChannel.h" +#include "sky/engine/v8_inspector/JSONParser.h" +#include "sky/engine/platform/JSONValues.h" +#include "sky/engine/wtf/text/CString.h" +#include "sky/engine/wtf/text/WTFString.h" namespace blink { @@ -516,13 +515,13 @@ void InspectorBackendDispatcher::CallbackBase::sendIfActive(PassRefPtr buildInspectorObject(const ScriptCallFrame& frame) +{ + return TypeBuilder::Console::CallFrame::create() + .setFunctionName(frame.functionName()) + .setScriptId(frame.scriptId()) + .setUrl(frame.sourceURL()) + .setLineNumber(frame.lineNumber()) + .setColumnNumber(frame.columnNumber()) + .release(); +} + +PassRefPtr > buildInspectorArray(const RefPtr& stack) +{ + RefPtr > frames = TypeBuilder::Array::create(); + for (size_t i = 0; i < stack->size(); i++) + frames->addItem(buildInspectorObject(stack->at(i))); + return frames; +} + +} // namespace + void InspectorDebuggerAgent::compileScript(ErrorString* errorString, const String& expression, const String& sourceURL, const int* executionContextId, TypeBuilder::OptOutput* scriptId, RefPtr& exceptionDetails) { InjectedScript injectedScript = injectedScriptForEval(errorString, executionContextId); @@ -1030,7 +1052,7 @@ void InspectorDebuggerAgent::compileScript(ErrorString* errorString, const Strin exceptionDetails->setLine(lineNumberValue); exceptionDetails->setColumn(columnNumberValue); if (stackTraceValue && stackTraceValue->size() > 0) - exceptionDetails->setStackTrace(stackTraceValue->buildInspectorArray()); + exceptionDetails->setStackTrace(buildInspectorArray(stackTraceValue)); } void InspectorDebuggerAgent::runScript(ErrorString* errorString, const ScriptId& scriptId, const int* executionContextId, const String* const objectGroup, const bool* const doNotPauseOnExceptionsAndMuteConsole, RefPtr& result, RefPtr& exceptionDetails) @@ -1065,7 +1087,7 @@ void InspectorDebuggerAgent::runScript(ErrorString* errorString, const ScriptId& exceptionDetails->setLine(lineNumberValue); exceptionDetails->setColumn(columnNumberValue); if (stackTraceValue && stackTraceValue->size() > 0) - exceptionDetails->setStackTrace(stackTraceValue->buildInspectorArray()); + exceptionDetails->setStackTrace(buildInspectorArray(stackTraceValue)); } if (asBool(doNotPauseOnExceptionsAndMuteConsole)) { @@ -1180,41 +1202,6 @@ PassRefPtr InspectorDebuggerAgent::currentAsyncStackTrace() return result.release(); } -static PassRefPtr toScriptCallStack(JavaScriptCallFrame* callFrame) -{ - Vector frames; - for (; callFrame; callFrame = callFrame->caller()) { - StringBuilder stringBuilder; - stringBuilder.appendNumber(callFrame->sourceID()); - String scriptId = stringBuilder.toString(); - // FIXME(WK62725): Debugger line/column are 0-based, while console ones are 1-based. - int line = callFrame->line() + 1; - int column = callFrame->column() + 1; - frames.append(ScriptCallFrame(callFrame->functionName(), scriptId, callFrame->scriptName(), line, column)); - } - return ScriptCallStack::create(frames); -} - -PassRefPtr InspectorDebuggerAgent::currentAsyncStackTraceForConsole() -{ - if (!asyncCallStackTracker().isEnabled()) - return nullptr; - const AsyncCallStackTracker::AsyncCallChain* chain = asyncCallStackTracker().currentAsyncCallChain(); - if (!chain) - return nullptr; - const AsyncCallStackTracker::AsyncCallStackVector& callStacks = chain->callStacks(); - if (callStacks.isEmpty()) - return nullptr; - RefPtr result = nullptr; - for (AsyncCallStackTracker::AsyncCallStackVector::const_reverse_iterator it = callStacks.rbegin(); it != callStacks.rend(); ++it) { - RefPtr callFrame = ScriptDebugServer::toJavaScriptCallFrameUnsafe((*it)->callFrames()); - if (!callFrame) - break; - result = ScriptAsyncCallStack::create((*it)->description(), toScriptCallStack(callFrame.get()), result.release()); - } - return result.release(); -} - String InspectorDebuggerAgent::sourceMapURLForScript(const Script& script, CompileResult compileResult) { bool hasSyntaxError = compileResult != CompileSuccess; diff --git a/engine/core/inspector/InspectorDebuggerAgent.h b/engine/v8_inspector/InspectorDebuggerAgent.h similarity index 95% rename from engine/core/inspector/InspectorDebuggerAgent.h rename to engine/v8_inspector/InspectorDebuggerAgent.h index e0662652e37..5551282c91c 100644 --- a/engine/core/inspector/InspectorDebuggerAgent.h +++ b/engine/v8_inspector/InspectorDebuggerAgent.h @@ -27,19 +27,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SKY_ENGINE_CORE_INSPECTOR_INSPECTORDEBUGGERAGENT_H_ -#define SKY_ENGINE_CORE_INSPECTOR_INSPECTORDEBUGGERAGENT_H_ +#ifndef SKY_ENGINE_V8_INSPECTOR_INSPECTORDEBUGGERAGENT_H_ +#define SKY_ENGINE_V8_INSPECTOR_INSPECTORDEBUGGERAGENT_H_ -#include "gen/sky/core/InspectorFrontend.h" +#include "gen/v8_inspector/InspectorFrontend.h" #include "sky/engine/bindings/core/v8/ScriptState.h" #include "sky/engine/core/frame/ConsoleTypes.h" -#include "sky/engine/core/inspector/AsyncCallStackTracker.h" #include "sky/engine/core/inspector/ConsoleAPITypes.h" -#include "sky/engine/core/inspector/InjectedScript.h" -#include "sky/engine/core/inspector/InspectorBaseAgent.h" -#include "sky/engine/core/inspector/PromiseTracker.h" -#include "sky/engine/core/inspector/ScriptBreakpoint.h" -#include "sky/engine/core/inspector/ScriptDebugListener.h" +#include "sky/engine/v8_inspector/AsyncCallStackTracker.h" +#include "sky/engine/v8_inspector/InjectedScript.h" +#include "sky/engine/v8_inspector/InspectorBaseAgent.h" +#include "sky/engine/v8_inspector/PromiseTracker.h" +#include "sky/engine/v8_inspector/ScriptBreakpoint.h" +#include "sky/engine/v8_inspector/ScriptDebugListener.h" #include "sky/engine/wtf/Forward.h" #include "sky/engine/wtf/HashMap.h" #include "sky/engine/wtf/PassRefPtr.h" @@ -192,8 +192,6 @@ public: void setBreakpoint(const String& scriptId, int lineNumber, int columnNumber, BreakpointSource, const String& condition = String()); void removeBreakpoint(const String& scriptId, int lineNumber, int columnNumber, BreakpointSource); - PassRefPtr currentAsyncStackTraceForConsole(); - protected: explicit InspectorDebuggerAgent(InjectedScriptManager*); @@ -272,4 +270,4 @@ private: } // namespace blink -#endif // SKY_ENGINE_CORE_INSPECTOR_INSPECTORDEBUGGERAGENT_H_ +#endif // SKY_ENGINE_V8_INSPECTOR_INSPECTORDEBUGGERAGENT_H_ diff --git a/engine/core/inspector/InspectorFrontendChannel.h b/engine/v8_inspector/InspectorFrontendChannel.h similarity index 89% rename from engine/core/inspector/InspectorFrontendChannel.h rename to engine/v8_inspector/InspectorFrontendChannel.h index e2dcd1de334..e5c5bdf90d0 100644 --- a/engine/core/inspector/InspectorFrontendChannel.h +++ b/engine/v8_inspector/InspectorFrontendChannel.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SKY_ENGINE_CORE_INSPECTOR_INSPECTORFRONTENDCHANNEL_H_ -#define SKY_ENGINE_CORE_INSPECTOR_INSPECTORFRONTENDCHANNEL_H_ +#ifndef SKY_ENGINE_V8_INSPECTOR_INSPECTORFRONTENDCHANNEL_H_ +#define SKY_ENGINE_V8_INSPECTOR_INSPECTORFRONTENDCHANNEL_H_ #include "sky/engine/platform/JSONValues.h" #include "sky/engine/wtf/Forward.h" @@ -40,4 +40,4 @@ public: } // namespace blink -#endif // SKY_ENGINE_CORE_INSPECTOR_INSPECTORFRONTENDCHANNEL_H_ +#endif // SKY_ENGINE_V8_INSPECTOR_INSPECTORFRONTENDCHANNEL_H_ diff --git a/engine/core/inspector/InspectorState.cpp b/engine/v8_inspector/InspectorState.cpp similarity index 97% rename from engine/core/inspector/InspectorState.cpp rename to engine/v8_inspector/InspectorState.cpp index 0680e1357fd..e7517c2487b 100644 --- a/engine/core/inspector/InspectorState.cpp +++ b/engine/v8_inspector/InspectorState.cpp @@ -27,10 +27,9 @@ */ #include "sky/engine/config.h" -#include "sky/engine/core/inspector/InspectorState.h" +#include "sky/engine/v8_inspector/InspectorState.h" -// #include "core/inspector/InspectorStateClient.h" -#include "sky/engine/core/inspector/JSONParser.h" +#include "sky/engine/v8_inspector/JSONParser.h" #include "sky/engine/wtf/PassOwnPtr.h" namespace blink { diff --git a/engine/core/inspector/InspectorState.h b/engine/v8_inspector/InspectorState.h similarity index 96% rename from engine/core/inspector/InspectorState.h rename to engine/v8_inspector/InspectorState.h index d31234a663f..99f7ca15993 100644 --- a/engine/core/inspector/InspectorState.h +++ b/engine/v8_inspector/InspectorState.h @@ -28,8 +28,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SKY_ENGINE_CORE_INSPECTOR_INSPECTORSTATE_H_ -#define SKY_ENGINE_CORE_INSPECTOR_INSPECTORSTATE_H_ +#ifndef SKY_ENGINE_V8_INSPECTOR_INSPECTORSTATE_H_ +#define SKY_ENGINE_V8_INSPECTOR_INSPECTORSTATE_H_ #include "sky/engine/platform/JSONValues.h" @@ -114,4 +114,4 @@ private: } // namespace blink -#endif // SKY_ENGINE_CORE_INSPECTOR_INSPECTORSTATE_H_ +#endif // SKY_ENGINE_V8_INSPECTOR_INSPECTORSTATE_H_ diff --git a/engine/core/inspector/InstrumentingAgents.h b/engine/v8_inspector/InstrumentingAgents.h similarity index 78% rename from engine/core/inspector/InstrumentingAgents.h rename to engine/v8_inspector/InstrumentingAgents.h index 89b2c350b7e..901d09c6c61 100644 --- a/engine/core/inspector/InstrumentingAgents.h +++ b/engine/v8_inspector/InstrumentingAgents.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SKY_ENGINE_CORE_INSPECTOR_INSTRUMENTINGAGENTS_H_ -#define SKY_ENGINE_CORE_INSPECTOR_INSTRUMENTINGAGENTS_H_ +#ifndef SKY_ENGINE_V8_INSPECTOR_INSTRUMENTINGAGENTS_H_ +#define SKY_ENGINE_V8_INSPECTOR_INSTRUMENTINGAGENTS_H_ #include "sky/engine/wtf/Noncopyable.h" @@ -30,4 +30,4 @@ private: } // namespace blink -#endif // SKY_ENGINE_CORE_INSPECTOR_INSTRUMENTINGAGENTS_H_ +#endif // SKY_ENGINE_V8_INSPECTOR_INSTRUMENTINGAGENTS_H_ diff --git a/engine/core/inspector/JSONParser.cpp b/engine/v8_inspector/JSONParser.cpp similarity index 99% rename from engine/core/inspector/JSONParser.cpp rename to engine/v8_inspector/JSONParser.cpp index 23362c3b9cd..46590d0b5db 100644 --- a/engine/core/inspector/JSONParser.cpp +++ b/engine/v8_inspector/JSONParser.cpp @@ -29,7 +29,7 @@ */ #include "sky/engine/config.h" -#include "sky/engine/core/inspector/JSONParser.h" +#include "sky/engine/v8_inspector/JSONParser.h" #include "sky/engine/platform/JSONValues.h" #include "sky/engine/wtf/text/StringBuilder.h" diff --git a/engine/core/inspector/JSONParser.h b/engine/v8_inspector/JSONParser.h similarity index 92% rename from engine/core/inspector/JSONParser.h rename to engine/v8_inspector/JSONParser.h index b410f766dde..2f42b5019cf 100644 --- a/engine/core/inspector/JSONParser.h +++ b/engine/v8_inspector/JSONParser.h @@ -28,8 +28,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SKY_ENGINE_CORE_INSPECTOR_JSONPARSER_H_ -#define SKY_ENGINE_CORE_INSPECTOR_JSONPARSER_H_ +#ifndef SKY_ENGINE_V8_INSPECTOR_JSONPARSER_H_ +#define SKY_ENGINE_V8_INSPECTOR_JSONPARSER_H_ #include "sky/engine/wtf/PassRefPtr.h" #include "sky/engine/wtf/text/WTFString.h" @@ -42,4 +42,4 @@ PassRefPtr parseJSON(const String& json); } // namespace blink -#endif // SKY_ENGINE_CORE_INSPECTOR_JSONPARSER_H_ +#endif // SKY_ENGINE_V8_INSPECTOR_JSONPARSER_H_ diff --git a/engine/v8_inspector/PageDebuggerAgent.cpp b/engine/v8_inspector/PageDebuggerAgent.cpp index 0d9c3ece83d..e180b3ca7ec 100644 --- a/engine/v8_inspector/PageDebuggerAgent.cpp +++ b/engine/v8_inspector/PageDebuggerAgent.cpp @@ -35,8 +35,6 @@ #include "sky/engine/bindings/core/v8/ScriptController.h" #include "sky/engine/bindings/core/v8/ScriptSourceCode.h" #include "sky/engine/core/frame/FrameConsole.h" -#include "sky/engine/core/frame/LocalFrame.h" -#include "sky/engine/core/page/Page.h" #include "sky/engine/v8_inspector/inspector_host.h" namespace blink { diff --git a/engine/v8_inspector/PageDebuggerAgent.h b/engine/v8_inspector/PageDebuggerAgent.h index 8ce7a8d2764..fcaeb2179cd 100644 --- a/engine/v8_inspector/PageDebuggerAgent.h +++ b/engine/v8_inspector/PageDebuggerAgent.h @@ -31,7 +31,7 @@ #ifndef SKY_ENGINE_V8_INSPECTOR_PAGEDEBUGGERAGENT_H_ #define SKY_ENGINE_V8_INSPECTOR_PAGEDEBUGGERAGENT_H_ -#include "sky/engine/core/inspector/InspectorDebuggerAgent.h" +#include "sky/engine/v8_inspector/InspectorDebuggerAgent.h" #include "sky/engine/v8_inspector/PageScriptDebugServer.h" // This whole file will move to namespace inspector. diff --git a/engine/v8_inspector/PageScriptDebugServer.cpp b/engine/v8_inspector/PageScriptDebugServer.cpp index f52dfc74925..32c6ece99ef 100644 --- a/engine/v8_inspector/PageScriptDebugServer.cpp +++ b/engine/v8_inspector/PageScriptDebugServer.cpp @@ -41,16 +41,13 @@ #include "sky/engine/core/dom/ExecutionContext.h" #include "sky/engine/core/frame/FrameConsole.h" #include "sky/engine/core/frame/LocalFrame.h" -#include "sky/engine/core/frame/UseCounter.h" #include "sky/engine/core/inspector/InspectorTraceEvents.h" -#include "sky/engine/core/inspector/ScriptDebugListener.h" -#include "sky/engine/core/page/Page.h" #include "sky/engine/v8_inspector/inspector_host.h" +#include "sky/engine/v8_inspector/ScriptDebugListener.h" #include "sky/engine/wtf/OwnPtr.h" #include "sky/engine/wtf/PassOwnPtr.h" #include "sky/engine/wtf/StdLibExtras.h" #include "sky/engine/wtf/TemporaryChange.h" -#include "sky/engine/wtf/text/StringBuilder.h" namespace blink { @@ -261,7 +258,7 @@ bool PageScriptDebugServer::canPreprocess(LocalFrame* frame) { ASSERT(frame); - if (!m_preprocessorSourceCode || !frame->page() || isCreatingPreprocessor) + if (!m_preprocessorSourceCode || isCreatingPreprocessor) return false; // We delay the creation of the preprocessor until just before the first JS from the @@ -306,13 +303,13 @@ void PageScriptDebugServer::clearPreprocessor() void PageScriptDebugServer::muteWarningsAndDeprecations() { FrameConsole::mute(); - UseCounter::muteForInspector(); + // Used to mute UseCounter too. } void PageScriptDebugServer::unmuteWarningsAndDeprecations() { FrameConsole::unmute(); - UseCounter::unmuteForInspector(); + // Used to unmute UseCounter too. } } // namespace blink diff --git a/engine/v8_inspector/PageScriptDebugServer.h b/engine/v8_inspector/PageScriptDebugServer.h index 03d6d1e7e0d..aaabdeaf117 100644 --- a/engine/v8_inspector/PageScriptDebugServer.h +++ b/engine/v8_inspector/PageScriptDebugServer.h @@ -31,8 +31,8 @@ #ifndef SKY_ENGINE_V8_INSPECTOR_PAGESCRIPTDEBUGSERVER_H_ #define SKY_ENGINE_V8_INSPECTOR_PAGESCRIPTDEBUGSERVER_H_ -#include "sky/engine/bindings/core/v8/ScriptDebugServer.h" -#include "sky/engine/bindings/core/v8/ScriptPreprocessor.h" +#include "sky/engine/v8_inspector/ScriptDebugServer.h" +#include "sky/engine/v8_inspector/ScriptPreprocessor.h" #include "sky/engine/wtf/Forward.h" #include "sky/engine/wtf/RefCounted.h" #include "v8/include/v8.h" diff --git a/engine/core/inspector/PromiseTracker.cpp b/engine/v8_inspector/PromiseTracker.cpp similarity index 98% rename from engine/core/inspector/PromiseTracker.cpp rename to engine/v8_inspector/PromiseTracker.cpp index 7718d5e109c..b10f73813ce 100644 --- a/engine/core/inspector/PromiseTracker.cpp +++ b/engine/v8_inspector/PromiseTracker.cpp @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "sky/engine/config.h" -#include "sky/engine/core/inspector/PromiseTracker.h" +#include "sky/engine/v8_inspector/PromiseTracker.h" #include "sky/engine/bindings/core/v8/ScopedPersistent.h" #include "sky/engine/bindings/core/v8/ScriptCallStackFactory.h" diff --git a/engine/core/inspector/PromiseTracker.h b/engine/v8_inspector/PromiseTracker.h similarity index 86% rename from engine/core/inspector/PromiseTracker.h rename to engine/v8_inspector/PromiseTracker.h index 310208e44da..f497496d17e 100644 --- a/engine/core/inspector/PromiseTracker.h +++ b/engine/v8_inspector/PromiseTracker.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SKY_ENGINE_CORE_INSPECTOR_PROMISETRACKER_H_ -#define SKY_ENGINE_CORE_INSPECTOR_PROMISETRACKER_H_ +#ifndef SKY_ENGINE_V8_INSPECTOR_PROMISETRACKER_H_ +#define SKY_ENGINE_V8_INSPECTOR_PROMISETRACKER_H_ #include "sky/engine/wtf/HashMap.h" #include "sky/engine/wtf/Noncopyable.h" @@ -41,4 +41,4 @@ private: } // namespace blink -#endif // SKY_ENGINE_CORE_INSPECTOR_PROMISETRACKER_H_ +#endif // SKY_ENGINE_V8_INSPECTOR_PROMISETRACKER_H_ diff --git a/engine/core/inspector/ScriptBreakpoint.h b/engine/v8_inspector/ScriptBreakpoint.h similarity index 92% rename from engine/core/inspector/ScriptBreakpoint.h rename to engine/v8_inspector/ScriptBreakpoint.h index e8f695e790d..000bad90890 100644 --- a/engine/core/inspector/ScriptBreakpoint.h +++ b/engine/v8_inspector/ScriptBreakpoint.h @@ -27,8 +27,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SKY_ENGINE_CORE_INSPECTOR_SCRIPTBREAKPOINT_H_ -#define SKY_ENGINE_CORE_INSPECTOR_SCRIPTBREAKPOINT_H_ +#ifndef SKY_ENGINE_V8_INSPECTOR_SCRIPTBREAKPOINT_H_ +#define SKY_ENGINE_V8_INSPECTOR_SCRIPTBREAKPOINT_H_ #include "sky/engine/wtf/text/WTFString.h" @@ -53,4 +53,4 @@ struct ScriptBreakpoint { } // namespace blink -#endif // SKY_ENGINE_CORE_INSPECTOR_SCRIPTBREAKPOINT_H_ +#endif // SKY_ENGINE_V8_INSPECTOR_SCRIPTBREAKPOINT_H_ diff --git a/engine/core/inspector/ScriptDebugListener.h b/engine/v8_inspector/ScriptDebugListener.h similarity index 94% rename from engine/core/inspector/ScriptDebugListener.h rename to engine/v8_inspector/ScriptDebugListener.h index fff4db0fb82..603b16570a7 100644 --- a/engine/core/inspector/ScriptDebugListener.h +++ b/engine/v8_inspector/ScriptDebugListener.h @@ -27,8 +27,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SKY_ENGINE_CORE_INSPECTOR_SCRIPTDEBUGLISTENER_H_ -#define SKY_ENGINE_CORE_INSPECTOR_SCRIPTDEBUGLISTENER_H_ +#ifndef SKY_ENGINE_V8_INSPECTOR_SCRIPTDEBUGLISTENER_H_ +#define SKY_ENGINE_V8_INSPECTOR_SCRIPTDEBUGLISTENER_H_ #include "sky/engine/bindings/core/v8/ScriptState.h" @@ -86,4 +86,4 @@ public: } // namespace blink -#endif // SKY_ENGINE_CORE_INSPECTOR_SCRIPTDEBUGLISTENER_H_ +#endif // SKY_ENGINE_V8_INSPECTOR_SCRIPTDEBUGLISTENER_H_ diff --git a/engine/bindings/core/v8/ScriptDebugServer.cpp b/engine/v8_inspector/ScriptDebugServer.cpp similarity index 99% rename from engine/bindings/core/v8/ScriptDebugServer.cpp rename to engine/v8_inspector/ScriptDebugServer.cpp index 2afcea111cb..b7f473fea1b 100644 --- a/engine/bindings/core/v8/ScriptDebugServer.cpp +++ b/engine/v8_inspector/ScriptDebugServer.cpp @@ -29,7 +29,7 @@ */ #include "sky/engine/config.h" -#include "sky/engine/bindings/core/v8/ScriptDebugServer.h" +#include "sky/engine/v8_inspector/ScriptDebugServer.h" #include "bindings/core/v8/V8JavaScriptCallFrame.h" #include "sky/engine/bindings/core/v8/ScopedPersistent.h" @@ -40,10 +40,10 @@ #include "sky/engine/bindings/core/v8/V8Binding.h" #include "sky/engine/bindings/core/v8/V8ScriptRunner.h" #include "sky/engine/core/inspector/JavaScriptCallFrame.h" -#include "sky/engine/core/inspector/ScriptDebugListener.h" #include "sky/engine/platform/JSONValues.h" #include "sky/engine/public/platform/Platform.h" #include "sky/engine/public/platform/WebData.h" +#include "sky/engine/v8_inspector/ScriptDebugListener.h" #include "sky/engine/wtf/StdLibExtras.h" #include "sky/engine/wtf/Vector.h" #include "sky/engine/wtf/dtoa/utils.h" diff --git a/engine/bindings/core/v8/ScriptDebugServer.h b/engine/v8_inspector/ScriptDebugServer.h similarity index 95% rename from engine/bindings/core/v8/ScriptDebugServer.h rename to engine/v8_inspector/ScriptDebugServer.h index a2ae8b4f28e..1933e2a7ef5 100644 --- a/engine/bindings/core/v8/ScriptDebugServer.h +++ b/engine/v8_inspector/ScriptDebugServer.h @@ -28,14 +28,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SKY_ENGINE_BINDINGS_CORE_V8_SCRIPTDEBUGSERVER_H_ -#define SKY_ENGINE_BINDINGS_CORE_V8_SCRIPTDEBUGSERVER_H_ +#ifndef SKY_ENGINE_V8_INSPECTOR_SCRIPTDEBUGSERVER_H_ +#define SKY_ENGINE_V8_INSPECTOR_SCRIPTDEBUGSERVER_H_ -#include "gen/sky/core/InspectorBackendDispatcher.h" +#include "gen/v8_inspector/InspectorBackendDispatcher.h" #include "sky/engine/bindings/core/v8/ScopedPersistent.h" -#include "sky/engine/core/inspector/ScriptBreakpoint.h" #include "sky/engine/core/inspector/ScriptCallStack.h" -#include "sky/engine/core/inspector/ScriptDebugListener.h" +#include "sky/engine/v8_inspector/ScriptBreakpoint.h" +#include "sky/engine/v8_inspector/ScriptDebugListener.h" #include "sky/engine/wtf/HashMap.h" #include "sky/engine/wtf/Noncopyable.h" #include "sky/engine/wtf/PassOwnPtr.h" @@ -164,4 +164,4 @@ private: } // namespace blink -#endif // SKY_ENGINE_BINDINGS_CORE_V8_SCRIPTDEBUGSERVER_H_ +#endif // SKY_ENGINE_V8_INSPECTOR_SCRIPTDEBUGSERVER_H_ diff --git a/engine/bindings/core/v8/ScriptPreprocessor.cpp b/engine/v8_inspector/ScriptPreprocessor.cpp similarity index 98% rename from engine/bindings/core/v8/ScriptPreprocessor.cpp rename to engine/v8_inspector/ScriptPreprocessor.cpp index f39d8601c4d..1aea9e30a16 100644 --- a/engine/bindings/core/v8/ScriptPreprocessor.cpp +++ b/engine/v8_inspector/ScriptPreprocessor.cpp @@ -29,7 +29,7 @@ */ #include "sky/engine/config.h" -#include "sky/engine/bindings/core/v8/ScriptPreprocessor.h" +#include "sky/engine/v8_inspector/ScriptPreprocessor.h" #include "sky/engine/bindings/core/v8/ScriptController.h" #include "sky/engine/bindings/core/v8/ScriptSourceCode.h" diff --git a/engine/bindings/core/v8/ScriptPreprocessor.h b/engine/v8_inspector/ScriptPreprocessor.h similarity index 93% rename from engine/bindings/core/v8/ScriptPreprocessor.h rename to engine/v8_inspector/ScriptPreprocessor.h index f6e8df0c3b6..893a4200827 100644 --- a/engine/bindings/core/v8/ScriptPreprocessor.h +++ b/engine/v8_inspector/ScriptPreprocessor.h @@ -27,8 +27,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SKY_ENGINE_BINDINGS_CORE_V8_SCRIPTPREPROCESSOR_H_ -#define SKY_ENGINE_BINDINGS_CORE_V8_SCRIPTPREPROCESSOR_H_ +#ifndef SKY_ENGINE_V8_INSPECTOR_SCRIPTPREPROCESSOR_H_ +#define SKY_ENGINE_V8_INSPECTOR_SCRIPTPREPROCESSOR_H_ #include "sky/engine/bindings/core/v8/V8Binding.h" #include "sky/engine/wtf/RefCounted.h" @@ -59,4 +59,4 @@ private: } // namespace blink -#endif // SKY_ENGINE_BINDINGS_CORE_V8_SCRIPTPREPROCESSOR_H_ +#endif // SKY_ENGINE_V8_INSPECTOR_SCRIPTPREPROCESSOR_H_ diff --git a/engine/bindings/core/v8/ScriptRegexp.cpp b/engine/v8_inspector/ScriptRegexp.cpp similarity index 98% rename from engine/bindings/core/v8/ScriptRegexp.cpp rename to engine/v8_inspector/ScriptRegexp.cpp index 7286099fdb3..5023664d2c8 100644 --- a/engine/bindings/core/v8/ScriptRegexp.cpp +++ b/engine/v8_inspector/ScriptRegexp.cpp @@ -27,7 +27,7 @@ */ #include "sky/engine/config.h" -#include "sky/engine/bindings/core/v8/ScriptRegexp.h" +#include "sky/engine/v8_inspector/ScriptRegexp.h" #include "sky/engine/bindings/core/v8/V8Binding.h" #include "sky/engine/bindings/core/v8/V8PerIsolateData.h" diff --git a/engine/bindings/core/v8/ScriptRegexp.h b/engine/v8_inspector/ScriptRegexp.h similarity index 92% rename from engine/bindings/core/v8/ScriptRegexp.h rename to engine/v8_inspector/ScriptRegexp.h index f2a13afc9a2..9b9aafe8727 100644 --- a/engine/bindings/core/v8/ScriptRegexp.h +++ b/engine/v8_inspector/ScriptRegexp.h @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SKY_ENGINE_BINDINGS_CORE_V8_SCRIPTREGEXP_H_ -#define SKY_ENGINE_BINDINGS_CORE_V8_SCRIPTREGEXP_H_ +#ifndef SKY_ENGINE_V8_INSPECTOR_SCRIPTREGEXP_H_ +#define SKY_ENGINE_V8_INSPECTOR_SCRIPTREGEXP_H_ #include "sky/engine/bindings/core/v8/ScopedPersistent.h" #include "sky/engine/wtf/Noncopyable.h" @@ -54,4 +54,4 @@ private: } // namespace blink -#endif // SKY_ENGINE_BINDINGS_CORE_V8_SCRIPTREGEXP_H_ +#endif // SKY_ENGINE_V8_INSPECTOR_SCRIPTREGEXP_H_ diff --git a/engine/core/inspector/generate-inspector-protocol-version b/engine/v8_inspector/generate-inspector-protocol-version similarity index 100% rename from engine/core/inspector/generate-inspector-protocol-version rename to engine/v8_inspector/generate-inspector-protocol-version diff --git a/engine/v8_inspector/inspector_backend_mojo.cc b/engine/v8_inspector/inspector_backend_mojo.cc index 9875b3b1292..136d34ef3ec 100644 --- a/engine/v8_inspector/inspector_backend_mojo.cc +++ b/engine/v8_inspector/inspector_backend_mojo.cc @@ -7,18 +7,18 @@ #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" -#include "gen/sky/core/InspectorBackendDispatcher.h" +#include "gen/v8_inspector/InspectorBackendDispatcher.h" #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/core/inspector/InjectedScriptHost.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/platform/JSONValues.h" -#include "sky/engine/v8_inspector/inspector_host.h" +#include "sky/engine/v8_inspector/InspectorFrontendChannel.h" +#include "sky/engine/v8_inspector/InspectorState.h" +#include "sky/engine/v8_inspector/InstrumentingAgents.h" #include "sky/engine/v8_inspector/PageDebuggerAgent.h" #include "sky/engine/v8_inspector/PageScriptDebugServer.h" +#include "sky/engine/v8_inspector/inspector_host.h" namespace blink { diff --git a/engine/core/inspector/protocol.json b/engine/v8_inspector/protocol.json similarity index 100% rename from engine/core/inspector/protocol.json rename to engine/v8_inspector/protocol.json diff --git a/engine/web/WebLocalFrameImpl.cpp b/engine/web/WebLocalFrameImpl.cpp index 334984810f2..566cfcd038d 100644 --- a/engine/web/WebLocalFrameImpl.cpp +++ b/engine/web/WebLocalFrameImpl.cpp @@ -101,7 +101,6 @@ #include "sky/engine/core/frame/Settings.h" #include "sky/engine/core/html/HTMLAnchorElement.h" #include "sky/engine/core/inspector/ConsoleMessage.h" -#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/core/loader/MojoLoader.h" #include "sky/engine/core/page/Chrome.h" #include "sky/engine/core/page/EventHandler.h" @@ -143,6 +142,7 @@ #include "sky/engine/public/web/WebNode.h" #include "sky/engine/public/web/WebRange.h" #include "sky/engine/public/web/WebScriptSource.h" +#include "sky/engine/core/inspector/ScriptCallStack.h" #include "sky/engine/web/CompositionUnderlineVectorBuilder.h" #include "sky/engine/web/WebViewImpl.h" #include "sky/engine/wtf/CurrentTime.h"