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

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

Issue 547273002: Make currentColor behave the same internally as initial (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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 unified diff | Download patch
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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 bool isInitial = value->isInitialValue() || (!state.parentNode() && value->i sInheritedValue()); 113 bool isInitial = value->isInitialValue() || (!state.parentNode() && value->i sInheritedValue());
114 114
115 ASSERT(!isInherit || !isInitial); // isInherit -> !isInitial && isInitial -> !isInherit 115 ASSERT(!isInherit || !isInitial); // isInherit -> !isInitial && isInitial -> !isInherit
116 ASSERT(!isInherit || (state.parentNode() && state.parentStyle())); // isInhe rit -> (state.parentNode() && state.parentStyle()) 116 ASSERT(!isInherit || (state.parentNode() && state.parentStyle())); // isInhe rit -> (state.parentNode() && state.parentStyle())
117 117
118 if (!state.applyPropertyToRegularStyle() && (!state.applyPropertyToVisitedLi nkStyle() || !isValidVisitedLinkProperty(id))) { 118 if (!state.applyPropertyToRegularStyle() && (!state.applyPropertyToVisitedLi nkStyle() || !isValidVisitedLinkProperty(id))) {
119 // Limit the properties that can be applied to only the ones honored by :visited. 119 // Limit the properties that can be applied to only the ones honored by :visited.
120 return; 120 return;
121 } 121 }
122 122
123 CSSPrimitiveValue* primitiveValue = value->isPrimitiveValue() ? toCSSPrimiti veValue(value) : 0;
124 if (primitiveValue && primitiveValue->getValueID() == CSSValueCurrentcolor)
125 state.style()->setHasCurrentColor();
126
127 if (isInherit && !state.parentStyle()->hasExplicitlyInheritedProperties() && !CSSPropertyMetadata::isInheritedProperty(id)) 123 if (isInherit && !state.parentStyle()->hasExplicitlyInheritedProperties() && !CSSPropertyMetadata::isInheritedProperty(id))
128 state.parentStyle()->setHasExplicitlyInheritedProperties(); 124 state.parentStyle()->setHasExplicitlyInheritedProperties();
129 125
130 StyleBuilder::applyProperty(id, state, value, isInitial, isInherit); 126 StyleBuilder::applyProperty(id, state, value, isInitial, isInherit);
131 } 127 }
132 128
133 void StyleBuilderFunctions::applyInitialCSSPropertyColor(StyleResolverState& sta te) 129 void StyleBuilderFunctions::applyInitialCSSPropertyColor(StyleResolverState& sta te)
134 { 130 {
135 Color color = RenderStyle::initialColor(); 131 Color color = RenderStyle::initialColor();
136 if (state.applyPropertyToRegularStyle()) 132 if (state.applyPropertyToRegularStyle())
(...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1238 break; 1234 break;
1239 default: 1235 default:
1240 ASSERT_NOT_REACHED(); 1236 ASSERT_NOT_REACHED();
1241 break; 1237 break;
1242 } 1238 }
1243 1239
1244 state.style()->setGridAutoFlow(autoFlow); 1240 state.style()->setGridAutoFlow(autoFlow);
1245 } 1241 }
1246 1242
1247 } // namespace blink 1243 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleBuilderConverter.cpp ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698