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

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

Issue 772783002: Removed StyleEngine::m_usesSiblingRulesOverride. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/dom/StyleEngine.cpp » ('j') | 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) 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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 } 112 }
113 113
114 void addPendingSheet(); 114 void addPendingSheet();
115 void removePendingSheet(Node* styleSheetCandidateNode); 115 void removePendingSheet(Node* styleSheetCandidateNode);
116 116
117 bool hasPendingSheets() const { return m_pendingStylesheets > 0; } 117 bool hasPendingSheets() const { return m_pendingStylesheets > 0; }
118 bool haveStylesheetsLoaded() const { return !hasPendingSheets() || m_ignoreP endingStylesheets; } 118 bool haveStylesheetsLoaded() const { return !hasPendingSheets() || m_ignoreP endingStylesheets; }
119 bool ignoringPendingStylesheets() const { return m_ignorePendingStylesheets; } 119 bool ignoringPendingStylesheets() const { return m_ignorePendingStylesheets; }
120 120
121 unsigned maxDirectAdjacentSelectors() const { return m_maxDirectAdjacentSele ctors; } 121 unsigned maxDirectAdjacentSelectors() const { return m_maxDirectAdjacentSele ctors; }
122 bool usesSiblingRules() const { return m_usesSiblingRules || m_usesSiblingRu lesOverride; } 122 bool usesSiblingRules() const { return m_usesSiblingRules; }
123 void setUsesSiblingRulesOverride(bool b) { m_usesSiblingRulesOverride = b; }
124 bool usesFirstLineRules() const { return m_usesFirstLineRules; } 123 bool usesFirstLineRules() const { return m_usesFirstLineRules; }
125 bool usesFirstLetterRules() const { return m_usesFirstLetterRules; } 124 bool usesFirstLetterRules() const { return m_usesFirstLetterRules; }
126 void setUsesFirstLetterRules(bool b) { m_usesFirstLetterRules = b; } 125 void setUsesFirstLetterRules(bool b) { m_usesFirstLetterRules = b; }
127 bool usesRemUnits() const { return m_usesRemUnits; } 126 bool usesRemUnits() const { return m_usesRemUnits; }
128 void setUsesRemUnit(bool b) { m_usesRemUnits = b; } 127 void setUsesRemUnit(bool b) { m_usesRemUnits = b; }
129 128
130 void combineCSSFeatureFlags(const RuleFeatureSet&); 129 void combineCSSFeatureFlags(const RuleFeatureSet&);
131 void resetCSSFeatureFlags(const RuleFeatureSet&); 130 void resetCSSFeatureFlags(const RuleFeatureSet&);
132 131
133 void didRemoveShadowRoot(ShadowRoot*); 132 void didRemoveShadowRoot(ShadowRoot*);
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 StyleSheetCollectionMap m_styleSheetCollectionMap; 228 StyleSheetCollectionMap m_styleSheetCollectionMap;
230 229
231 bool m_documentScopeDirty; 230 bool m_documentScopeDirty;
232 TreeScopeSet m_dirtyTreeScopes; 231 TreeScopeSet m_dirtyTreeScopes;
233 TreeScopeSet m_activeTreeScopes; 232 TreeScopeSet m_activeTreeScopes;
234 233
235 String m_preferredStylesheetSetName; 234 String m_preferredStylesheetSetName;
236 String m_selectedStylesheetSetName; 235 String m_selectedStylesheetSetName;
237 236
238 bool m_usesSiblingRules; 237 bool m_usesSiblingRules;
239 bool m_usesSiblingRulesOverride;
240 bool m_usesFirstLineRules; 238 bool m_usesFirstLineRules;
241 bool m_usesFirstLetterRules; 239 bool m_usesFirstLetterRules;
242 bool m_usesRemUnits; 240 bool m_usesRemUnits;
243 unsigned m_maxDirectAdjacentSelectors; 241 unsigned m_maxDirectAdjacentSelectors;
244 242
245 bool m_ignorePendingStylesheets; 243 bool m_ignorePendingStylesheets;
246 bool m_didCalculateResolver; 244 bool m_didCalculateResolver;
247 OwnPtrWillBeMember<StyleResolver> m_resolver; 245 OwnPtrWillBeMember<StyleResolver> m_resolver;
248 246
249 RefPtrWillBeMember<CSSFontSelector> m_fontSelector; 247 RefPtrWillBeMember<CSSFontSelector> m_fontSelector;
250 248
251 WillBeHeapHashMap<AtomicString, RawPtrWillBeMember<StyleSheetContents> > m_t extToSheetCache; 249 WillBeHeapHashMap<AtomicString, RawPtrWillBeMember<StyleSheetContents> > m_t extToSheetCache;
252 WillBeHeapHashMap<RawPtrWillBeMember<StyleSheetContents>, AtomicString> m_sh eetToTextCache; 250 WillBeHeapHashMap<RawPtrWillBeMember<StyleSheetContents>, AtomicString> m_sh eetToTextCache;
253 }; 251 };
254 252
255 } 253 }
256 254
257 #endif 255 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/StyleEngine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698