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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit dbb67a1db7464009f7e4ada2ca249d0e86f0fb8c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 1 20:33:37 2009 +0000

    2009-11-01  Keishi Hattori  <casey.hattori at gmail.com>
    
            Reviewed by Pavel Feldman.
    
            Fix Web Inspector: Bug with Message Bubble in Syntax Highlighter
            https://bugs.webkit.org/show_bug.cgi?id=30990
    
            * inspector/front-end/SourceFrame.js:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50390 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 02b8f31..0b3c00d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-01  Keishi Hattori  <casey.hattori at gmail.com>
+
+        Reviewed by Pavel Feldman.
+
+        Fix Web Inspector: Bug with Message Bubble in Syntax Highlighter
+        https://bugs.webkit.org/show_bug.cgi?id=30990
+
+        * inspector/front-end/SourceFrame.js:
+
 2009-10-31  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by John Sullivan.
diff --git a/WebCore/inspector/front-end/SourceFrame.js b/WebCore/inspector/front-end/SourceFrame.js
index 3e4ab6c..94f9276 100644
--- a/WebCore/inspector/front-end/SourceFrame.js
+++ b/WebCore/inspector/front-end/SourceFrame.js
@@ -1270,17 +1270,11 @@ WebInspector.JavaScriptSourceSyntaxHighlighter.prototype = {
             var row = rows[this.lineIndex];
             var line = row ? row.cells[1] : null;
             if (line && this.lineFragment) {
-                var messageBubble = null;
-                if (line.lastChild && line.lastChild.nodeType === Node.ELEMENT_NODE && line.lastChild.hasStyleClass("webkit-html-message-bubble")) {
-                    messageBubble = line.lastChild;
-                    line.removeChild(messageBubble);
-                }
-                
                 Element.prototype.removeChildren.call(line);
                 
                 line.appendChild(this.lineFragment);
-                if (messageBubble)
-                    line.appendChild(messageBubble);
+                if (this.messageBubble)
+                    line.appendChild(this.messageBubble);
                 this.lineFragment = null;
             }
             this.lineIndex++;
@@ -1291,6 +1285,13 @@ WebInspector.JavaScriptSourceSyntaxHighlighter.prototype = {
             }
             row = rows[this.lineIndex];
             line = row ? row.cells[1] : null;
+            
+            this.messageBubble = null;
+            if (line.lastChild && line.lastChild.nodeType === Node.ELEMENT_NODE && line.lastChild.hasStyleClass("webkit-html-message-bubble")) {
+                this.messageBubble = line.lastChild;
+                line.removeChild(this.messageBubble);
+            }
+
             this.lineCode = line.textContent;
             this.lineFragment = document.createDocumentFragment();
             this.cursor = 0;

-- 
WebKit Debian packaging