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

Unified Diff: third_party/WebKit/Source/core/dom/StyleEngine.cpp

Issue 2405793002: documentStyleSheetCollection() is always non-null. (Closed)
Patch Set: Removed unnecessary get()s. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/dom/StyleEngine.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/dom/StyleEngine.cpp
diff --git a/third_party/WebKit/Source/core/dom/StyleEngine.cpp b/third_party/WebKit/Source/core/dom/StyleEngine.cpp
index c7d863621a1e59daab0af046bfca5453a9d4887f..8d064daae7b4616bf5b20da5bfe97e7391e6d664 100644
--- a/third_party/WebKit/Source/core/dom/StyleEngine.cpp
+++ b/third_party/WebKit/Source/core/dom/StyleEngine.cpp
@@ -92,7 +92,7 @@ inline Document* StyleEngine::master() {
TreeScopeStyleSheetCollection* StyleEngine::ensureStyleSheetCollectionFor(
TreeScope& treeScope) {
if (treeScope == m_document)
- return documentStyleSheetCollection();
+ return &documentStyleSheetCollection();
StyleSheetCollectionMap::AddResult result =
m_styleSheetCollectionMap.add(&treeScope, nullptr);
@@ -105,19 +105,19 @@ TreeScopeStyleSheetCollection* StyleEngine::ensureStyleSheetCollectionFor(
TreeScopeStyleSheetCollection* StyleEngine::styleSheetCollectionFor(
TreeScope& treeScope) {
if (treeScope == m_document)
- return documentStyleSheetCollection();
+ return &documentStyleSheetCollection();
StyleSheetCollectionMap::iterator it =
m_styleSheetCollectionMap.find(&treeScope);
if (it == m_styleSheetCollectionMap.end())
- return 0;
+ return nullptr;
return it->value.get();
}
const HeapVector<Member<StyleSheet>>& StyleEngine::styleSheetsForStyleSheetList(
TreeScope& treeScope) {
if (treeScope == m_document)
- return documentStyleSheetCollection()->styleSheetsForStyleSheetList();
+ return documentStyleSheetCollection().styleSheetsForStyleSheetList();
return ensureStyleSheetCollectionFor(treeScope)
->styleSheetsForStyleSheetList();
@@ -284,7 +284,7 @@ void StyleEngine::clearMediaQueryRuleSetOnTreeScopeStyleSheets(
void StyleEngine::clearMediaQueryRuleSetStyleSheets() {
resolverChanged(FullStyleUpdate);
- documentStyleSheetCollection()->clearMediaQueryRuleSetStyleSheets();
+ documentStyleSheetCollection().clearMediaQueryRuleSetStyleSheets();
clearMediaQueryRuleSetOnTreeScopeStyleSheets(m_activeTreeScopes);
}
@@ -294,8 +294,8 @@ void StyleEngine::updateStyleSheetsInImport(
HeapVector<Member<StyleSheet>> sheetsForList;
ImportedDocumentStyleSheetCollector subcollector(parentCollector,
sheetsForList);
- documentStyleSheetCollection()->collectStyleSheets(*this, subcollector);
- documentStyleSheetCollection()->swapSheetsForSheetList(sheetsForList);
+ documentStyleSheetCollection().collectStyleSheets(*this, subcollector);
+ documentStyleSheetCollection().swapSheetsForSheetList(sheetsForList);
}
void StyleEngine::updateActiveStyleSheetsInShadow(
@@ -325,7 +325,7 @@ void StyleEngine::updateActiveStyleSheets(StyleResolverUpdateMode updateMode) {
TRACE_EVENT0("blink,blink_style", "StyleEngine::updateActiveStyleSheets");
if (shouldUpdateDocumentStyleSheetCollection(updateMode))
- documentStyleSheetCollection()->updateActiveStyleSheets(*this, updateMode);
+ documentStyleSheetCollection().updateActiveStyleSheets(*this, updateMode);
if (shouldUpdateShadowTreeStyleSheetCollection(updateMode)) {
UnorderedTreeScopeSet treeScopesRemoved;
@@ -352,12 +352,12 @@ void StyleEngine::updateActiveStyleSheets(StyleResolverUpdateMode updateMode) {
const HeapVector<Member<CSSStyleSheet>>
StyleEngine::activeStyleSheetsForInspector() const {
if (m_activeTreeScopes.isEmpty())
- return documentStyleSheetCollection()->activeAuthorStyleSheets();
+ return documentStyleSheetCollection().activeAuthorStyleSheets();
HeapVector<Member<CSSStyleSheet>> activeStyleSheets;
activeStyleSheets.appendVector(
- documentStyleSheetCollection()->activeAuthorStyleSheets());
+ documentStyleSheetCollection().activeAuthorStyleSheets());
for (TreeScope* treeScope : m_activeTreeScopes) {
if (TreeScopeStyleSheetCollection* collection =
m_styleSheetCollectionMap.get(treeScope))
@@ -394,7 +394,7 @@ void StyleEngine::appendActiveAuthorStyleSheets() {
DCHECK(isMaster());
m_resolver->appendAuthorStyleSheets(
- documentStyleSheetCollection()->activeAuthorStyleSheets());
+ documentStyleSheetCollection().activeAuthorStyleSheets());
for (TreeScope* treeScope : m_activeTreeScopes) {
if (TreeScopeStyleSheetCollection* collection =
m_styleSheetCollectionMap.get(treeScope))
« no previous file with comments | « third_party/WebKit/Source/core/dom/StyleEngine.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698