Changeset 133191 in webkit

Timestamp:

Nov 1, 2012, 10:42:42 AM (12 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: expose Inspector.detached event factory to the embedder.
​https://bugs.webkit.org/show_bug.cgi?id=100967

Reviewed by Vsevolod Vlasov.

That way embedder will be able to send messages on behalf of the backend being destructed.

• public/WebDevToolsAgent.h:

(WebDevToolsAgent):

• src/WebDevToolsAgentImpl.cpp:

(SerializingFrontendChannel):
(WebKit::SerializingFrontendChannel::sendMessageToFrontend):
(WebKit::WebDevToolsAgent::inspectorDetachedEvent):
(WebKit):
(WebKit::WebDevToolsAgent::workerDisconnectedFromWorkerEvent):
(WebKit::WebDevToolsAgent::disconnectEventAsText):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebDevToolsAgent.h (modified) (1 diff)
• src/WebDevToolsAgentImpl.cpp (modified) (3 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-11-01  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: expose Inspector.detached event factory to the embedder.
+        https://bugs.webkit.org/show_bug.cgi?id=100967
+
+        Reviewed by Vsevolod Vlasov.
+
+        That way embedder will be able to send messages on behalf of the backend being destructed.
+
+        * public/WebDevToolsAgent.h:
+        (WebDevToolsAgent):
+        * src/WebDevToolsAgentImpl.cpp:
+        (SerializingFrontendChannel):
+        (WebKit::SerializingFrontendChannel::sendMessageToFrontend):
+        (WebKit::WebDevToolsAgent::inspectorDetachedEvent):
+        (WebKit):
+        (WebKit::WebDevToolsAgent::workerDisconnectedFromWorkerEvent):
+        (WebKit::WebDevToolsAgent::disconnectEventAsText):
+
 2012-11-01  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebDevToolsAgent.h

@@ -81 +81 @@
     WEBKIT_EXPORT static void processPendingMessages();
 
-    // Returns a disconnect event that can be dispatched on the front-end
+    // Returns an Inspector.detached event that can be dispatched on the front-end by the embedder.
+    WEBKIT_EXPORT static WebString inspectorDetachedEvent(const WebString& reason);
+
+    // Returns a Worker.disconnectedFromWorker event that can be dispatched on the front-end
     // in order to let it know that it has disconnected from the agent.
+    WEBKIT_EXPORT static WebString workerDisconnectedFromWorkerEvent();
+
+    // FIXME: remove once migrated to workerDisconnectedFromWorkerEvent().
     WEBKIT_EXPORT static WebString disconnectEventAsText();
 };

trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp

@@ -349 +349 @@
 };
 
+class SerializingFrontendChannel : public InspectorFrontendChannel {
+public:
+    virtual bool sendMessageToFrontend(const String& message)
+    {
+        m_message = message;
+        return true;
+    }
+    String m_message;
+};
 
 WebDevToolsAgentImpl::WebDevToolsAgentImpl(
@@ -686 +695 @@
 }
 
-WebString WebDevToolsAgent::disconnectEventAsText()
-{
-    class ChannelImpl : public InspectorFrontendChannel {
-    public:
-        virtual bool sendMessageToFrontend(const String& message)
-        {
-            m_message = message;
-            return true;
-        }
-        String m_message;
-    } channel;
+WebString WebDevToolsAgent::inspectorDetachedEvent(const WebString& reason)
+{
+    SerializingFrontendChannel channel;
+    InspectorFrontend::Inspector inspector(&channel);
+    inspector.detached(reason);
+    return channel.m_message;
+}
+
+WebString WebDevToolsAgent::workerDisconnectedFromWorkerEvent()
+{
+    SerializingFrontendChannel channel;
 #if ENABLE(WORKERS)
     InspectorFrontend::Worker inspector(&channel);
@@ -704 +713 @@
 }
 
+// FIXME: remove this once migrated to workerDisconnectedFromWorkerEvent().
+WebString WebDevToolsAgent::disconnectEventAsText()
+{
+    return WebDevToolsAgent::workerDisconnectedFromWorkerEvent();
+}
+
 } // namespace WebKit