[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 2157e5fea7e110f955c2dca05e4d7519f889f5d0
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 18 17:36:40 2010 +0000

    2010-02-18  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: on-hover evaluation renders nodes and arrays as strings.
    
            https://bugs.webkit.org/show_bug.cgi?id=35103
    
            * inspector/front-end/SourceFrame.js:
            (WebInspector.SourceFrame.prototype._showPopup.showObjectPopup):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54969 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9f74785..666399b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-18  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: on-hover evaluation renders nodes and arrays as strings.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35103
+
+        * inspector/front-end/SourceFrame.js:
+        (WebInspector.SourceFrame.prototype._showPopup.showObjectPopup):
+
 2010-02-18  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/inspector/front-end/SourceFrame.js b/WebCore/inspector/front-end/SourceFrame.js
index 2a98f3c..b5a68fe 100644
--- a/WebCore/inspector/front-end/SourceFrame.js
+++ b/WebCore/inspector/front-end/SourceFrame.js
@@ -565,7 +565,7 @@ WebInspector.SourceFrame.prototype = {
                 return;
 
             var popupContentElement = null;
-            if (result.type !== "object") {
+            if (result.type !== "object" && result.type !== "node" && result.type !== "array") {
                 popupContentElement = document.createElement("span");
                 popupContentElement.className = "monospace";
                 popupContentElement.style.whiteSpace = "pre";

-- 
WebKit Debian packaging