[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[yurys at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 996bb449c247db34cdab5e345953fd5ed2768fc9
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 08:30:10 2010 +0000

    2010-07-20  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: jump to source is broken for call frames logged by console.trace
            https://bugs.webkit.org/show_bug.cgi?id=42619
    
            * inspector/front-end/ConsoleView.js:
            (WebInspector.ConsoleMessage.prototype._populateStackTraceTreeElement):
            * inspector/front-end/treeoutline.js: allow passing HTML element as a title.
            (TreeElement.prototype.set title):
            (TreeElement.prototype.set shouldRefreshChildren):
            (TreeElement.prototype._setListItemNodeContent):
            (TreeElement.prototype._attach):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63732 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f0fb9ad..e4a04d0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-20  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: jump to source is broken for call frames logged by console.trace
+        https://bugs.webkit.org/show_bug.cgi?id=42619
+
+        * inspector/front-end/ConsoleView.js:
+        (WebInspector.ConsoleMessage.prototype._populateStackTraceTreeElement):
+        * inspector/front-end/treeoutline.js: allow passing HTML element as a title.
+        (TreeElement.prototype.set title):
+        (TreeElement.prototype.set shouldRefreshChildren):
+        (TreeElement.prototype._setListItemNodeContent):
+        (TreeElement.prototype._attach):
+
 2010-07-20  Tony Chang  <tony at chromium.org>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/inspector/front-end/ConsoleView.js b/WebCore/inspector/front-end/ConsoleView.js
index c1d621b..b2da77e 100644
--- a/WebCore/inspector/front-end/ConsoleView.js
+++ b/WebCore/inspector/front-end/ConsoleView.js
@@ -857,17 +857,17 @@ WebInspector.ConsoleMessage.prototype = {
         for (var i = 0; i < this._stackTrace.length; i++) {
             var frame = this._stackTrace[i];
 
-            var li = document.createElement("li");
+            var content = document.createElement("div");
             var messageTextElement = document.createElement("span");
             messageTextElement.className = "console-message-text source-code";
             var functionName = frame.functionName || WebInspector.UIString("(anonymous function)");
             messageTextElement.appendChild(document.createTextNode(functionName));
-            li.appendChild(messageTextElement);
+            content.appendChild(messageTextElement);
 
             var urlElement = WebInspector.linkifyResourceAsNode(frame.sourceURL, "scripts", frame.lineNumber, "console-message-url"); 
-            li.appendChild(urlElement);
+            content.appendChild(urlElement);
 
-            var treeElement = new TreeElement(li.innerHTML);
+            var treeElement = new TreeElement(content);
             parentTreeElement.appendChild(treeElement);
         }
     },
diff --git a/WebCore/inspector/front-end/treeoutline.js b/WebCore/inspector/front-end/treeoutline.js
index 297bbab..5891401 100644
--- a/WebCore/inspector/front-end/treeoutline.js
+++ b/WebCore/inspector/front-end/treeoutline.js
@@ -482,8 +482,7 @@ TreeElement.prototype = {
 
     set title(x) {
         this._title = x;
-        if (this._listItemNode)
-            this._listItemNode.innerHTML = x;
+        this._setListItemNodeContent();
     },
 
     get tooltip() {
@@ -548,6 +547,20 @@ TreeElement.prototype = {
         this._shouldRefreshChildren = x;
         if (x && this.expanded)
             this.expand();
+    },
+
+    _setListItemNodeContent: function()
+    {
+        if (!this._listItemNode)
+            return;
+        if (!this._title || typeof this._title === "string")
+            this._listItemNode.innerHTML = this._title;
+        else {
+            this._listItemNode.removeChildren();
+            if (this._title.parentNode)
+                this._title.parentNode.removeChild(this._title);
+            this._listItemNode.appendChild(this._title);
+        }
     }
 }
 
@@ -566,7 +579,7 @@ TreeElement.prototype._attach = function()
 
         this._listItemNode = this.treeOutline._childrenListNode.ownerDocument.createElement("li");
         this._listItemNode.treeElement = this;
-        this._listItemNode.innerHTML = this._title;
+        this._setListItemNodeContent();
         this._listItemNode.title = this._tooltip ? this._tooltip : "";
 
         if (this.hidden)

-- 
WebKit Debian packaging