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

Side by Side Diff: Source/core/css/resolver/StyleAdjuster.cpp

Issue 950623002: Store resolved color in AppliedTextDecoration (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: removed inherited_flags.m_textunderline Created 5 years, 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 // SVG elements can skip this because they implicitly have transforms. 200 // SVG elements can skip this because they implicitly have transforms.
201 bool isSVGElement = e && e->isSVGElement(); 201 bool isSVGElement = e && e->isSVGElement();
202 if (!isSVGElement && !style.hasTransform() && (style.willChangeProperties(). contains(CSSPropertyAliasWebkitTransform) || style.willChangeProperties().contai ns(CSSPropertyTransform))) { 202 if (!isSVGElement && !style.hasTransform() && (style.willChangeProperties(). contains(CSSPropertyAliasWebkitTransform) || style.willChangeProperties().contai ns(CSSPropertyTransform))) {
203 bool makeIdentity = true; 203 bool makeIdentity = true;
204 style.setTransform(TransformOperations(makeIdentity)); 204 style.setTransform(TransformOperations(makeIdentity));
205 } 205 }
206 206
207 if (doesNotInheritTextDecoration(style, e)) 207 if (doesNotInheritTextDecoration(style, e))
208 style.clearAppliedTextDecorations(); 208 style.clearAppliedTextDecorations();
209 209
210 style.applyTextDecorations(); 210 style.applyTextDecorations(parentStyle);
211 211
212 if (style.overflowX() != OVISIBLE || style.overflowY() != OVISIBLE) 212 if (style.overflowX() != OVISIBLE || style.overflowY() != OVISIBLE)
213 adjustOverflow(style); 213 adjustOverflow(style);
214 214
215 // Cull out any useless layers and also repeat patterns into additional laye rs. 215 // Cull out any useless layers and also repeat patterns into additional laye rs.
216 style.adjustBackgroundLayers(); 216 style.adjustBackgroundLayers();
217 style.adjustMaskLayers(); 217 style.adjustMaskLayers();
218 218
219 // Let the theme also have a crack at adjusting the style. 219 // Let the theme also have a crack at adjusting the style.
220 if (style.hasAppearance()) 220 if (style.hasAppearance())
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 if (style.writingMode() != TopToBottomWritingMode && (style.display() == BOX || style.display() == INLINE_BOX)) 488 if (style.writingMode() != TopToBottomWritingMode && (style.display() == BOX || style.display() == INLINE_BOX))
489 style.setWritingMode(TopToBottomWritingMode); 489 style.setWritingMode(TopToBottomWritingMode);
490 490
491 if (parentStyle.isDisplayFlexibleOrGridBox()) { 491 if (parentStyle.isDisplayFlexibleOrGridBox()) {
492 style.setFloating(NoFloat); 492 style.setFloating(NoFloat);
493 style.setDisplay(equivalentBlockDisplay(style.display(), style.isFloatin g(), !m_useQuirksModeStyles)); 493 style.setDisplay(equivalentBlockDisplay(style.display(), style.isFloatin g(), !m_useQuirksModeStyles));
494 } 494 }
495 } 495 }
496 496
497 } 497 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698