Changeset 66765 in webkit

Timestamp:

Sep 3, 2010 1:22:55 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-09-03 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r66732.
​http://trac.webkit.org/changeset/66732
​https://bugs.webkit.org/show_bug.cgi?id=45195

the patch is not matched with general publish/subscribe scheme
implemented in the Inspector API (Requested by loislo on
#webkit).

• inspector/CodeGeneratorInspector.pm:
• inspector/Inspector.idl:
• inspector/InspectorDOMAgent.cpp: (WebCore::InspectorDOMAgent::pushChildNodesToFrontend): (WebCore::InspectorDOMAgent::getChildNodes):
• inspector/InspectorDOMAgent.h:
• inspector/front-end/DOMAgent.js: (WebInspector.DOMAgent.prototype.getChildNodesAsync.mycallback): (WebInspector.DOMAgent.prototype.getChildNodesAsync):
• inspector/front-end/WorkersSidebarPane.js: (WebInspector.WorkersSidebarPane.prototype.reset):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/CodeGeneratorInspector.pm (modified) (1 diff)
• inspector/Inspector.idl (modified) (1 diff)
• inspector/InspectorDOMAgent.cpp (modified) (2 diffs)
• inspector/InspectorDOMAgent.h (modified) (2 diffs)
• inspector/front-end/DOMAgent.js (modified) (1 diff)
• inspector/front-end/WorkersSidebarPane.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-03  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r66732.
+        http://trac.webkit.org/changeset/66732
+        https://bugs.webkit.org/show_bug.cgi?id=45195
+
+        the patch is not matched with general publish/subscribe scheme
+        implemented in the Inspector API (Requested by loislo on
+        #webkit).
+
+        * inspector/CodeGeneratorInspector.pm:
+        * inspector/Inspector.idl:
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::pushChildNodesToFrontend):
+        (WebCore::InspectorDOMAgent::getChildNodes):
+        * inspector/InspectorDOMAgent.h:
+        * inspector/front-end/DOMAgent.js:
+        (WebInspector.DOMAgent.prototype.getChildNodesAsync.mycallback):
+        (WebInspector.DOMAgent.prototype.getChildNodesAsync):
+        * inspector/front-end/WorkersSidebarPane.js:
+        (WebInspector.WorkersSidebarPane.prototype.reset):
+
 2010-09-03  James Robinson  <jamesr@chromium.org>
 

trunk/WebCore/inspector/CodeGeneratorInspector.pm

@@ -538 +538 @@
                 return;
             }
+            request.seq = WebInspector.Callback.wrap(args[0]);
         }
-        request.seq = WebInspector.Callback.wrap(args[0] ? args[0] : function() { });
 
         var message = JSON.stringify(request);

trunk/WebCore/inspector/Inspector.idl

@@ -162 +162 @@
         [handler=Controller] void removeAllScriptsToEvaluateOnLoad();
 
-        [handler=DOM] void getChildNodes(in long nodeId, out Array nodes);
+        [handler=DOM] void getChildNodes(in long nodeId);
         [handler=DOM] void setAttribute(in long elementId, in String name, in String value, out boolean success);
         [handler=DOM] void removeAttribute(in long elementId, in String name, out boolean success);

trunk/WebCore/inspector/InspectorDOMAgent.cpp

@@ -355 +355 @@
 }
 
-PassRefPtr<InspectorArray> InspectorDOMAgent::getChildNodesArray(long nodeId)
+void InspectorDOMAgent::pushChildNodesToFrontend(long nodeId)
 {
     Node* node = nodeForId(nodeId);
     if (!node || (node->nodeType() != Node::ELEMENT_NODE && node->nodeType() != Node::DOCUMENT_NODE && node->nodeType() != Node::DOCUMENT_FRAGMENT_NODE))
-        return 0;
+        return;
+    if (m_childrenRequested.contains(nodeId))
+        return;
 
     NodeToIdMap* nodeMap = m_idToNodesMap.get(nodeId);
-    return buildArrayForContainerChildren(node, 1, nodeMap);
-}
-
-void InspectorDOMAgent::pushChildNodesToFrontend(long nodeId)
-{
-    if (m_childrenRequested.contains(nodeId))
-        return;
-
-    PassRefPtr<InspectorArray> nodes = getChildNodesArray(nodeId);
-    if (nodes) {
-        m_frontend->setChildNodes(nodeId, nodes);
-        m_childrenRequested.add(nodeId);
-    }
+    RefPtr<InspectorArray> children = buildArrayForContainerChildren(node, 1, nodeMap);
+    m_childrenRequested.add(nodeId);
+    m_frontend->setChildNodes(nodeId, children.release());
 }
 
@@ -405 +397 @@
 }
 
-void InspectorDOMAgent::getChildNodes(long nodeId, RefPtr<InspectorArray>* nodes)
-{
-    PassRefPtr<InspectorArray> childNodes = getChildNodesArray(nodeId);
-    if (childNodes)
-        *nodes = childNodes;
-    m_childrenRequested.add(nodeId);
+void InspectorDOMAgent::getChildNodes(long nodeId)
+{
+    pushChildNodesToFrontend(nodeId);
 }
 

trunk/WebCore/inspector/InspectorDOMAgent.h

@@ -100 +100 @@
 
         // Methods called from the frontend for DOM nodes inspection.
-        void getChildNodes(long nodeId, RefPtr<InspectorArray>* nodes);
+        void getChildNodes(long nodeId);
         void setAttribute(long elementId, const String& name, const String& value, bool* success);
         void removeAttribute(long elementId, const String& name, bool* success);
@@ -149 +149 @@
 
     private:
-        PassRefPtr<InspectorArray> getChildNodesArray(long nodeId);
         static CSSStyleSheet* getParentStyleSheet(CSSStyleDeclaration*);
         void startListening(Document* document);

trunk/WebCore/inspector/front-end/DOMAgent.js

@@ -342 +342 @@
             return;
         }
-        function mycallback(nodes) {
-            parent._setChildrenPayload(nodes);
-            WebInspector.domAgent._bindNodes(parent.children);
+        function mycallback() {
             callback(parent.children);
         }

trunk/WebCore/inspector/front-end/WorkersSidebarPane.js

@@ -81 +81 @@
     reset: function()
     {
+        InspectorBackend.removeAllScriptsToEvaluateOnLoad();
         this.setInstrumentation(this._enableWorkersCheckbox.checked);
         this._treeOutline.removeChildren();