| Index: third_party/WebKit/Source/devtools/front_end/elements/StylesSidebarPane.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/elements/StylesSidebarPane.js b/third_party/WebKit/Source/devtools/front_end/elements/StylesSidebarPane.js
|
| index 036fc632880781cf855a60d299d6f6d7775d33e4..a982ac5bf2d2e07799d23dfb61c65e8826614840 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/elements/StylesSidebarPane.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/elements/StylesSidebarPane.js
|
| @@ -1955,13 +1955,13 @@ WebInspector.StylePropertyTreeElement.prototype = {
|
|
|
| if (!this._editable()) {
|
| var swatch = WebInspector.ColorSwatch.create();
|
| - swatch.setColorText(text);
|
| + swatch.setColor(color);
|
| return swatch;
|
| }
|
|
|
| var swatchPopoverHelper = this._parentPane._swatchPopoverHelper;
|
| var swatch = WebInspector.ColorSwatch.create();
|
| - swatch.setColorText(text);
|
| + swatch.setColor(color);
|
| swatch.setFormat(WebInspector.Color.detectColorFormat(swatch.color()));
|
| var swatchIcon = new WebInspector.ColorSwatchPopoverIcon(this, swatchPopoverHelper, swatch);
|
|
|
| @@ -2048,8 +2048,9 @@ WebInspector.StylePropertyTreeElement.prototype = {
|
| var cssShadowSwatch = WebInspector.CSSShadowSwatch.create();
|
| cssShadowSwatch.setCSSShadow(shadows[i]);
|
| new WebInspector.ShadowSwatchPopoverHelper(this, swatchPopoverHelper, cssShadowSwatch);
|
| - if (cssShadowSwatch.colorSwatch())
|
| - var colorSwatchIcon = new WebInspector.ColorSwatchPopoverIcon(this, swatchPopoverHelper, cssShadowSwatch.colorSwatch());
|
| + var colorSwatch = cssShadowSwatch.colorSwatch();
|
| + if (colorSwatch)
|
| + new WebInspector.ColorSwatchPopoverIcon(this, swatchPopoverHelper, colorSwatch);
|
| container.appendChild(cssShadowSwatch);
|
| }
|
| return container;
|
|
|