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

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

Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 if (element == element->document().documentElement() && element->document(). writingModeSetOnDocumentElement()) 139 if (element == element->document().documentElement() && element->document(). writingModeSetOnDocumentElement())
140 return false; 140 return false;
141 if (style->unique() || (style->styleType() != NOPSEUDO && parentStyle->uniqu e())) 141 if (style->unique() || (style->styleType() != NOPSEUDO && parentStyle->uniqu e()))
142 return false; 142 return false;
143 if (style->hasAppearance()) 143 if (style->hasAppearance())
144 return false; 144 return false;
145 if (style->zoom() != RenderStyle::initialZoom()) 145 if (style->zoom() != RenderStyle::initialZoom())
146 return false; 146 return false;
147 if (style->writingMode() != RenderStyle::initialWritingMode()) 147 if (style->writingMode() != RenderStyle::initialWritingMode())
148 return false; 148 return false;
149 if (style->hasCurrentColor())
150 return false;
149 // The cache assumes static knowledge about which properties are inherited. 151 // The cache assumes static knowledge about which properties are inherited.
150 if (parentStyle->hasExplicitlyInheritedProperties()) 152 if (parentStyle->hasExplicitlyInheritedProperties())
151 return false; 153 return false;
152 return true; 154 return true;
153 } 155 }
154 156
155 } 157 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698