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

Side by Side Diff: third_party/WebKit/Source/core/dom/StyleEngine.cpp

Issue 1786663003: Dirty tree scopes are always a subset of active tree scopes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | 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) 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, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 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) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 86
87 if (m_fontSelector) { 87 if (m_fontSelector) {
88 m_fontSelector->clearDocument(); 88 m_fontSelector->clearDocument();
89 m_fontSelector->unregisterForInvalidationCallbacks(this); 89 m_fontSelector->unregisterForInvalidationCallbacks(this);
90 } 90 }
91 91
92 // Decrement reference counts for things we could be keeping alive. 92 // Decrement reference counts for things we could be keeping alive.
93 m_fontSelector.clear(); 93 m_fontSelector.clear();
94 m_resolver.clear(); 94 m_resolver.clear();
95 m_styleSheetCollectionMap.clear(); 95 m_styleSheetCollectionMap.clear();
96 m_dirtyTreeScopes.clear();
96 m_activeTreeScopes.clear(); 97 m_activeTreeScopes.clear();
97 } 98 }
98 #endif 99 #endif
99 100
100 inline Document* StyleEngine::master() 101 inline Document* StyleEngine::master()
101 { 102 {
102 if (isMaster()) 103 if (isMaster())
103 return m_document; 104 return m_document;
104 HTMLImportsController* import = document().importsController(); 105 HTMLImportsController* import = document().importsController();
105 if (!import) // Document::import() can return null while executing its destr uctor. 106 if (!import) // Document::import() can return null while executing its destr uctor.
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 ShadowTreeStyleSheetCollection* collection = static_cast<ShadowTreeStyle SheetCollection*>(styleSheetCollectionFor(*treeScope)); 265 ShadowTreeStyleSheetCollection* collection = static_cast<ShadowTreeStyle SheetCollection*>(styleSheetCollectionFor(*treeScope));
265 ASSERT(collection); 266 ASSERT(collection);
266 collection->clearMediaQueryRuleSetStyleSheets(); 267 collection->clearMediaQueryRuleSetStyleSheets();
267 } 268 }
268 } 269 }
269 270
270 void StyleEngine::clearMediaQueryRuleSetStyleSheets() 271 void StyleEngine::clearMediaQueryRuleSetStyleSheets()
271 { 272 {
272 documentStyleSheetCollection()->clearMediaQueryRuleSetStyleSheets(); 273 documentStyleSheetCollection()->clearMediaQueryRuleSetStyleSheets();
273 clearMediaQueryRuleSetOnTreeScopeStyleSheets(m_activeTreeScopes); 274 clearMediaQueryRuleSetOnTreeScopeStyleSheets(m_activeTreeScopes);
274 clearMediaQueryRuleSetOnTreeScopeStyleSheets(m_dirtyTreeScopes);
275 } 275 }
276 276
277 void StyleEngine::updateStyleSheetsInImport(DocumentStyleSheetCollector& parentC ollector) 277 void StyleEngine::updateStyleSheetsInImport(DocumentStyleSheetCollector& parentC ollector)
278 { 278 {
279 ASSERT(!isMaster()); 279 ASSERT(!isMaster());
280 WillBeHeapVector<RefPtrWillBeMember<StyleSheet>> sheetsForList; 280 WillBeHeapVector<RefPtrWillBeMember<StyleSheet>> sheetsForList;
281 ImportedDocumentStyleSheetCollector subcollector(parentCollector, sheetsForL ist); 281 ImportedDocumentStyleSheetCollector subcollector(parentCollector, sheetsForL ist);
282 documentStyleSheetCollection()->collectStyleSheets(*this, subcollector); 282 documentStyleSheetCollection()->collectStyleSheets(*this, subcollector);
283 documentStyleSheetCollection()->swapSheetsForSheetList(sheetsForList); 283 documentStyleSheetCollection()->swapSheetsForSheetList(sheetsForList);
284 } 284 }
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
767 visitor->trace(m_dirtyTreeScopes); 767 visitor->trace(m_dirtyTreeScopes);
768 visitor->trace(m_activeTreeScopes); 768 visitor->trace(m_activeTreeScopes);
769 visitor->trace(m_fontSelector); 769 visitor->trace(m_fontSelector);
770 visitor->trace(m_textToSheetCache); 770 visitor->trace(m_textToSheetCache);
771 visitor->trace(m_sheetToTextCache); 771 visitor->trace(m_sheetToTextCache);
772 #endif 772 #endif
773 CSSFontSelectorClient::trace(visitor); 773 CSSFontSelectorClient::trace(visitor);
774 } 774 }
775 775
776 } // namespace blink 776 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698