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

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h

Issue 2361733004: Adding @keyframes rules only affects TreeScope plus host. (Closed)
Patch Set: Moved scope check to CSSAnimations Created 4 years, 2 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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * Copyright (C) 2012 Google Inc. All rights reserved. 4 * Copyright (C) 2012 Google Inc. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 void appendCSSStyleSheet(CSSStyleSheet&, const MediaQueryEvaluator&); 56 void appendCSSStyleSheet(CSSStyleSheet&, const MediaQueryEvaluator&);
57 void collectMatchingAuthorRules(ElementRuleCollector&, CascadeOrder = ignore CascadeOrder); 57 void collectMatchingAuthorRules(ElementRuleCollector&, CascadeOrder = ignore CascadeOrder);
58 void collectMatchingShadowHostRules(ElementRuleCollector&, CascadeOrder = ig noreCascadeOrder); 58 void collectMatchingShadowHostRules(ElementRuleCollector&, CascadeOrder = ig noreCascadeOrder);
59 void collectMatchingTreeBoundaryCrossingRules(ElementRuleCollector&, Cascade Order = ignoreCascadeOrder); 59 void collectMatchingTreeBoundaryCrossingRules(ElementRuleCollector&, Cascade Order = ignoreCascadeOrder);
60 void matchPageRules(PageRuleCollector&); 60 void matchPageRules(PageRuleCollector&);
61 void collectFeaturesTo(RuleFeatureSet&, HeapHashSet<Member<const StyleSheetC ontents>>& visitedSharedStyleSheetContents) const; 61 void collectFeaturesTo(RuleFeatureSet&, HeapHashSet<Member<const StyleSheetC ontents>>& visitedSharedStyleSheetContents) const;
62 void resetAuthorStyle(); 62 void resetAuthorStyle();
63 void collectViewportRulesTo(ViewportStyleResolver*) const; 63 void collectViewportRulesTo(ViewportStyleResolver*) const;
64 bool hasDeepOrShadowSelector() const { return m_hasDeepOrShadowSelector; } 64 bool hasDeepOrShadowSelector() const { return m_hasDeepOrShadowSelector; }
65 void setHasUnresolvedKeyframesRule() { m_hasUnresolvedKeyframesRule = true; }
66 static void keyframesRulesAdded(const TreeScope&);
65 67
66 DECLARE_TRACE(); 68 DECLARE_TRACE();
67 69
68 private: 70 private:
69 explicit ScopedStyleResolver(TreeScope& scope) 71 explicit ScopedStyleResolver(TreeScope& scope)
70 : m_scope(scope) 72 : m_scope(scope)
71 { 73 {
72 } 74 }
73 75
74 void addTreeBoundaryCrossingRules(const RuleSet&, CSSStyleSheet*, unsigned s heetIndex); 76 void addTreeBoundaryCrossingRules(const RuleSet&, CSSStyleSheet*, unsigned s heetIndex);
(...skipping 26 matching lines...) Expand all
101 : m_parentStyleSheet(sheet) 103 : m_parentStyleSheet(sheet)
102 , m_parentIndex(index) 104 , m_parentIndex(index)
103 , m_ruleSet(rules) 105 , m_ruleSet(rules)
104 { 106 {
105 } 107 }
106 }; 108 };
107 using CSSStyleSheetRuleSubSet = HeapVector<Member<RuleSubSet>>; 109 using CSSStyleSheetRuleSubSet = HeapVector<Member<RuleSubSet>>;
108 110
109 Member<CSSStyleSheetRuleSubSet> m_treeBoundaryCrossingRuleSet; 111 Member<CSSStyleSheetRuleSubSet> m_treeBoundaryCrossingRuleSet;
110 bool m_hasDeepOrShadowSelector = false; 112 bool m_hasDeepOrShadowSelector = false;
113 bool m_hasUnresolvedKeyframesRule = false;
111 }; 114 };
112 115
113 } // namespace blink 116 } // namespace blink
114 117
115 #endif // ScopedStyleResolver_h 118 #endif // ScopedStyleResolver_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698