[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 384ece614949a4b7c5e84e670842519b1086d39f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 4 21:03:38 2009 +0000

    2009-12-04  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: Remove suppress highlight when restoring selected node.
    
            https://bugs.webkit.org/show_bug.cgi?id=32152
    
            * inspector/front-end/ElementsPanel.js:
            (WebInspector.ElementsPanel.prototype.setDocument.selectNode):
            (WebInspector.ElementsPanel.prototype.setDocument.selectLastSelectedNode):
            (WebInspector.ElementsPanel.prototype.setDocument):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51710 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6887b3d..2317f94 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-04  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Remove suppress highlight when restoring selected node.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32152
+
+        * inspector/front-end/ElementsPanel.js:
+        (WebInspector.ElementsPanel.prototype.setDocument.selectNode):
+        (WebInspector.ElementsPanel.prototype.setDocument.selectLastSelectedNode):
+        (WebInspector.ElementsPanel.prototype.setDocument):
+
 2009-12-04  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/inspector/front-end/ElementsPanel.js b/WebCore/inspector/front-end/ElementsPanel.js
index 1541443..9b18251 100644
--- a/WebCore/inspector/front-end/ElementsPanel.js
+++ b/WebCore/inspector/front-end/ElementsPanel.js
@@ -205,35 +205,31 @@ WebInspector.ElementsPanel.prototype = {
         this.rootDOMNode = inspectedRootDocument;
         this.treeOutline.suppressSelectHighlight = false;
 
-        function selectDefaultNode()
+        function selectNode(candidateFocusNode)
         {
-            this.treeOutline.suppressSelectHighlight = true;
-            var candidateFocusNode = inspectedRootDocument.body || inspectedRootDocument.documentElement;
-            if (candidateFocusNode) {
-                this.focusedDOMNode = candidateFocusNode;
+            if (!candidateFocusNode)
+                candidateFocusNode = inspectedRootDocument.body || inspectedRootDocument.documentElement;
 
-                if (this.treeOutline.selectedTreeElement)
-                    this.treeOutline.selectedTreeElement.expand();
-            }
+            if (!candidateFocusNode)
+                return;
+
+            this.treeOutline.suppressSelectHighlight = true;
+            this.focusedDOMNode = candidateFocusNode;
+            if (this.treeOutline.selectedTreeElement)
+                this.treeOutline.selectedTreeElement.expand();
+            this.treeOutline.suppressSelectHighlight = false;
         }
 
         function selectLastSelectedNode(nodeId)
         {
             var node = nodeId ? WebInspector.domAgent.nodeForId(nodeId) : 0;
-            if (!node) {
-                selectDefaultNode.call(this);
-                return;
-            }
-
-            this.treeOutline.suppressSelectHighlight = true;
-            this.focusedDOMNode = node;
-            this.treeOutline.suppressSelectHighlight = false;
+            selectNode.call(this, node);
         }
 
         if (this._selectedPathOnReset)
             InjectedScriptAccess.nodeByPath(this._selectedPathOnReset, selectLastSelectedNode.bind(this));
         else
-            selectDefaultNode.call(this);
+            selectNode.call(this);
         delete this._selectedPathOnReset;
     },
 

-- 
WebKit Debian packaging