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

Side by Side Diff: Source/core/layout/style/LayoutStyle.cpp

Issue 950623002: Store resolved color in AppliedTextDecoration (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « LayoutTests/fast/css/text-decoration-color-on-hover-expected.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after
1283 1283
1284 list->append(decoration); 1284 list->append(decoration);
1285 } 1285 }
1286 1286
1287 void LayoutStyle::applyTextDecorations() 1287 void LayoutStyle::applyTextDecorations()
1288 { 1288 {
1289 if (textDecoration() == TextDecorationNone) 1289 if (textDecoration() == TextDecorationNone)
1290 return; 1290 return;
1291 1291
1292 TextDecorationStyle style = textDecorationStyle(); 1292 TextDecorationStyle style = textDecorationStyle();
1293 StyleColor styleColor = decorationColorIncludingFallback(insideLink() == Ins ideVisitedLink); 1293 StyleColor styleColor = visitedDependentColor(CSSPropertyTextDecorationColor );
Timothy Loh 2015/02/22 22:49:37 visitedDependentColor returns a Color and not a St
samahto 2015/02/24 19:12:43 Acknowledged.
1294 1294
1295 int decorations = textDecoration(); 1295 int decorations = textDecoration();
1296 1296
1297 if (decorations & TextDecorationUnderline) { 1297 if (decorations & TextDecorationUnderline) {
1298 // To save memory, we don't use AppliedTextDecoration objects in the 1298 // To save memory, we don't use AppliedTextDecoration objects in the
1299 // common case of a single simple underline. 1299 // common case of a single simple underline.
1300 AppliedTextDecoration underline(TextDecorationUnderline, style, styleCol or); 1300 AppliedTextDecoration underline(TextDecorationUnderline, style, styleCol or);
1301 1301
1302 if (!rareInheritedData->appliedTextDecorations && underline.isSimpleUnde rline()) 1302 if (!rareInheritedData->appliedTextDecorations && underline.isSimpleUnde rline())
1303 inherited_flags.m_textUnderline = true; 1303 inherited_flags.m_textUnderline = true;
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
1679 horizontal || includeLogicalRightEdge); 1679 horizontal || includeLogicalRightEdge);
1680 1680
1681 edges[BSLeft] = BorderEdge(borderLeftWidth(), 1681 edges[BSLeft] = BorderEdge(borderLeftWidth(),
1682 visitedDependentColor(CSSPropertyBorderLeftColor), 1682 visitedDependentColor(CSSPropertyBorderLeftColor),
1683 borderLeftStyle(), 1683 borderLeftStyle(),
1684 borderLeftIsTransparent(), 1684 borderLeftIsTransparent(),
1685 !horizontal || includeLogicalLeftEdge); 1685 !horizontal || includeLogicalLeftEdge);
1686 } 1686 }
1687 1687
1688 } // namespace blink 1688 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/fast/css/text-decoration-color-on-hover-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698