[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 12:59:47 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 963d1d11d6be2a84807ffca3ba5b91061920ee45
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 3 20:22:55 2010 +0000
2010-09-03 Sheriff Bot <webkit.review.bot at 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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66765 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index be8704a..d66088f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2010-09-03 Sheriff Bot <webkit.review.bot at 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 at chromium.org>
[chromium] Compile fixes for 66746
diff --git a/WebCore/inspector/CodeGeneratorInspector.pm b/WebCore/inspector/CodeGeneratorInspector.pm
index df3fcc4..d76fbd3 100644
--- a/WebCore/inspector/CodeGeneratorInspector.pm
+++ b/WebCore/inspector/CodeGeneratorInspector.pm
@@ -537,8 +537,8 @@ WebInspector.InspectorBackendStub.prototype = {
console.error("Protocol Error: Optional callback argument for 'InspectorBackend.%s' call should be a function but its type is '%s'.", request.command, typeof args[0]);
return;
}
+ request.seq = WebInspector.Callback.wrap(args[0]);
}
- request.seq = WebInspector.Callback.wrap(args[0] ? args[0] : function() { });
var message = JSON.stringify(request);
InspectorFrontendHost.sendMessageToBackend(message);
diff --git a/WebCore/inspector/Inspector.idl b/WebCore/inspector/Inspector.idl
index 38bfc92..169b188 100644
--- a/WebCore/inspector/Inspector.idl
+++ b/WebCore/inspector/Inspector.idl
@@ -161,7 +161,7 @@ module core {
[handler=Controller] void addScriptToEvaluateOnLoad(in String scriptSource);
[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);
[handler=DOM] void setTextNodeValue(in long nodeId, in String value, out boolean success);
diff --git a/WebCore/inspector/InspectorDOMAgent.cpp b/WebCore/inspector/InspectorDOMAgent.cpp
index 01b9b63..23c22aa 100644
--- a/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/WebCore/inspector/InspectorDOMAgent.cpp
@@ -354,26 +354,18 @@ bool InspectorDOMAgent::pushDocumentToFrontend()
return true;
}
-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;
-
- NodeToIdMap* nodeMap = m_idToNodesMap.get(nodeId);
- return buildArrayForContainerChildren(node, 1, nodeMap);
-}
-
-void InspectorDOMAgent::pushChildNodesToFrontend(long nodeId)
-{
+ return;
if (m_childrenRequested.contains(nodeId))
return;
- PassRefPtr<InspectorArray> nodes = getChildNodesArray(nodeId);
- if (nodes) {
- m_frontend->setChildNodes(nodeId, nodes);
- m_childrenRequested.add(nodeId);
- }
+ NodeToIdMap* nodeMap = m_idToNodesMap.get(nodeId);
+ RefPtr<InspectorArray> children = buildArrayForContainerChildren(node, 1, nodeMap);
+ m_childrenRequested.add(nodeId);
+ m_frontend->setChildNodes(nodeId, children.release());
}
long InspectorDOMAgent::inspectedNode(unsigned long num)
@@ -404,12 +396,9 @@ Node* InspectorDOMAgent::nodeForId(long id)
return 0;
}
-void InspectorDOMAgent::getChildNodes(long nodeId, RefPtr<InspectorArray>* nodes)
+void InspectorDOMAgent::getChildNodes(long nodeId)
{
- PassRefPtr<InspectorArray> childNodes = getChildNodesArray(nodeId);
- if (childNodes)
- *nodes = childNodes;
- m_childrenRequested.add(nodeId);
+ pushChildNodesToFrontend(nodeId);
}
long InspectorDOMAgent::pushNodePathToFrontend(Node* nodeToPush)
diff --git a/WebCore/inspector/InspectorDOMAgent.h b/WebCore/inspector/InspectorDOMAgent.h
index 2927fdd..9751e8e 100644
--- a/WebCore/inspector/InspectorDOMAgent.h
+++ b/WebCore/inspector/InspectorDOMAgent.h
@@ -99,7 +99,7 @@ namespace WebCore {
virtual bool operator==(const EventListener& other);
// 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);
void removeNode(long nodeId, long* outNodeId);
@@ -148,7 +148,6 @@ namespace WebCore {
void copyNode(long nodeId);
private:
- PassRefPtr<InspectorArray> getChildNodesArray(long nodeId);
static CSSStyleSheet* getParentStyleSheet(CSSStyleDeclaration*);
void startListening(Document* document);
void stopListening(Document* document);
diff --git a/WebCore/inspector/front-end/DOMAgent.js b/WebCore/inspector/front-end/DOMAgent.js
index 5797502..9b386c3 100644
--- a/WebCore/inspector/front-end/DOMAgent.js
+++ b/WebCore/inspector/front-end/DOMAgent.js
@@ -341,9 +341,7 @@ WebInspector.DOMAgent.prototype = {
callback(children);
return;
}
- function mycallback(nodes) {
- parent._setChildrenPayload(nodes);
- WebInspector.domAgent._bindNodes(parent.children);
+ function mycallback() {
callback(parent.children);
}
InspectorBackend.getChildNodes(parent.id, mycallback);
diff --git a/WebCore/inspector/front-end/WorkersSidebarPane.js b/WebCore/inspector/front-end/WorkersSidebarPane.js
index be8b86f..7d6a00f 100644
--- a/WebCore/inspector/front-end/WorkersSidebarPane.js
+++ b/WebCore/inspector/front-end/WorkersSidebarPane.js
@@ -80,6 +80,7 @@ WebInspector.WorkersSidebarPane.prototype = {
reset: function()
{
+ InspectorBackend.removeAllScriptsToEvaluateOnLoad();
this.setInstrumentation(this._enableWorkersCheckbox.checked);
this._treeOutline.removeChildren();
this._workers = {};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list