[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 34a5ef3b12609223d2398701aa0a02d6d350c189
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 6 12:03:29 2009 +0000

    2009-10-06  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: Do not call nodeTitleInfo twice +
            followup fixes for r49101.
    
            https://bugs.webkit.org/show_bug.cgi?id=30087
    
            * inspector/front-end/ElementsTreeOutline.js:
            (WebInspector.ElementsTreeElement):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49173 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fd518da..5b08af7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-06  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Do not call nodeTitleInfo twice +
+        followup fixes for r49101.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30087
+
+        * inspector/front-end/ElementsTreeOutline.js:
+        (WebInspector.ElementsTreeElement):
+
 2009-10-06  Girish Ramakrishnan  <girish at forwardbias.in>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/inspector/front-end/ElementsTreeOutline.js b/WebCore/inspector/front-end/ElementsTreeOutline.js
index 7e7ab55..7ceee66 100644
--- a/WebCore/inspector/front-end/ElementsTreeOutline.js
+++ b/WebCore/inspector/front-end/ElementsTreeOutline.js
@@ -231,13 +231,13 @@ WebInspector.ElementsTreeOutline.prototype.__proto__ = TreeOutline.prototype;
 WebInspector.ElementsTreeElement = function(node)
 {
     var hasChildren = Preferences.ignoreWhitespace ? (firstChildSkippingWhitespace.call(node) ? true : false) : node.hasChildNodes();
-    var titleInfo = this._nodeTitleInfo(node, hasChildren, WebInspector.linkifyURL);
+    var hasChildrenOverride = hasChildren && !this._showInlineText(node);
 
-    if (titleInfo.hasChildren) 
+    if (hasChildrenOverride)
         this.whitespaceIgnored = Preferences.ignoreWhitespace;
 
     // The title will be updated in onattach.
-    TreeElement.call(this, "", node, titleInfo.hasChildren);
+    TreeElement.call(this, "", node, hasChildrenOverride);
 
     if (this.representedObject.nodeType == Node.ELEMENT_NODE)
         this._canAddAttributes = true;
@@ -726,7 +726,7 @@ WebInspector.ElementsTreeElement.prototype = {
         this.updateSelection();
         this._preventFollowingLinksOnDoubleClick();
     },
-    
+
     _nodeTitleInfo: function(node, hasChildren, linkify)
     {
         var info = {title: "", hasChildren: hasChildren};
@@ -762,7 +762,7 @@ WebInspector.ElementsTreeElement.prototype = {
                 // just show that text and the closing tag inline rather than
                 // create a subtree for them
                 
-                var textChild = onlyTextChild.call(this, Preferences.ignoreWhitespace);
+                var textChild = onlyTextChild.call(node, Preferences.ignoreWhitespace);
                 var showInlineText = textChild && textChild.textContent.length < Preferences.maxInlineTextChildLength;
                 
                 if (showInlineText) {
@@ -772,7 +772,7 @@ WebInspector.ElementsTreeElement.prototype = {
                 break;
                 
             case Node.TEXT_NODE:
-                if (isNodeWhitespace.call(this))
+                if (isNodeWhitespace.call(node))
                     info.title = "(whitespace)";
                 else {
                     if (node.parentNode && node.parentNode.nodeName.toLowerCase() == "script") {
@@ -818,6 +818,16 @@ WebInspector.ElementsTreeElement.prototype = {
         }
         
         return info;
+    },
+
+    _showInlineText: function(node)
+    {
+        if (node.nodeType === Node.ELEMENT_NODE) {
+            var textChild = onlyTextChild.call(node, Preferences.ignoreWhitespace);
+            if (textChild && textChild.textContent.length < Preferences.maxInlineTextChildLength)
+                return true;
+        }
+        return false;
     }
 }
 

-- 
WebKit Debian packaging