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

Unified Diff: Source/core/dom/Document.h

Issue 150423004: Move Document::m_inStyleRecalc into DocumentLifecycle (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rename state Created 6 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 | « no previous file | Source/core/dom/Document.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Document.h
diff --git a/Source/core/dom/Document.h b/Source/core/dom/Document.h
index bacd8ddaa0de06ddc8683c1af428a20453e85dea..b5bc1f05671d68146e46fb77709ea5d445170663 100644
--- a/Source/core/dom/Document.h
+++ b/Source/core/dom/Document.h
@@ -991,7 +991,7 @@ public:
void setNeedsNotifyRemoveAllPendingStylesheet() { m_needsNotifyRemoveAllPendingStylesheet = true; }
void clearStyleResolver();
- bool inStyleRecalc() { return m_inStyleRecalc; }
+ bool inStyleRecalc() const { return m_lifecycle.state() == DocumentLifecycle::InStyleRecalc; }
// Return a Locale for the default locale if the argument is null or empty.
Locale& getCachedLocale(const AtomicString& locale = nullAtom);
@@ -1020,7 +1020,7 @@ public:
Frame* executingFrame();
DocumentLifecycleNotifier& lifecycleNotifier();
- bool isActive() const { return m_lifecycle.state() == DocumentLifecycle::Active; }
+ bool isActive() const { return m_lifecycle.isActive(); }
bool isStopped() const { return m_lifecycle.state() == DocumentLifecycle::Stopped; }
enum HttpRefreshType {
@@ -1197,7 +1197,6 @@ private:
bool m_bParsing;
bool m_hasPendingStyleRecalc;
- bool m_inStyleRecalc;
bool m_gotoAnchorNeededAfterStylesheetsLoad;
bool m_isDNSPrefetchEnabled;
« no previous file with comments | « no previous file | Source/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698