Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(732)

Unified Diff: third_party/WebKit/Source/devtools/front_end/elements/StylesSidebarPane.js

Issue 2310633002: DevTools: Reduce color parsing by passing in Color to ColorSwatch (Closed)
Patch Set: Get color from model Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698