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

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

Issue 2519393002: Force adding sheets and recalc for html import re-ordering. (Closed)
Patch Set: Missing reset in resetAuthorStyle() Created 4 years 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. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * Copyright (C) 2012 Google Inc. All rights reserved. 5 * Copyright (C) 2012 Google Inc. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 void collectMatchingTreeBoundaryCrossingRules( 66 void collectMatchingTreeBoundaryCrossingRules(
67 ElementRuleCollector&, 67 ElementRuleCollector&,
68 CascadeOrder = ignoreCascadeOrder); 68 CascadeOrder = ignoreCascadeOrder);
69 void matchPageRules(PageRuleCollector&); 69 void matchPageRules(PageRuleCollector&);
70 void collectFeaturesTo(RuleFeatureSet&, 70 void collectFeaturesTo(RuleFeatureSet&,
71 HeapHashSet<Member<const StyleSheetContents>>& 71 HeapHashSet<Member<const StyleSheetContents>>&
72 visitedSharedStyleSheetContents) const; 72 visitedSharedStyleSheetContents) const;
73 void resetAuthorStyle(); 73 void resetAuthorStyle();
74 bool hasDeepOrShadowSelector() const { return m_hasDeepOrShadowSelector; } 74 bool hasDeepOrShadowSelector() const { return m_hasDeepOrShadowSelector; }
75 void setHasUnresolvedKeyframesRule() { m_hasUnresolvedKeyframesRule = true; } 75 void setHasUnresolvedKeyframesRule() { m_hasUnresolvedKeyframesRule = true; }
76 bool needsAppendAllSheets() const { return m_needsAppendAllSheets; }
77 void setNeedsAppendAllSheets() { m_needsAppendAllSheets = true; }
76 static void keyframesRulesAdded(const TreeScope&); 78 static void keyframesRulesAdded(const TreeScope&);
77 static ContainerNode& invalidationRootForTreeScope(const TreeScope&); 79 static ContainerNode& invalidationRootForTreeScope(const TreeScope&);
78 80
79 DECLARE_TRACE(); 81 DECLARE_TRACE();
80 82
81 private: 83 private:
82 explicit ScopedStyleResolver(TreeScope& scope) : m_scope(scope) {} 84 explicit ScopedStyleResolver(TreeScope& scope) : m_scope(scope) {}
83 85
84 void addTreeBoundaryCrossingRules(const RuleSet&, 86 void addTreeBoundaryCrossingRules(const RuleSet&,
85 CSSStyleSheet*, 87 CSSStyleSheet*,
(...skipping 26 matching lines...) Expand all
112 114
113 private: 115 private:
114 RuleSubSet(CSSStyleSheet* sheet, unsigned index, RuleSet* rules) 116 RuleSubSet(CSSStyleSheet* sheet, unsigned index, RuleSet* rules)
115 : m_parentStyleSheet(sheet), m_parentIndex(index), m_ruleSet(rules) {} 117 : m_parentStyleSheet(sheet), m_parentIndex(index), m_ruleSet(rules) {}
116 }; 118 };
117 using CSSStyleSheetRuleSubSet = HeapVector<Member<RuleSubSet>>; 119 using CSSStyleSheetRuleSubSet = HeapVector<Member<RuleSubSet>>;
118 120
119 Member<CSSStyleSheetRuleSubSet> m_treeBoundaryCrossingRuleSet; 121 Member<CSSStyleSheetRuleSubSet> m_treeBoundaryCrossingRuleSet;
120 bool m_hasDeepOrShadowSelector = false; 122 bool m_hasDeepOrShadowSelector = false;
121 bool m_hasUnresolvedKeyframesRule = false; 123 bool m_hasUnresolvedKeyframesRule = false;
124 bool m_needsAppendAllSheets = false;
122 }; 125 };
123 126
124 } // namespace blink 127 } // namespace blink
125 128
126 #endif // ScopedStyleResolver_h 129 #endif // ScopedStyleResolver_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698