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

Unified Diff: sky/engine/core/rendering/style/RenderStyle.cpp

Issue 667003003: Remove most of visited link support. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « sky/engine/core/rendering/style/RenderStyle.h ('k') | sky/engine/core/rendering/style/StyleInheritedData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/style/RenderStyle.cpp
diff --git a/sky/engine/core/rendering/style/RenderStyle.cpp b/sky/engine/core/rendering/style/RenderStyle.cpp
index 30d6e632bfd38ac19af796c9dd98c5bcab2c1d2d..aae4ea9e07856404be1c62c12219df2ad38e2c07 100644
--- a/sky/engine/core/rendering/style/RenderStyle.cpp
+++ b/sky/engine/core/rendering/style/RenderStyle.cpp
@@ -773,9 +773,7 @@ void RenderStyle::setListStyleImage(PassRefPtr<StyleImage> v)
}
Color RenderStyle::color() const { return inherited->color; }
-Color RenderStyle::visitedLinkColor() const { return inherited->visitedLinkColor; }
void RenderStyle::setColor(const Color& v) { SET_VAR(inherited, color, v); }
-void RenderStyle::setVisitedLinkColor(const Color& v) { SET_VAR(inherited, visitedLinkColor, v); }
short RenderStyle::horizontalBorderSpacing() const { return inherited->horizontal_border_spacing; }
short RenderStyle::verticalBorderSpacing() const { return inherited->vertical_border_spacing; }
@@ -1065,7 +1063,7 @@ void RenderStyle::applyTextDecorations()
return;
TextDecorationStyle style = textDecorationStyle();
- StyleColor styleColor = visitedDependentDecorationStyleColor();
+ StyleColor styleColor = decorationStyleColor();
int decorations = textDecoration();
@@ -1179,69 +1177,66 @@ void RenderStyle::getShadowVerticalExtent(const ShadowList* shadowList, LayoutUn
}
}
-StyleColor RenderStyle::visitedDependentDecorationStyleColor() const
+StyleColor RenderStyle::decorationStyleColor() const
{
- bool isVisited = false;
-
- StyleColor styleColor = isVisited ? visitedLinkTextDecorationColor() : textDecorationColor();
+ StyleColor styleColor = textDecorationColor();
if (!styleColor.isCurrentColor())
return styleColor;
if (textStrokeWidth()) {
// Prefer stroke color if possible, but not if it's fully transparent.
- StyleColor textStrokeStyleColor = isVisited ? visitedLinkTextStrokeColor() : textStrokeColor();
+ StyleColor textStrokeStyleColor = textStrokeColor();
if (!textStrokeStyleColor.isCurrentColor() && textStrokeStyleColor.color().alpha())
return textStrokeStyleColor;
}
- return isVisited ? visitedLinkTextFillColor() : textFillColor();
+ return textFillColor();
}
-Color RenderStyle::visitedDependentDecorationColor() const
+Color RenderStyle::decorationColor() const
{
- bool isVisited = false;
- return visitedDependentDecorationStyleColor().resolve(isVisited ? visitedLinkColor() : color());
+ return decorationStyleColor().resolve(color());
}
-Color RenderStyle::colorIncludingFallback(int colorProperty, bool visitedLink) const
+Color RenderStyle::colorIncludingFallback(int colorProperty) const
{
StyleColor result(StyleColor::currentColor());
EBorderStyle borderStyle = BNONE;
switch (colorProperty) {
case CSSPropertyBackgroundColor:
- result = visitedLink ? visitedLinkBackgroundColor() : backgroundColor();
+ result = backgroundColor();
break;
case CSSPropertyBorderLeftColor:
- result = visitedLink ? visitedLinkBorderLeftColor() : borderLeftColor();
+ result = borderLeftColor();
borderStyle = borderLeftStyle();
break;
case CSSPropertyBorderRightColor:
- result = visitedLink ? visitedLinkBorderRightColor() : borderRightColor();
+ result = borderRightColor();
borderStyle = borderRightStyle();
break;
case CSSPropertyBorderTopColor:
- result = visitedLink ? visitedLinkBorderTopColor() : borderTopColor();
+ result = borderTopColor();
borderStyle = borderTopStyle();
break;
case CSSPropertyBorderBottomColor:
- result = visitedLink ? visitedLinkBorderBottomColor() : borderBottomColor();
+ result = borderBottomColor();
borderStyle = borderBottomStyle();
break;
case CSSPropertyColor:
- result = visitedLink ? visitedLinkColor() : color();
+ result = color();
break;
case CSSPropertyOutlineColor:
- result = visitedLink ? visitedLinkOutlineColor() : outlineColor();
+ result = outlineColor();
break;
case CSSPropertyWebkitTextEmphasisColor:
- result = visitedLink ? visitedLinkTextEmphasisColor() : textEmphasisColor();
+ result = textEmphasisColor();
break;
case CSSPropertyWebkitTextFillColor:
- result = visitedLink ? visitedLinkTextFillColor() : textFillColor();
+ result = textFillColor();
break;
case CSSPropertyWebkitTextStrokeColor:
- result = visitedLink ? visitedLinkTextStrokeColor() : textStrokeColor();
+ result = textStrokeColor();
break;
case CSSPropertyWebkitTapHighlightColor:
result = tapHighlightColor();
@@ -1256,15 +1251,9 @@ Color RenderStyle::colorIncludingFallback(int colorProperty, bool visitedLink) c
// FIXME: Treating styled borders with initial color differently causes problems
// See crbug.com/316559, crbug.com/276231
- if (!visitedLink && (borderStyle == INSET || borderStyle == OUTSET || borderStyle == RIDGE || borderStyle == GROOVE))
+ if ((borderStyle == INSET || borderStyle == OUTSET || borderStyle == RIDGE || borderStyle == GROOVE))
return Color(238, 238, 238);
- return visitedLink ? visitedLinkColor() : color();
-}
-
-Color RenderStyle::visitedDependentColor(int colorProperty) const
-{
- // FIXME(sky): Remove visited colors.
- return colorIncludingFallback(colorProperty, false);
+ return color();
}
const BorderValue& RenderStyle::borderBefore() const
« no previous file with comments | « sky/engine/core/rendering/style/RenderStyle.h ('k') | sky/engine/core/rendering/style/StyleInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698