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

podivilov at chromium.org podivilov at chromium.org
Wed Dec 22 13:41:11 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit c037161970d8ed4c156ce9acb6b229e0baac7bd2
Author: podivilov at chromium.org <podivilov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 15:20:40 2010 +0000

    2010-09-23  Pavel Podivilov  <podivilov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: highlight DOM nodes when navigating the DOM with keyboard
            https://bugs.webkit.org/show_bug.cgi?id=46346
    
            * inspector/front-end/ElementsTreeOutline.js:
            (WebInspector.ElementsTreeElement.prototype.onselect):
            * inspector/front-end/treeoutline.js:
            (TreeOutline.prototype._treeKeyDown):
            (TreeElement.prototype.selectOnMouseDown):
            (TreeElement.prototype.select):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68140 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0b216d1..ba41844 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-23  Pavel Podivilov  <podivilov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: highlight DOM nodes when navigating the DOM with keyboard
+        https://bugs.webkit.org/show_bug.cgi?id=46346
+
+        * inspector/front-end/ElementsTreeOutline.js:
+        (WebInspector.ElementsTreeElement.prototype.onselect):
+        * inspector/front-end/treeoutline.js:
+        (TreeOutline.prototype._treeKeyDown):
+        (TreeElement.prototype.selectOnMouseDown):
+        (TreeElement.prototype.select):
+
 2010-09-23  Andrei Popescu  <andreip at google.com>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebCore/inspector/front-end/ElementsTreeOutline.js b/WebCore/inspector/front-end/ElementsTreeOutline.js
index 5109ce7..1479c9a 100644
--- a/WebCore/inspector/front-end/ElementsTreeOutline.js
+++ b/WebCore/inspector/front-end/ElementsTreeOutline.js
@@ -637,10 +637,12 @@ WebInspector.ElementsTreeElement.prototype = {
             this.listItemElement.scrollIntoViewIfNeeded(false);
     },
 
-    onselect: function()
+    onselect: function(treeElement, selectedByUser)
     {
         this.treeOutline.suppressRevealAndSelect = true;
         this.treeOutline.focusedDOMNode = this.representedObject;
+        if (selectedByUser)
+            WebInspector.highlightDOMNode(this.representedObject.id);
         this.updateSelection();
         this.treeOutline.suppressRevealAndSelect = false;
     },
diff --git a/WebCore/inspector/front-end/treeoutline.js b/WebCore/inspector/front-end/treeoutline.js
index c2a3fe7..e2f879c 100644
--- a/WebCore/inspector/front-end/treeoutline.js
+++ b/WebCore/inspector/front-end/treeoutline.js
@@ -399,7 +399,7 @@ TreeOutline.prototype._treeKeyDown = function(event)
 
     if (nextSelectedElement) {
         nextSelectedElement.reveal();
-        nextSelectedElement.select();
+        nextSelectedElement.select(false, true);
     }
 
     if (handled) {
@@ -794,10 +794,10 @@ TreeElement.prototype.revealed = function()
 
 TreeElement.prototype.selectOnMouseDown = function(event)
 {
-    this.select();
+    this.select(false, true);
 }
 
-TreeElement.prototype.select = function(supressOnSelect)
+TreeElement.prototype.select = function(supressOnSelect, selectedByUser)
 {
     if (!this.treeOutline || !this.selectable || this.selected)
         return;
@@ -812,7 +812,7 @@ TreeElement.prototype.select = function(supressOnSelect)
         this._listItemNode.addStyleClass("selected");
 
     if (this.onselect && !supressOnSelect)
-        this.onselect(this);
+        this.onselect(this, selectedByUser);
 }
 
 TreeElement.prototype.deselect = function(supressOnDeselect)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list