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

Side by Side Diff: Source/core/css/resolver/MatchedPropertiesCache.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) 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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 if (element == element->document().documentElement() && element->document(). writingModeSetOnDocumentElement()) 182 if (element == element->document().documentElement() && element->document(). writingModeSetOnDocumentElement())
183 return false; 183 return false;
184 if (style->unique() || (style->styleType() != NOPSEUDO && parentStyle->uniqu e())) 184 if (style->unique() || (style->styleType() != NOPSEUDO && parentStyle->uniqu e()))
185 return false; 185 return false;
186 if (style->hasAppearance()) 186 if (style->hasAppearance())
187 return false; 187 return false;
188 if (style->zoom() != RenderStyle::initialZoom()) 188 if (style->zoom() != RenderStyle::initialZoom())
189 return false; 189 return false;
190 if (style->writingMode() != RenderStyle::initialWritingMode()) 190 if (style->writingMode() != RenderStyle::initialWritingMode())
191 return false; 191 return false;
192 if (style->hasCurrentColor())
193 return false;
194 // The cache assumes static knowledge about which properties are inherited. 192 // The cache assumes static knowledge about which properties are inherited.
195 if (parentStyle->hasExplicitlyInheritedProperties()) 193 if (parentStyle->hasExplicitlyInheritedProperties())
196 return false; 194 return false;
197 return true; 195 return true;
198 } 196 }
199 197
200 void MatchedPropertiesCache::trace(Visitor* visitor) 198 void MatchedPropertiesCache::trace(Visitor* visitor)
201 { 199 {
202 #if ENABLE(OILPAN) 200 #if ENABLE(OILPAN)
203 visitor->trace(m_cache); 201 visitor->trace(m_cache);
204 #endif 202 #endif
205 } 203 }
206 204
207 } 205 }
OLDNEW
« no previous file with comments | « Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl ('k') | Source/core/css/resolver/StyleBuilderConverter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698