[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit e0d483aad78888a06bc1d660d05118615ccd693a
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 21 07:25:24 2010 +0000

    2010-12-20  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: fall back to object formatting in case dom is not yet loaded.
            https://bugs.webkit.org/show_bug.cgi?id=44273
    
            Sometimes DOM is loaded after the inline message is being formatted, so we get
            no nodeId for it. Let us fall back to object formatting in such cases.
    
            * inspector/front-end/ConsoleView.js:
            (WebInspector.ConsoleView.prototype._formatnode):
            (WebInspector.ConsoleMessage):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74399 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8a22663..be98e01 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,19 @@
 2010-12-20  Pavel Feldman  <pfeldman at chromium.org>
 
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: fall back to object formatting in case dom is not yet loaded.
+        https://bugs.webkit.org/show_bug.cgi?id=44273
+
+        Sometimes DOM is loaded after the inline message is being formatted, so we get
+        no nodeId for it. Let us fall back to object formatting in such cases.
+
+        * inspector/front-end/ConsoleView.js:
+        (WebInspector.ConsoleView.prototype._formatnode):
+        (WebInspector.ConsoleMessage):
+
+2010-12-20  Pavel Feldman  <pfeldman at chromium.org>
+
         Reviewed by Joseph Pecoraro.
 
         Web Inspector: cycle through tag name / attributes / new attribute on Tab.
diff --git a/WebCore/inspector/front-end/ConsoleView.js b/WebCore/inspector/front-end/ConsoleView.js
index 9e737bc..03fe14a 100644
--- a/WebCore/inspector/front-end/ConsoleView.js
+++ b/WebCore/inspector/front-end/ConsoleView.js
@@ -563,8 +563,12 @@ WebInspector.ConsoleView.prototype = {
     {
         function printNode(nodeId)
         {
-            if (!nodeId)
+            if (!nodeId) {
+                // Sometimes DOM is loaded after the sync message is being formatted, so we get no
+                // nodeId here. So we fall back to object formatting here.
+                this._formatobject(object, elem);
                 return;
+            }
             var treeOutline = new WebInspector.ElementsTreeOutline();
             treeOutline.showInElementsPanelEnabled = true;
             treeOutline.rootDOMNode = WebInspector.domAgent.nodeForId(nodeId);
@@ -573,8 +577,7 @@ WebInspector.ConsoleView.prototype = {
                 treeOutline.element.addStyleClass("single-node");
             elem.appendChild(treeOutline.element);
         }
-
-        object.pushNodeToFrontend(printNode);
+        object.pushNodeToFrontend(printNode.bind(this));
     },
 
     _formatarray: function(arr, elem)

-- 
WebKit Debian packaging