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

Unified Diff: Source/core/rendering/RenderThemeChromiumMac.mm

Issue 20061003: Move isValid/isCurrentColor from Color to StyleColor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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: Source/core/rendering/RenderThemeChromiumMac.mm
diff --git a/Source/core/rendering/RenderThemeChromiumMac.mm b/Source/core/rendering/RenderThemeChromiumMac.mm
index 82a723fa5ac37f2e03924027cb7e708230a4c94e..e6c7b279518f932f832a49666349479b676fbe14 100644
--- a/Source/core/rendering/RenderThemeChromiumMac.mm
+++ b/Source/core/rendering/RenderThemeChromiumMac.mm
@@ -394,7 +394,7 @@ Color RenderThemeChromiumMac::systemColor(CSSValueID cssValueId) const
return it->value;
}
- Color color;
+ Color color = Color::transparent;
switch (cssValueId) {
case CSSValueActiveborder:
color = convertNSColorToColor([NSColor keyboardFocusIndicatorColor]);
@@ -495,10 +495,10 @@ Color RenderThemeChromiumMac::systemColor(CSSValueID cssValueId) const
break;
}
- if (!color.isValid())
+ if (!color.alpha())
color = RenderTheme::systemColor(cssValueId);
- if (color.isValid())
+ if (color.alpha())
m_systemColorCache.set(cssValueId, color.rgb());
return color;
@@ -1247,7 +1247,7 @@ bool RenderThemeChromiumMac::paintMenuListButton(RenderObject* o, const PaintInf
GraphicsContextStateSaver stateSaver(*paintInfo.context);
- paintInfo.context->setFillColor(o->style()->visitedDependentColor(CSSPropertyColor));
+ paintInfo.context->setFillColor(o->resolveColor(CSSPropertyColor));
paintInfo.context->setStrokeStyle(NoStroke);
FloatPoint arrow1[3];

Powered by Google App Engine
This is Rietveld 408576698