DevTools: Allow ESC for source color picker

third_party/WebKit/Source/devtools/front_end/sources/CSSSourceFrame.js

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 164 matching lines @@
 
     /**
      * @param {!WebInspector.ColorSwatch} swatch
      * @param {!WebInspector.CSSSourceFrame.ColorPosition} colorPosition
      * @param {!Event} event
      */
     _showSpectrum: function(swatch, colorPosition, event)
     {
         event.consume(true);
         if (this._swatchPopoverHelper.isShowing()) {
-            this._swatchPopoverHelper.hide();
+            this._swatchPopoverHelper.hide(true);
             return;
         }
         this._currentSwatch = swatch;
         this._currentColorPosition = colorPosition;
         this.textEditor.setSelection(WebInspector.TextRange.createFromLocation(colorPosition.textRange.startLine, colorPosition.textRange.startColumn));
         this._spectrum = new WebInspector.Spectrum();
         this._spectrum.setColor(swatch.color(), swatch.format());
         this._spectrum.addEventListener(WebInspector.Spectrum.Events.SizeChanged, this._spectrumResized, this);
         this._spectrum.addEventListener(WebInspector.Spectrum.Events.ColorChanged, this._spectrumChanged, this);
         this._swatchPopoverHelper.show(this._spectrum, swatch.iconElement(), this._spectrumHidden.bind(this));
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _spectrumResized: function(event)
     {
         this._swatchPopoverHelper.reposition();
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _spectrumChanged: function(event)
     {
         this._muteColorProcessing = true;
+        this._spectrumChangeOccurred = true;

[lushnikov, 2016/07/22 04:58:17]

this._hadSpectrumChange = true;

[flandy, 2016/07/22 15:56:09]

Done.

         var colorString = /** @type {string} */ (event.data);
         this._currentSwatch.setColorText(colorString);
-        this._textEditor.editRange(this._currentColorPosition.textRange, colorString, "*color-text-changed");
+        this.textEditor.editRange(this._currentColorPosition.textRange, colorString, "*color-text-changed");
         this._currentColorPosition.color = WebInspector.Color.parse(colorString);
         this._currentColorPosition.textRange.endColumn = this._currentColorPosition.textRange.startColumn + colorString.length;
     },
 
-    _spectrumHidden: function()
+    /**
+     * @param {boolean} commitEdit
+     */
+    _spectrumHidden: function(commitEdit)
     {
-        this._muteColorProcessing = false;
         this._spectrum.removeEventListener(WebInspector.Spectrum.Events.SizeChanged, this._spectrumResized, this);
         this._spectrum.removeEventListener(WebInspector.Spectrum.Events.ColorChanged, this._spectrumChanged, this);
+        if (!commitEdit && this._spectrumChangeOccurred)
+            this.textEditor.undo();
         delete this._spectrum;
+        delete this._currentSwatch;
+        delete this._currentColorPosition;
+        delete this._spectrumChangeOccurred;

[lushnikov, 2016/07/22 04:58:17]

i'd rather initialize spectrumChangeOccured in _showSpectrum with "false"

[flandy, 2016/07/22 15:56:08]

Done.

+        this._muteColorProcessing = false;
         this._updateColorSwatches();
     },
 
     /**
      * @override
      */
     onTextEditorContentSet: function()
     {
         WebInspector.UISourceCodeFrame.prototype.onTextEditorContentSet.call(this);
         if (!this._muteColorProcessing && Runtime.experiments.isEnabled("sourceColorPicker"))
@@ skipping 16 matching lines @@
     },
 
     /**
      * @override
      * @param {number} lineNumber
      */
     scrollChanged: function(lineNumber)
     {
         WebInspector.UISourceCodeFrame.prototype.scrollChanged.call(this, lineNumber);
         if (this._swatchPopoverHelper.isShowing())
-            this._swatchPopoverHelper.hide();
+            this._swatchPopoverHelper.hide(true);
     },
 
     __proto__: WebInspector.UISourceCodeFrame.prototype
 }
 
 /**
  * @constructor
  * @param {!WebInspector.Color} color
  * @param {number} lineNumber
  * @param {number} startColumn
@@ skipping 93 matching lines @@
         var propertyToken = this._backtrackPropertyToken(editor, prefixRange.startLine, prefixRange.startColumn - 1);
         if (!propertyToken)
             return this._simpleDelegate.wordsWithPrefix(editor, prefixRange, substituteRange);
 
         var line = editor.line(prefixRange.startLine);
         var tokenContent = line.substring(propertyToken.startColumn, propertyToken.endColumn);
         var keywords = WebInspector.CSSMetadata.keywordsForProperty(tokenContent);
         return keywords.startsWith(prefix);
     },
 }