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

Side by Side Diff: Source/core/dom/StyleEngine.h

Issue 1134173002: Get rid of TreeBoundaryCrossingRules. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Missing resolver decrement and adjusted test. Created 5 years, 7 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) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2011 Google Inc. All rights reserved. 9 * Copyright (C) 2011 Google Inc. All rights reserved.
10 * 10 *
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 unsigned maxDirectAdjacentSelectors() const { return m_maxDirectAdjacentSele ctors; } 117 unsigned maxDirectAdjacentSelectors() const { return m_maxDirectAdjacentSele ctors; }
118 bool usesSiblingRules() const { return m_usesSiblingRules; } 118 bool usesSiblingRules() const { return m_usesSiblingRules; }
119 bool usesFirstLineRules() const { return m_usesFirstLineRules; } 119 bool usesFirstLineRules() const { return m_usesFirstLineRules; }
120 bool usesWindowInactiveSelector() const { return m_usesWindowInactiveSelecto r; } 120 bool usesWindowInactiveSelector() const { return m_usesWindowInactiveSelecto r; }
121 121
122 bool usesFirstLetterRules() const { return m_usesFirstLetterRules; } 122 bool usesFirstLetterRules() const { return m_usesFirstLetterRules; }
123 void setUsesFirstLetterRules(bool b) { m_usesFirstLetterRules = b; } 123 void setUsesFirstLetterRules(bool b) { m_usesFirstLetterRules = b; }
124 bool usesRemUnits() const { return m_usesRemUnits; } 124 bool usesRemUnits() const { return m_usesRemUnits; }
125 void setUsesRemUnit(bool b) { m_usesRemUnits = b; } 125 void setUsesRemUnit(bool b) { m_usesRemUnits = b; }
126 126
127 bool hasTreeBoundaryCrossingRules() const { return m_treeBoundaryCrossingSco peCount; }
128 void addTreeBoundaryCrossingScope() { ++m_treeBoundaryCrossingScopeCount; }
129 void removeTreeBoundaryCrossingScope() { --m_treeBoundaryCrossingScopeCount; }
130
127 void combineCSSFeatureFlags(const RuleFeatureSet&); 131 void combineCSSFeatureFlags(const RuleFeatureSet&);
128 void resetCSSFeatureFlags(const RuleFeatureSet&); 132 void resetCSSFeatureFlags(const RuleFeatureSet&);
129 133
130 void didRemoveShadowRoot(ShadowRoot*); 134 void didRemoveShadowRoot(ShadowRoot*);
131 void shadowRootRemovedFromDocument(ShadowRoot*); 135 void shadowRootRemovedFromDocument(ShadowRoot*);
132 void appendActiveAuthorStyleSheets(); 136 void appendActiveAuthorStyleSheets();
133 137
134 StyleResolver* resolver() const 138 StyleResolver* resolver() const
135 { 139 {
136 return m_resolver.get(); 140 return m_resolver.get();
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 290
287 String m_preferredStylesheetSetName; 291 String m_preferredStylesheetSetName;
288 String m_selectedStylesheetSetName; 292 String m_selectedStylesheetSetName;
289 293
290 bool m_usesSiblingRules; 294 bool m_usesSiblingRules;
291 bool m_usesFirstLineRules; 295 bool m_usesFirstLineRules;
292 bool m_usesWindowInactiveSelector; 296 bool m_usesWindowInactiveSelector;
293 bool m_usesFirstLetterRules; 297 bool m_usesFirstLetterRules;
294 bool m_usesRemUnits; 298 bool m_usesRemUnits;
295 unsigned m_maxDirectAdjacentSelectors; 299 unsigned m_maxDirectAdjacentSelectors;
296 300 unsigned m_treeBoundaryCrossingScopeCount;
297 bool m_ignorePendingStylesheets; 301 bool m_ignorePendingStylesheets;
298 bool m_didCalculateResolver; 302 bool m_didCalculateResolver;
299 OwnPtrWillBeMember<StyleResolver> m_resolver; 303 OwnPtrWillBeMember<StyleResolver> m_resolver;
300 StyleInvalidator m_styleInvalidator; 304 StyleInvalidator m_styleInvalidator;
301 305
302 RefPtrWillBeMember<CSSFontSelector> m_fontSelector; 306 RefPtrWillBeMember<CSSFontSelector> m_fontSelector;
303 307
304 WillBeHeapHashMap<AtomicString, RawPtrWillBeMember<StyleSheetContents>> m_te xtToSheetCache; 308 WillBeHeapHashMap<AtomicString, RawPtrWillBeMember<StyleSheetContents>> m_te xtToSheetCache;
305 WillBeHeapHashMap<RawPtrWillBeMember<StyleSheetContents>, AtomicString> m_sh eetToTextCache; 309 WillBeHeapHashMap<RawPtrWillBeMember<StyleSheetContents>, AtomicString> m_sh eetToTextCache;
306 }; 310 };
307 311
308 } 312 }
309 313
310 #endif 314 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698