Changeset 245726 in webkit

Timestamp:

May 23, 2019, 4:36:36 PM (7 years ago)

Author:

Ross Kirsling

Message:

Socket-based RWI should be able to inspect a JSContext
​https://bugs.webkit.org/show_bug.cgi?id=198197

Reviewed by Don Olmstead.

Source/JavaScriptCore:

• inspector/remote/socket/RemoteInspectorSocket.cpp:

(Inspector::RemoteInspector::listingForInspectionTarget const):
Just use the debuggableType strings that WebInspectorUI ultimately wants.

Source/WebKit:

• UIProcess/socket/RemoteInspectorClient.cpp:

(WebKit::RemoteInspectorClient::inspect):

• UIProcess/socket/RemoteInspectorClient.h:
• UIProcess/socket/RemoteInspectorProtocolHandler.cpp:

(WebKit::RemoteInspectorProtocolHandler::inspect):
(WebKit::RemoteInspectorProtocolHandler::targetListChanged):
(WebKit::RemoteInspectorProtocolHandler::platformStartTask):

• UIProcess/socket/RemoteInspectorProtocolHandler.h:

Have the RWI client actually pass the debuggableType to WebInspectorUI.

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/inspector/remote/socket/RemoteInspectorSocket.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/socket/RemoteInspectorClient.cpp (modified) (4 diffs)
• WebKit/UIProcess/socket/RemoteInspectorClient.h (modified) (1 diff)
• WebKit/UIProcess/socket/RemoteInspectorProtocolHandler.cpp (modified) (3 diffs)
• WebKit/UIProcess/socket/RemoteInspectorProtocolHandler.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-05-23  Ross Kirsling  <ross.kirsling@sony.com>
+
+        Socket-based RWI should be able to inspect a JSContext
+        https://bugs.webkit.org/show_bug.cgi?id=198197
+
+        Reviewed by Don Olmstead.
+
+        * inspector/remote/socket/RemoteInspectorSocket.cpp:
+        (Inspector::RemoteInspector::listingForInspectionTarget const):
+        Just use the debuggableType strings that WebInspectorUI ultimately wants.
+
 2019-05-23  Tadeu Zagallo  <tzagallo@apple.com>
 

trunk/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorSocket.cpp

@@ -141 +141 @@
     targetListing->setBoolean("hasLocalDebugger"_s, target.hasLocalDebugger());
     if (target.type() == RemoteInspectionTarget::Type::Web)
-        targetListing->setString("type"_s, "Web"_s);
+        targetListing->setString("type"_s, "web"_s);
     else if (target.type() == RemoteInspectionTarget::Type::JavaScript)
-        targetListing->setString("type"_s, "JavaScript"_s);
+        targetListing->setString("type"_s, "javascript"_s);
     else if (target.type() == RemoteInspectionTarget::Type::ServiceWorker)
-        targetListing->setString("type"_s, "ServiceWorker"_s);
+        targetListing->setString("type"_s, "service-worker"_s);
 
     return targetListing;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-23  Ross Kirsling  <ross.kirsling@sony.com>
+
+        Socket-based RWI should be able to inspect a JSContext
+        https://bugs.webkit.org/show_bug.cgi?id=198197
+
+        Reviewed by Don Olmstead.
+
+        * UIProcess/socket/RemoteInspectorClient.cpp:
+        (WebKit::RemoteInspectorClient::inspect):
+        * UIProcess/socket/RemoteInspectorClient.h:
+        * UIProcess/socket/RemoteInspectorProtocolHandler.cpp:
+        (WebKit::RemoteInspectorProtocolHandler::inspect):
+        (WebKit::RemoteInspectorProtocolHandler::targetListChanged):
+        (WebKit::RemoteInspectorProtocolHandler::platformStartTask):
+        * UIProcess/socket/RemoteInspectorProtocolHandler.h:
+        Have the RWI client actually pass the debuggableType to WebInspectorUI.
+
 2019-05-22  Stephanie Lewis  <slewis@apple.com>
 

trunk/Source/WebKit/UIProcess/socket/RemoteInspectorClient.cpp

@@ -37 +37 @@
     WTF_MAKE_FAST_ALLOCATED();
 public:
-    RemoteInspectorProxy(RemoteInspectorClient& inspectorClient, ConnectionID connectionID, TargetID targetID)
+    RemoteInspectorProxy(RemoteInspectorClient& inspectorClient, ConnectionID connectionID, TargetID targetID, const String& type)
         : m_proxy(RemoteWebInspectorProxy::create())
         , m_inspectorClient(inspectorClient)
         , m_connectionID(connectionID)
         , m_targetID(targetID)
+        , m_debuggableType(type)
     {
         m_proxy->setClient(this);
@@ -54 +55 @@
     void load()
     {
-        m_proxy->load("web", "");
+        m_proxy->load(m_debuggableType, String());
     }
 
@@ -82 +83 @@
     ConnectionID m_connectionID;
     TargetID m_targetID;
+    String m_debuggableType;
 };
 
@@ -139 +141 @@
 }
 
-void RemoteInspectorClient::inspect(ConnectionID connectionID, TargetID targetID)
-{
-    auto addResult = m_inspectorProxyMap.ensure(std::make_pair(connectionID, targetID), [this, connectionID, targetID] {
-        return std::make_unique<RemoteInspectorProxy>(*this, connectionID, targetID);
+void RemoteInspectorClient::inspect(ConnectionID connectionID, TargetID targetID, const String& type)
+{
+    auto addResult = m_inspectorProxyMap.ensure(std::make_pair(connectionID, targetID), [this, connectionID, targetID, &type] {
+        return std::make_unique<RemoteInspectorProxy>(*this, connectionID, targetID, type);
     });
 

trunk/Source/WebKit/UIProcess/socket/RemoteInspectorClient.h

@@ -65 +65 @@
     const HashMap<ConnectionID, Vector<Target>>& targets() const { return m_targets; }
 
-    void inspect(ConnectionID, TargetID);
+    void inspect(ConnectionID, TargetID, const String&);
     void sendMessageToBackend(ConnectionID, TargetID, const String&);
     void closeFromFrontend(ConnectionID, TargetID);

trunk/Source/WebKit/UIProcess/socket/RemoteInspectorProtocolHandler.cpp

@@ -53 +53 @@
     {
         auto tokens = serializedScriptValue.toString().split(":");
-        if (tokens.size() != 2)
+        if (tokens.size() != 3)
             return;
 
         URL requestURL { { }, page.pageLoadState().url() };
-        m_inspectorProtocolHandler.inspect(requestURL.hostAndPort(), tokens[0].toUIntStrict(), tokens[1].toUIntStrict());
+        m_inspectorProtocolHandler.inspect(requestURL.hostAndPort(), tokens[0].toUIntStrict(), tokens[1].toUIntStrict(), tokens[2]);
     }
 
@@ -64 +64 @@
 };
 
-void RemoteInspectorProtocolHandler::inspect(const String& hostAndPort, ConnectionID connectionID, TargetID targetID)
+void RemoteInspectorProtocolHandler::inspect(const String& hostAndPort, ConnectionID connectionID, TargetID targetID, const String& type)
 {
     if (auto* client = m_inspectorClients.get(hostAndPort))
-        client->inspect(connectionID, targetID);
+        client->inspect(connectionID, targetID, type);
 }
 
 void RemoteInspectorProtocolHandler::targetListChanged(RemoteInspectorClient&)
 {
+    if (m_page.pageLoadState().isLoading())
+        return;
+
     m_page.reload({ });
 }
@@ -119 +122 @@
                     "<tbody><tr>"
                     "<td class=\"data\"><div class=\"targetname\">", target.name, "</div><div class=\"targeturl\">", target.url, "</div></td>"
-                    "<td class=\"input\"><input type=\"button\" value=\"Inspect\" onclick=\"window.webkit.messageHandlers.inspector.postMessage('", connectionID, ":", target.id, "');\"></td>"
+                    "<td class=\"input\"><input type=\"button\" value=\"Inspect\" onclick=\"window.webkit.messageHandlers.inspector.postMessage('", connectionID, ":", target.id, ":", target.type, "');\"></td>"
                     "</tr></tbody>"
                 ));

trunk/Source/WebKit/UIProcess/socket/RemoteInspectorProtocolHandler.h

@@ -43 +43 @@
     static Ref<RemoteInspectorProtocolHandler> create(WebPageProxy& page) { return adoptRef(*new RemoteInspectorProtocolHandler(page)); }
 
-    void inspect(const String&, ConnectionID, TargetID);
+    void inspect(const String& hostAndPort, ConnectionID, TargetID, const String& type);
 
 private: