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

Side by Side Diff: Source/core/css/RuleFeature.cpp

Issue 206513004: Support invalidation sets for shadow combinators. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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
« no previous file with comments | « LayoutTests/fast/css/invalidation/targeted-class-shadow-combinator-expected.txt ('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) 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 Apple Inc. All r ights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 bool foundIdent = false; 115 bool foundIdent = false;
116 for (const CSSSelector* component = &selector; component; component = compon ent->tagHistory()) { 116 for (const CSSSelector* component = &selector; component; component = compon ent->tagHistory()) {
117 117
118 // FIXME: next up: Tag and Id. 118 // FIXME: next up: Tag and Id.
119 if (component->m_match == CSSSelector::Class) { 119 if (component->m_match == CSSSelector::Class) {
120 if (!foundDescendantRelation) 120 if (!foundDescendantRelation)
121 foundIdent = true; 121 foundIdent = true;
122 } else if (!isSkippableComponentForInvalidation(*component)) { 122 } else if (!isSkippableComponentForInvalidation(*component)) {
123 return foundDescendantRelation ? UseLocalStyleChange : UseSubtreeSty leChange; 123 return foundDescendantRelation ? UseLocalStyleChange : UseSubtreeSty leChange;
124 } 124 }
125 // FIXME: We can probably support ShadowAll and ShadowDeep.
126 switch (component->relation()) { 125 switch (component->relation()) {
127 case CSSSelector::Descendant: 126 case CSSSelector::Descendant:
128 case CSSSelector::Child: 127 case CSSSelector::Child:
128 case CSSSelector::Shadow:
129 case CSSSelector::ShadowDeep:
129 foundDescendantRelation = true; 130 foundDescendantRelation = true;
130 // Fall through! 131 // Fall through!
131 case CSSSelector::SubSelector: 132 case CSSSelector::SubSelector:
132 continue; 133 continue;
133 default: 134 default:
134 return UseLocalStyleChange; 135 return UseLocalStyleChange;
135 } 136 }
136 } 137 }
137 return foundIdent ? AddFeatures : UseLocalStyleChange; 138 return foundIdent ? AddFeatures : UseLocalStyleChange;
138 } 139 }
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 if (node->isElementNode()) 375 if (node->isElementNode())
375 m_pendingInvalidationMap.remove(toElement(node)); 376 m_pendingInvalidationMap.remove(toElement(node));
376 } 377 }
377 378
378 RuleFeatureSet::PendingInvalidationMap& RuleFeatureSet::pendingInvalidationMap() 379 RuleFeatureSet::PendingInvalidationMap& RuleFeatureSet::pendingInvalidationMap()
379 { 380 {
380 return m_pendingInvalidationMap; 381 return m_pendingInvalidationMap;
381 } 382 }
382 383
383 } // namespace WebCore 384 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/css/invalidation/targeted-class-shadow-combinator-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698