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

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

Issue 179363005: Remove dependency on element in applying color properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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 | « Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl ('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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 149 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
150 // As per the spec, 'color: currentColor' is treated as 'color: inherit' 150 // As per the spec, 'color: currentColor' is treated as 'color: inherit'
151 if (primitiveValue->getValueID() == CSSValueCurrentcolor) { 151 if (primitiveValue->getValueID() == CSSValueCurrentcolor) {
152 applyInheritCSSPropertyColor(state); 152 applyInheritCSSPropertyColor(state);
153 return; 153 return;
154 } 154 }
155 155
156 if (state.applyPropertyToRegularStyle()) 156 if (state.applyPropertyToRegularStyle())
157 state.style()->setColor(state.document().textLinkColors().colorFromPrimi tiveValue(primitiveValue, state.style()->color())); 157 state.style()->setColor(state.document().textLinkColors().colorFromPrimi tiveValue(primitiveValue, state.style()->color()));
158 if (state.applyPropertyToVisitedLinkStyle()) 158 if (state.applyPropertyToVisitedLinkStyle())
159 state.style()->setVisitedLinkColor(state.document().textLinkColors().col orFromPrimitiveValue(primitiveValue, state.style()->color(), state.element()->is Link() /* forVisitedLink */)); 159 state.style()->setVisitedLinkColor(state.document().textLinkColors().col orFromPrimitiveValue(primitiveValue, state.style()->color(), true));
160 } 160 }
161 161
162 void StyleBuilderFunctions::applyInitialCSSPropertyCursor(StyleResolverState& st ate) 162 void StyleBuilderFunctions::applyInitialCSSPropertyCursor(StyleResolverState& st ate)
163 { 163 {
164 state.style()->clearCursorList(); 164 state.style()->clearCursorList();
165 state.style()->setCursor(RenderStyle::initialCursor()); 165 state.style()->setCursor(RenderStyle::initialCursor());
166 } 166 }
167 167
168 void StyleBuilderFunctions::applyInheritCSSPropertyCursor(StyleResolverState& st ate) 168 void StyleBuilderFunctions::applyInheritCSSPropertyCursor(StyleResolverState& st ate)
169 { 169 {
(...skipping 2001 matching lines...) Expand 10 before | Expand all | Expand 10 after
2171 break; 2171 break;
2172 } 2172 }
2173 case CSSPropertyEnableBackground: 2173 case CSSPropertyEnableBackground:
2174 // Silently ignoring this property for now 2174 // Silently ignoring this property for now
2175 // http://bugs.webkit.org/show_bug.cgi?id=6022 2175 // http://bugs.webkit.org/show_bug.cgi?id=6022
2176 break; 2176 break;
2177 } 2177 }
2178 } 2178 }
2179 2179
2180 } // namespace WebCore 2180 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698