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

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

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 1043 matching lines @@
             multiline: true
         });
     },
 
     _attributeEditingCommitted: function(element, newText, oldText, attributeName, moveDirection)
     {
         delete this._editing;
 
         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.
             var attributes = this.representedObject.attributes();
             for (var i = 0; i < attributes.length; ++i) {
                 if (attributes[i].name !== attributeName)
                     continue;
                     
                 if (moveDirection === "backward") {
                     if (i === 0)
@@ skipping 21 matching lines @@
                         this._triggerEditAttribute(attributes[attributes.length - 2].name);
                 }
             } else if (moveDirection === "forward") {
                 if (!/^\s*$/.test(newText))
                     this._addNewAttribute();
                 else
                     this._startEditingTagName();
             }
         }
 
-        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)
     {
         delete this._editing;
         var self = this;
 
         function cancel()
         {
             var closingTagElement = self._distinctClosingTagElement();
@@ skipping 369 matching lines @@
         // Fall back for XPath, etc. matches.
         if (!matchRanges.length)
             matchRanges.push({ offset: 0, length: text.length });
 
         this._highlightResult = [];
         highlightSearchResults(this.listItemElement, matchRanges, this._highlightResult);
     }
 }
 
 WebInspector.ElementsTreeElement.prototype.__proto__ = TreeElement.prototype;