Merge 90013 - 2011-06-29 Pavel Feldman <pfeldman@google.com>

Source/WebCore/inspector/front-end/ElementsTreeOutline.js

Index: Source/WebCore/inspector/front-end/ElementsTreeOutline.js
===================================================================
--- Source/WebCore/inspector/front-end/ElementsTreeOutline.js	(revision 90016)
+++ Source/WebCore/inspector/front-end/ElementsTreeOutline.js	(working copy)
@@ -1061,6 +1061,12 @@
 
         function moveToNextAttributeIfNeeded(error)
         {
+            if (error)
+                this._editingCancelled(element, attributeName);
+
+            if (!moveDirection)
+                return;
+
             WebInspector.panels.elements.updateModifiedNodes();
 
             // Search for the attribute's position, and then decide where to move to.
@@ -1102,7 +1108,7 @@
             }
         }
 
-        this.representedObject.setAttribute(attributeName, newText, moveDirection ? moveToNextAttributeIfNeeded.bind(this) : undefined);
+        this.representedObject.setAttribute(attributeName, newText, moveToNextAttributeIfNeeded.bind(this));
     },
 
     _tagNameEditingCommitted: function(element, newText, oldText, tagName, moveDirection)