Merge 76913 - 2011-01-27 Alexander Pavlov <apavlov@chromium.org>...

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

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  * 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
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 1691 matching lines @@
                 this.originalPropertyText = this.property.propertyText;
             }
 
             // Synthesize property text disregarding any comments, custom whitespace etc.
             this.applyStyleText(this.nameElement.textContent + ": " + this.valueElement.textContent);
         }
     },
 
     editingEnded: function(context)
     {
-        if (this._prompt) {
-            this._prompt.removeFromElement();
-            delete this._prompt;
-        }
         this.hasChildren = context.hasChildren;
         if (context.expanded)
             this.expand();
         var editedElement = context.isEditingName ? this.nameElement : this.valueElement;
         if (!context.isEditingName)
             editedElement.removeEventListener("keydown", context.keyDownListener, false);
         if (editedElement.parentElement)
             editedElement.parentElement.removeStyleClass("child-editing");
 
         delete this.originalPropertyText;
     },
 
     editingCancelled: function(element, context)
     {
+        this._removePrompt();
         if ("originalPropertyText" in this)
             this.applyStyleText(this.originalPropertyText, true);
         else {
             if (this._newProperty)
                 this.treeOutline.removeChild(this);
             else
                 this.updateTitle();
         }
 
         // This should happen last, as it clears the info necessary to restore the property value after [Page]Up/Down changes.
         this.editingEnded(context);
     },
 
     editingCommitted: function(element, userInput, previousContent, context, moveDirection)
     {
+        this._removePrompt();
         this.editingEnded(context);
         var isEditingName = context.isEditingName;
 
         // Determine where to move to before making changes
         var createNewProperty, moveToPropertyName, moveToSelector;
         var moveTo = this;
         var moveToOther = (isEditingName ^ (moveDirection === "forward"));
         var abandonNewProperty = this._newProperty && !userInput && (moveToOther || isEditingName);
         if (moveDirection === "forward" && !isEditingName || moveDirection === "backward" && isEditingName) {
             do {
@@ skipping 77 matching lines @@
                 if (sectionToEdit && sectionToEdit.rule)
                     sectionToEdit.startEditingSelector();
                 return;
             }
 
             if (moveToSelector)
                 section.startEditingSelector();
         }
     },
 
+    _removePrompt: function()
+    {
+        // BUG 53242. This cannot go into editingEnded(), as it should always happen first for any editing outcome.
+        if (this._prompt) {
+            this._prompt.removeFromElement();
+            delete this._prompt;
+        }
+    },
+
     _hasBeenAppliedToPageViaUpDown: function()
     {
         // New properties applied via up/down have an originalPropertyText and will be deleted later
         // on, if cancelled, when the empty string gets applied as their style text.
         return ("originalPropertyText" in this);
     },
 
     applyStyleText: function(styleText, updateInterface)
     {
         var section = this.treeOutline.section;
@@ skipping 89 matching lines @@
             return completionsReadyCallback(results);
         }
 
         results = this._cssCompletions.startsWith(prefix);
         if (results)
             completionsReadyCallback(results);
     }
 }
 
 WebInspector.StylesSidebarPane.CSSPropertyPrompt.prototype.__proto__ = WebInspector.TextPrompt.prototype;