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

[timothy at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 0178c8f2833d5b557ad6efd38531251eb52e5919
Author: timothy at apple.com <timothy at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 29 21:59:33 2009 +0000

    Fix tabbing through element attributes in the Web Insector.
    
    https://bugs.webkit.org/show_bug.cgi?id=30429
    
    Reviewed by Pavel Feldman.
    
    * inspector/front-end/ElementsTreeOutline.js:
    (WebInspector.ElementsTreeElement.prototype._attributeEditingCommitted): Don't call _updateTitle,
    it is called for us when removeAttribute succeeds in the back-end.
    (WebInspector.ElementsTreeElement.prototype._textNodeEditingCommitted): Ditto except for nodeValue.
    (WebInspector.ElementsTreeElement.prototype._editingCancelled): Don't call _updateTitle, editing code reverts.
    (WebInspector.ElementsTreeElement.prototype._updateTitle): Return early if we are editing.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50303 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 508870e..e45e46c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-10-29  Timothy Hatcher  <timothy at apple.com>
+
+        Fix tabbing through element attributes in the Web Insector.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30429
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/ElementsTreeOutline.js:
+        (WebInspector.ElementsTreeElement.prototype._attributeEditingCommitted): Don't call _updateTitle,
+        it is called for us when removeAttribute succeeds in the back-end.
+        (WebInspector.ElementsTreeElement.prototype._textNodeEditingCommitted): Ditto except for nodeValue.
+        (WebInspector.ElementsTreeElement.prototype._editingCancelled): Don't call _updateTitle, editing code reverts.
+        (WebInspector.ElementsTreeElement.prototype._updateTitle): Return early if we are editing.
+
 2009-10-29  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/inspector/front-end/ElementsTreeOutline.js b/WebCore/inspector/front-end/ElementsTreeOutline.js
index be01647..0aad1e7 100644
--- a/WebCore/inspector/front-end/ElementsTreeOutline.js
+++ b/WebCore/inspector/front-end/ElementsTreeOutline.js
@@ -731,7 +731,6 @@ WebInspector.ElementsTreeElement.prototype = {
 
         if (!parseElement.hasAttributes()) {
             this.representedObject.removeAttribute(attributeName);
-            this._updateTitle();
             moveToNextAttributeIfNeeded.call(this);
             return;
         }
@@ -748,8 +747,6 @@ WebInspector.ElementsTreeElement.prototype = {
         if (!foundOriginalAttribute)
             this.representedObject.removeAttribute(attributeName);
 
-        this._updateTitle();
-
         this.treeOutline.focusedNodeChanged(true);
 
         moveToNextAttributeIfNeeded.call(this);
@@ -768,18 +765,24 @@ WebInspector.ElementsTreeElement.prototype = {
             textNode = this.representedObject;
 
         textNode.nodeValue = newText;
-        this._updateTitle();
+
+        // No need to call _updateTitle here, it will be called after the nodeValue is committed.
     },
 
     _editingCancelled: function(element, context)
     {
         delete this._editing;
 
-        this._updateTitle();
+        // No need to call _updateTitle here, the editing code will revert to the original text.
     },
 
     _updateTitle: function()
     {
+        // If we are editing, return early to prevent canceling the edit.
+        // After editing is committed _updateTitle will be called.
+        if (this._editing)
+            return;
+
         var title = this._nodeTitleInfo(this.representedObject, this.hasChildren, WebInspector.linkifyURL).title;
         this.title = "<span class=\"highlight\">" + title + "</span>";
         delete this.selectionElement;

-- 
WebKit Debian packaging