[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
loislo at chromium.org
loislo at chromium.org
Wed Dec 22 18:10:53 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5178a38958daeb12884147a0aacd3c7fd2cd5945
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 8 13:27:55 2010 +0000
2010-12-07 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: Inspector protocol cleanup task. Remove
WebInspector wrappers for DOMAgent functions.
There were a lot of wrappers in WebInspector namespace
for different WebInspector agents functions. As far as we have a
generic mechanic for such functions we can remove these
wrappers and register domAgent instance as a handler for
DOM domain notifications.
https://bugs.webkit.org/show_bug.cgi?id=50626
* inspector/Inspector.idl:
* inspector/front-end/DOMAgent.js:
(WebInspector.DOMNode):
(WebInspector.DOMAgent):
(WebInspector.DOMAgent.prototype.attributesUpdated):
(WebInspector.DOMAgent.prototype.characterDataModified):
(WebInspector.DOMAgent.prototype.setDocument):
(WebInspector.DOMAgent.prototype.setDetachedRoot):
(WebInspector.DOMAgent.prototype.setChildNodes):
(WebInspector.DOMAgent.prototype.childNodeCountUpdated):
(WebInspector.DOMAgent.prototype.childNodeInserted):
(WebInspector.DOMAgent.prototype.childNodeRemoved):
(WebInspector.EventListeners.getEventListenersForNodeAsync):
* inspector/front-end/inspector.js:
(WebInspector.didCommitLoad):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73511 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 69a1062..e4663e4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,34 @@
+2010-12-07 Ilya Tikhonovsky <loislo at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: Inspector protocol cleanup task. Remove
+ WebInspector wrappers for DOMAgent functions.
+
+ There were a lot of wrappers in WebInspector namespace
+ for different WebInspector agents functions. As far as we have a
+ generic mechanic for such functions we can remove these
+ wrappers and register domAgent instance as a handler for
+ DOM domain notifications.
+
+ https://bugs.webkit.org/show_bug.cgi?id=50626
+
+ * inspector/Inspector.idl:
+ * inspector/front-end/DOMAgent.js:
+ (WebInspector.DOMNode):
+ (WebInspector.DOMAgent):
+ (WebInspector.DOMAgent.prototype.attributesUpdated):
+ (WebInspector.DOMAgent.prototype.characterDataModified):
+ (WebInspector.DOMAgent.prototype.setDocument):
+ (WebInspector.DOMAgent.prototype.setDetachedRoot):
+ (WebInspector.DOMAgent.prototype.setChildNodes):
+ (WebInspector.DOMAgent.prototype.childNodeCountUpdated):
+ (WebInspector.DOMAgent.prototype.childNodeInserted):
+ (WebInspector.DOMAgent.prototype.childNodeRemoved):
+ (WebInspector.EventListeners.getEventListenersForNodeAsync):
+ * inspector/front-end/inspector.js:
+ (WebInspector.didCommitLoad):
+
2010-12-08 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebCore/inspector/Inspector.idl b/WebCore/inspector/Inspector.idl
index 67a5cde..68a1b41 100644
--- a/WebCore/inspector/Inspector.idl
+++ b/WebCore/inspector/Inspector.idl
@@ -34,12 +34,12 @@ module core {
interface [Conditional=INSPECTOR] Inspector {
[notify] void addRecordToTimeline(out Object record);
[notify] void addNodesToSearchResult(out Array nodeIds);
- [notify] void attributesUpdated(out long id, out Array attributes);
+ [notify, domain=DOM] void attributesUpdated(out long id, out Array attributes);
[notify] void bringToFront();
- [notify] void characterDataModified(out long id, out String newValue);
- [notify] void childNodeCountUpdated(out long id, out int newValue);
- [notify] void childNodeInserted(out long parentId, out long prevId, out Object node);
- [notify] void childNodeRemoved(out long parentId, out long id);
+ [notify, domain=DOM] void characterDataModified(out long id, out String newValue);
+ [notify, domain=DOM] void childNodeCountUpdated(out long id, out int newValue);
+ [notify, domain=DOM] void childNodeInserted(out long parentId, out long prevId, out Object node);
+ [notify, domain=DOM] void childNodeRemoved(out long parentId, out long id);
[notify] void didCommitLoad();
[notify] void evaluateForTestInFrontend(out long testCallId, out String script);
[notify] void disconnectFromBackend();
@@ -48,9 +48,9 @@ module core {
[notify] void loadEventFired(out double time);
[notify] void reset();
[notify] void resetProfilesPanel();
- [notify] void setChildNodes(out long parentId, out Array nodes);
- [notify] void setDetachedRoot(out Object root);
- [notify] void setDocument(out Value root);
+ [notify, domain=DOM] void setChildNodes(out long parentId, out Array nodes);
+ [notify, domain=DOM] void setDetachedRoot(out Object root);
+ [notify, domain=DOM] void setDocument(out Value root);
[notify] void showPanel(out String panel);
[notify] void timelineProfilerWasStarted();
[notify] void timelineProfilerWasStopped();
diff --git a/WebCore/inspector/front-end/DOMAgent.js b/WebCore/inspector/front-end/DOMAgent.js
index 24e29ec..9ce08f9 100644
--- a/WebCore/inspector/front-end/DOMAgent.js
+++ b/WebCore/inspector/front-end/DOMAgent.js
@@ -80,8 +80,6 @@ WebInspector.DOMNode = function(doc, payload) {
this.name = payload.name;
this.value = payload.value;
}
-
- InspectorBackend.registerDomainDispatcher("DOM", this);
}
WebInspector.DOMNode.prototype = {
@@ -302,6 +300,7 @@ WebInspector.DOMAgent = function() {
this._window = new WebInspector.DOMWindow(this);
this._idToDOMNode = null;
this.document = null;
+ InspectorBackend.registerDomainDispatcher("DOM", this);
}
WebInspector.DOMAgent.prototype = {
@@ -352,7 +351,7 @@ WebInspector.DOMAgent.prototype = {
elem.updateTitle();
},
- _attributesUpdated: function(nodeId, attrsArray)
+ attributesUpdated: function(nodeId, attrsArray)
{
var node = this._idToDOMNode[nodeId];
node._setAttributesPayload(attrsArray);
@@ -360,7 +359,7 @@ WebInspector.DOMAgent.prototype = {
this.document._fireDomEvent("DOMAttrModified", event);
},
- _characterDataModified: function(nodeId, newValue)
+ characterDataModified: function(nodeId, newValue)
{
var node = this._idToDOMNode[nodeId];
node._nodeValue = newValue;
@@ -374,7 +373,7 @@ WebInspector.DOMAgent.prototype = {
return this._idToDOMNode[nodeId];
},
- _setDocument: function(payload)
+ setDocument: function(payload)
{
this._idToDOMNode = {};
if (payload && "id" in payload) {
@@ -387,13 +386,13 @@ WebInspector.DOMAgent.prototype = {
WebInspector.panels.elements.setDocument(this.document);
},
- _setDetachedRoot: function(payload)
+ setDetachedRoot: function(payload)
{
var root = new WebInspector.DOMNode(this.document, payload);
this._idToDOMNode[payload.id] = root;
},
- _setChildNodes: function(parentId, payloads)
+ setChildNodes: function(parentId, payloads)
{
var parent = this._idToDOMNode[parentId];
parent._setChildrenPayload(payloads);
@@ -410,7 +409,7 @@ WebInspector.DOMAgent.prototype = {
}
},
- _childNodeCountUpdated: function(nodeId, newValue)
+ childNodeCountUpdated: function(nodeId, newValue)
{
var node = this._idToDOMNode[nodeId];
node._childNodeCount = newValue;
@@ -420,7 +419,7 @@ WebInspector.DOMAgent.prototype = {
treeElement.hasChildren = newValue;
},
- _childNodeInserted: function(parentId, prevId, payload)
+ childNodeInserted: function(parentId, prevId, payload)
{
var parent = this._idToDOMNode[parentId];
var prev = this._idToDOMNode[prevId];
@@ -430,7 +429,7 @@ WebInspector.DOMAgent.prototype = {
this.document._fireDomEvent("DOMNodeInserted", event);
},
- _childNodeRemoved: function(parentId, nodeId)
+ childNodeRemoved: function(parentId, nodeId)
{
var parent = this._idToDOMNode[parentId];
var node = this._idToDOMNode[nodeId];
@@ -525,43 +524,3 @@ WebInspector.EventListeners.getEventListenersForNodeAsync = function(node, callb
return;
InspectorBackend.getEventListenersForNode(node.id, callback);
}
-
-WebInspector.attributesUpdated = function()
-{
- this.domAgent._attributesUpdated.apply(this.domAgent, arguments);
-}
-
-WebInspector.characterDataModified = function()
-{
- this.domAgent._characterDataModified.apply(this.domAgent, arguments);
-}
-
-WebInspector.setDocument = function()
-{
- this.domAgent._setDocument.apply(this.domAgent, arguments);
-}
-
-WebInspector.setDetachedRoot = function()
-{
- this.domAgent._setDetachedRoot.apply(this.domAgent, arguments);
-}
-
-WebInspector.setChildNodes = function()
-{
- this.domAgent._setChildNodes.apply(this.domAgent, arguments);
-}
-
-WebInspector.childNodeCountUpdated = function()
-{
- this.domAgent._childNodeCountUpdated.apply(this.domAgent, arguments);
-}
-
-WebInspector.childNodeInserted = function()
-{
- this.domAgent._childNodeInserted.apply(this.domAgent, arguments);
-}
-
-WebInspector.childNodeRemoved = function()
-{
- this.domAgent._childNodeRemoved.apply(this.domAgent, arguments);
-}
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 008010d..c40924c 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -1366,7 +1366,7 @@ WebInspector.inspectedURLChanged = function(url)
WebInspector.didCommitLoad = function()
{
// Cleanup elements panel early on inspected page refresh.
- WebInspector.setDocument(null);
+ WebInspector.domAgent.setDocument(null);
}
WebInspector.updateConsoleMessageExpiredCount = function(count)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list