ServiceWorker Inspector: Use the SW's scope url for the remote inspection target...
authorjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Dec 2017 18:54:42 +0000 (18:54 +0000)
committerjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Dec 2017 18:54:42 +0000 (18:54 +0000)
https://bugs.webkit.org/show_bug.cgi?id=180519

Reviewed by Youenn Fablet.

* workers/service/context/ServiceWorkerDebuggable.cpp:
(WebCore::ServiceWorkerDebuggable::ServiceWorkerDebuggable):
* workers/service/context/ServiceWorkerDebuggable.h:
Switch to the scope URL for the remote inspector target info.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@225633 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/workers/service/context/ServiceWorkerDebuggable.cpp
Source/WebCore/workers/service/context/ServiceWorkerDebuggable.h

index 01098a2..5bc7146 100644 (file)
@@ -1,3 +1,15 @@
+2017-12-07  Joseph Pecoraro  <pecoraro@apple.com>
+
+        ServiceWorker Inspector: Use the SW's scope url for the remote inspection target metadata
+        https://bugs.webkit.org/show_bug.cgi?id=180519
+
+        Reviewed by Youenn Fablet.
+
+        * workers/service/context/ServiceWorkerDebuggable.cpp:
+        (WebCore::ServiceWorkerDebuggable::ServiceWorkerDebuggable):
+        * workers/service/context/ServiceWorkerDebuggable.h:
+        Switch to the scope URL for the remote inspector target info.
+
 2017-12-07  Per Arne Vollan  <pvollan@apple.com>
 
         Unreviewed Windows build fix.
index d99371b..551e39a 100644 (file)
@@ -38,7 +38,7 @@ using namespace Inspector;
 
 ServiceWorkerDebuggable::ServiceWorkerDebuggable(ServiceWorkerThreadProxy& serviceWorkerThreadProxy, const ServiceWorkerContextData& data)
     : m_serviceWorkerThreadProxy(serviceWorkerThreadProxy)
-    , m_scriptURL(data.scriptURL)
+    , m_scopeURL(data.registration.scopeURL)
 {
 }
 
index c31163b..c2dcd61 100644 (file)
@@ -46,7 +46,7 @@ public:
     Inspector::RemoteControllableTarget::Type type() const override { return Inspector::RemoteControllableTarget::Type::ServiceWorker; }
 
     String name() const override { return ASCIILiteral("ServiceWorker"); }
-    String url() const override { return m_scriptURL; }
+    String url() const override { return m_scopeURL; }
     bool hasLocalDebugger() const override { return false; }
 
     void connect(Inspector::FrontendChannel*, bool isAutomaticConnection = false, bool immediatelyPause = false) override;
@@ -55,7 +55,7 @@ public:
 
 private:
     ServiceWorkerThreadProxy& m_serviceWorkerThreadProxy;
-    String m_scriptURL;
+    String m_scopeURL;
 };
 
 } // namespace WebCore