Changeset 224826 in webkit

Timestamp:

Nov 14, 2017, 11:44:18 AM (7 years ago)

Author:

Joseph Pecoraro

Message:

Web Inspector: Add a ServiceWorker domain to get information about an inspected ServiceWorker
​https://bugs.webkit.org/show_bug.cgi?id=179640
<rdar://problem/35517361>

Reviewed by Devin Rousso.

Source/JavaScriptCore:

• CMakeLists.txt:
• DerivedSources.make:

Gate the ServiceWorker domain on the ENABLE feature flag.

• inspector/protocol/ServiceWorker.json: Added.

New domain to be made available inside of a ServiceWorker target.

Source/WebCore:

• Sources.txt:
• WebCore.xcodeproj/project.pbxproj:
• inspector/InspectorAllInOne.cpp:

New files.

• inspector/WorkerInspectorController.cpp:

(WebCore::WorkerInspectorController::createLazyAgents):
Add a ServiceWorkerAgent when the Worker is a ServiceWorker.

• inspector/agents/worker/ServiceWorkerAgent.h: Added.
• inspector/agents/worker/ServiceWorkerAgent.cpp: Added.

(WebCore::ServiceWorkerAgent::ServiceWorkerAgent):
(WebCore::ServiceWorkerAgent::didCreateFrontendAndBackend):
(WebCore::ServiceWorkerAgent::willDestroyFrontendAndBackend):
(WebCore::ServiceWorkerAgent::getInitializationInfo):
Populate initialization info.

Location:

trunk/Source

Files:

• JavaScriptCore/CMakeLists.txt (modified) (1 diff)
• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/DerivedSources.make (modified) (1 diff)
• JavaScriptCore/inspector/protocol/ServiceWorker.json (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Sources.txt (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• WebCore/inspector/InspectorAllInOne.cpp (modified) (1 diff)
• WebCore/inspector/WorkerInspectorController.cpp (modified) (2 diffs)
• WebCore/inspector/agents/worker/ServiceWorkerAgent.cpp (added)
• WebCore/inspector/agents/worker/ServiceWorkerAgent.h (added)

trunk/Source/JavaScriptCore/CMakeLists.txt ¶

@@ -454 +454 @@
 endif ()
 
+if (ENABLE_SERVICE_WORKER)
+    list(APPEND JavaScriptCore_INSPECTOR_DOMAINS
+        ${JAVASCRIPTCORE_DIR}/inspector/protocol/ServiceWorker.json
+    )
+endif ()
+
 add_custom_command(
     OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json

trunk/Source/JavaScriptCore/ChangeLog ¶

@@ +1 @@
+2017-11-14  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Add a ServiceWorker domain to get information about an inspected ServiceWorker
+        https://bugs.webkit.org/show_bug.cgi?id=179640
+        <rdar://problem/35517361>
+
+        Reviewed by Devin Rousso.
+
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        Gate the ServiceWorker domain on the ENABLE feature flag.
+
+        * inspector/protocol/ServiceWorker.json: Added.
+        New domain to be made available inside of a ServiceWorker target.
+
 2017-11-14  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/JavaScriptCore/DerivedSources.make ¶

@@ -254 +254 @@
 endif
 
+ifeq ($(findstring ENABLE_SERVICE_WORKER,$(FEATURE_DEFINES)), ENABLE_SERVICE_WORKER)
+    INSPECTOR_DOMAINS := $(INSPECTOR_DOMAINS) $(JavaScriptCore)/inspector/protocol/ServiceWorker.json
+endif
+
 INSPECTOR_GENERATOR_SCRIPTS = \
         $(JavaScriptCore)/inspector/scripts/codegen/__init__.py \

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2017-11-14  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Add a ServiceWorker domain to get information about an inspected ServiceWorker
+        https://bugs.webkit.org/show_bug.cgi?id=179640
+        <rdar://problem/35517361>
+
+        Reviewed by Devin Rousso.
+
+        * Sources.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * inspector/InspectorAllInOne.cpp:
+        New files.
+
+        * inspector/WorkerInspectorController.cpp:
+        (WebCore::WorkerInspectorController::createLazyAgents):
+        Add a ServiceWorkerAgent when the Worker is a ServiceWorker.
+
+        * inspector/agents/worker/ServiceWorkerAgent.h: Added.
+        * inspector/agents/worker/ServiceWorkerAgent.cpp: Added.
+        (WebCore::ServiceWorkerAgent::ServiceWorkerAgent):
+        (WebCore::ServiceWorkerAgent::didCreateFrontendAndBackend):
+        (WebCore::ServiceWorkerAgent::willDestroyFrontendAndBackend):
+        (WebCore::ServiceWorkerAgent::getInitializationInfo):
+        Populate initialization info.
+
 2017-11-14  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/Sources.txt ¶

@@ -1154 +1154 @@
 inspector/agents/page/PageRuntimeAgent.cpp
 
+inspector/agents/worker/ServiceWorkerAgent.cpp
 inspector/agents/worker/WorkerConsoleAgent.cpp
 inspector/agents/worker/WorkerDebuggerAgent.cpp

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj ¶

@@ -2839 +2839 @@
                 A578F43C1DE01423003DFC6A /* JSPromiseRejectionEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = A578F43A1DE013FB003DFC6A /* JSPromiseRejectionEvent.h */; };
                 A578F43F1DE0B630003DFC6A /* RejectedPromiseTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = A578F43E1DE0B62B003DFC6A /* RejectedPromiseTracker.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                A581ED131FB288CF00CED4EC /* ServiceWorkerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = A581ED101FB288C800CED4EC /* ServiceWorkerAgent.h */; };
                 A5840E1D187B74D500843B10 /* InspectorInstrumentationCookie.h in Headers */ = {isa = PBXBuildFile; fileRef = A5840E1B187B74D500843B10 /* InspectorInstrumentationCookie.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 A5840E25187B8AC200843B10 /* WebInjectedScriptHost.h in Headers */ = {isa = PBXBuildFile; fileRef = A5840E23187B8AC200843B10 /* WebInjectedScriptHost.h */; };
@@ -10733 +10734 @@
                 A578F43D1DE0B62B003DFC6A /* RejectedPromiseTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RejectedPromiseTracker.cpp; sourceTree = "<group>"; };
                 A578F43E1DE0B62B003DFC6A /* RejectedPromiseTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RejectedPromiseTracker.h; sourceTree = "<group>"; };
+                A581ED101FB288C800CED4EC /* ServiceWorkerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServiceWorkerAgent.h; sourceTree = "<group>"; };
+                A581ED121FB288C900CED4EC /* ServiceWorkerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ServiceWorkerAgent.cpp; sourceTree = "<group>"; };
                 A5840E1A187B74D500843B10 /* InspectorInstrumentationCookie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorInstrumentationCookie.cpp; sourceTree = "<group>"; };
                 A5840E1B187B74D500843B10 /* InspectorInstrumentationCookie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorInstrumentationCookie.h; sourceTree = "<group>"; };
@@ -20627 +20630 @@
                         isa = PBXGroup;
                         children = (
+                                A581ED121FB288C900CED4EC /* ServiceWorkerAgent.cpp */,
+                                A581ED101FB288C800CED4EC /* ServiceWorkerAgent.h */,
                                 A5B81CCB1FAA44DA0037D1E6 /* WorkerConsoleAgent.cpp */,
                                 A5B81CCA1FAA44DA0037D1E6 /* WorkerConsoleAgent.h */,
@@ -28980 +28985 @@
                                 2D93AEE319DF5641002A86C3 /* ServicesOverlayController.h in Headers */,
                                 51F1755D1F3EBC8300C74950 /* ServiceWorker.h in Headers */,
+                                A581ED131FB288CF00CED4EC /* ServiceWorkerAgent.h in Headers */,
                                 46EF142D1F97B7D800C2A524 /* ServiceWorkerClient.h in Headers */,
                                 837D46271FA2A8CE0054E1FA /* ServiceWorkerClientIdentifier.h in Headers */,

trunk/Source/WebCore/inspector/InspectorAllInOne.cpp ¶

@@ -61 +61 @@
 #include "PageRuntimeAgent.cpp"
 #include "PageScriptDebugServer.cpp"
+#include "ServiceWorkerAgent.cpp"
 #include "TimelineRecordFactory.cpp"
 #include "WebConsoleAgent.cpp"

trunk/Source/WebCore/inspector/WorkerInspectorController.cpp ¶

@@ -48 +48 @@
 
 #if ENABLE(SERVICE_WORKER)
+#include "ServiceWorkerAgent.h"
 #include "ServiceWorkerGlobalScope.h"
 #endif
@@ -170 +171 @@
 #if ENABLE(SERVICE_WORKER)
     auto workerContext = workerAgentContext();
-    if (is<ServiceWorkerGlobalScope>(m_workerGlobalScope))
+    if (is<ServiceWorkerGlobalScope>(m_workerGlobalScope)) {
+        m_agents.append(std::make_unique<ServiceWorkerAgent>(workerContext));
         m_agents.append(std::make_unique<WorkerNetworkAgent>(workerContext));
+    }
 #endif
 }