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

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

Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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: Source/core/rendering/RenderThemeChromiumMac.mm
diff --git a/Source/core/rendering/RenderThemeChromiumMac.mm b/Source/core/rendering/RenderThemeChromiumMac.mm
index 6f5ab4f3c5bcc5842d03578cdd56767c6b6a1a99..c0d52c6217032d5f610e2ba1a6f2f541fe5da990 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::transparent;
+ Color color;
switch (cssValueId) {
case CSSValueActiveborder:
color = convertNSColorToColor([NSColor keyboardFocusIndicatorColor]);
@@ -495,10 +495,10 @@ Color RenderThemeChromiumMac::systemColor(CSSValueID cssValueId) const
break;
}
- if (!color.alpha())
+ if (!color.isValid())
color = RenderTheme::systemColor(cssValueId);
- if (color.alpha())
+ if (color.isValid())
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->resolveColor(CSSPropertyColor));
+ paintInfo.context->setFillColor(o->style()->visitedDependentColor(CSSPropertyColor));
paintInfo.context->setStrokeStyle(NoStroke);
FloatPoint arrow1[3];

Powered by Google App Engine
This is Rietveld 408576698