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

Unified Diff: sky/engine/core/dom/Document.cpp

Issue 846183002: Remove tracking of pending sheets. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 | « sky/engine/core/dom/Document.h ('k') | sky/engine/core/dom/StyleEngine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/dom/Document.cpp
diff --git a/sky/engine/core/dom/Document.cpp b/sky/engine/core/dom/Document.cpp
index f2d6ac805dbc4024b4e51f14861f37b901ef2a72..7d9068547ac2af446c89391a6a4acf3c31a5ff35 100644
--- a/sky/engine/core/dom/Document.cpp
+++ b/sky/engine/core/dom/Document.cpp
@@ -1104,10 +1104,7 @@ void Document::updateStyle(StyleRecalcChange change)
clearChildNeedsStyleRecalc();
- if (m_styleEngine->hasResolver()) {
- StyleResolver& resolver = m_styleEngine->ensureResolver();
- resolver.clearStyleSharingList();
- }
+ m_styleEngine->resolver().clearStyleSharingList();
ASSERT(!needsStyleRecalc());
ASSERT(!childNeedsStyleRecalc());
@@ -1175,18 +1172,13 @@ StyleResolver* Document::styleResolver() const
{
if (!isActive())
return 0;
- return m_styleEngine->resolver();
+ return &m_styleEngine->resolver();
}
StyleResolver& Document::ensureStyleResolver() const
{
ASSERT(isActive());
- return m_styleEngine->ensureResolver();
-}
-
-void Document::clearStyleResolver()
-{
- m_styleEngine->clearResolver();
+ return m_styleEngine->resolver();
}
void Document::attach(const AttachContext& context)
« no previous file with comments | « sky/engine/core/dom/Document.h ('k') | sky/engine/core/dom/StyleEngine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698