diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/inspector/front-end/PropertiesSidebarPane.js | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/inspector/front-end/PropertiesSidebarPane.js')
-rw-r--r-- | Source/WebCore/inspector/front-end/PropertiesSidebarPane.js | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/WebCore/inspector/front-end/PropertiesSidebarPane.js b/Source/WebCore/inspector/front-end/PropertiesSidebarPane.js index 0c314bc..4df313c 100644 --- a/Source/WebCore/inspector/front-end/PropertiesSidebarPane.js +++ b/Source/WebCore/inspector/front-end/PropertiesSidebarPane.js @@ -42,20 +42,19 @@ WebInspector.PropertiesSidebarPane.prototype = { return; } - RuntimeAgent.releaseObjectGroup(0, "dom-selection"); WebInspector.RemoteObject.resolveNode(node, nodeResolved.bind(this)); - function nodeResolved(objectPayload) + function nodeResolved(object) { - if (!objectPayload) + if (!object) return; - var object = WebInspector.RemoteObject.fromPayload(objectPayload); object.evaluate("var proto = this; result = {}; var counter = 1; while (proto) { result[counter++] = proto; proto = proto.__proto__ }; return result;", nodePrototypesReady.bind(this)); + object.release(); } - function nodePrototypesReady(objectPayload) + function nodePrototypesReady(error, objectPayload) { - if (!objectPayload) + if (error || !objectPayload) return; var object = WebInspector.RemoteObject.fromPayload(objectPayload); object.getOwnProperties(false, fillSection.bind(this)); |