Revert of DevTools: Allow clicks to register in SSP when swatch popover is open

third_party/WebKit/Source/devtools/front_end/elements/ColorSwatchPopoverIcon.js

Index: third_party/WebKit/Source/devtools/front_end/elements/ColorSwatchPopoverIcon.js
diff --git a/third_party/WebKit/Source/devtools/front_end/elements/ColorSwatchPopoverIcon.js b/third_party/WebKit/Source/devtools/front_end/elements/ColorSwatchPopoverIcon.js
index df1713f2d675d3ebba4867e304a1650873813054..b3ce35a17d4446673015a85b0613909a129eb3df 100644
--- a/third_party/WebKit/Source/devtools/front_end/elements/ColorSwatchPopoverIcon.js
+++ b/third_party/WebKit/Source/devtools/front_end/elements/ColorSwatchPopoverIcon.js
@@ -79,9 +79,8 @@
         this._bezierEditor.removeEventListener(WebInspector.BezierEditor.Events.BezierChanged, this._boundBezierChanged);
         delete this._bezierEditor;
 
-        // Clicking between swatches in the same section should open each swatch popover. crbug.com/644779
-        if (!commitEdit)

[flandy, 2016/09/09 17:52:33]

For the record, this change should not be applied because majorChange=true in
applyStyleText is necessary since it marks the DOM undoable state so that undo
is handled correctly.

-            this._treeElement.applyStyleText(this._originalPropertyText, true);
+        var propertyText = commitEdit ? this._treeElement.renderedPropertyText() : this._originalPropertyText;
+        this._treeElement.applyStyleText(propertyText, true);
         this._treeElement.parentPane().setEditingStyle(false);
         delete this._originalPropertyText;
     }
@@ -207,9 +206,8 @@
         this._spectrum.removeEventListener(WebInspector.Spectrum.Events.ColorChanged, this._boundSpectrumChanged);
         delete this._spectrum;
 
-        // Clicking between swatches in the same section should open each swatch popover. crbug.com/644779
-        if (!commitEdit)
-            this._treeElement.applyStyleText(this._originalPropertyText, true);
+        var propertyText = commitEdit ? this._treeElement.renderedPropertyText() : this._originalPropertyText;
+        this._treeElement.applyStyleText(propertyText, true);
         this._treeElement.parentPane().setEditingStyle(false);
         delete this._originalPropertyText;
     }
@@ -290,9 +288,8 @@
         this._cssShadowEditor.removeEventListener(WebInspector.CSSShadowEditor.Events.ShadowChanged, this._boundShadowChanged);
         delete this._cssShadowEditor;
 
-        // Clicking between swatches in the same section should open each swatch popover. crbug.com/644779
-        if (!commitEdit)
-            this._treeElement.applyStyleText(this._originalPropertyText, true);
+        var propertyText = commitEdit ? this._treeElement.renderedPropertyText() : this._originalPropertyText;
+        this._treeElement.applyStyleText(propertyText, true);
         this._treeElement.parentPane().setEditingStyle(false);
         delete this._originalPropertyText;
     }