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

Unified Diff: Source/core/frame/FrameView.h

Issue 156413002: [WIP] Move layout states into the DocumentLifecycle state machine (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: uber patch Created 6 years, 10 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 | « Source/core/frame/Frame.cpp ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/FrameView.h
diff --git a/Source/core/frame/FrameView.h b/Source/core/frame/FrameView.h
index 61504f6b9cf7538169ce6d00e8c8f82a53f7039c..2d2969f2024b0b3391b246c3a4072d73ae8d0b9a 100644
--- a/Source/core/frame/FrameView.h
+++ b/Source/core/frame/FrameView.h
@@ -87,9 +87,8 @@ public:
bool didFirstLayout() const;
void scheduleRelayout();
void scheduleRelayoutOfSubtree(RenderObject*);
- void unscheduleRelayout();
bool layoutPending() const;
- bool isInPerformLayout() const { return m_inPerformLayout; }
+ bool isInPerformLayout() const;
void setCanRepaintDuringPerformLayout(bool b) { m_canRepaintDuringPerformLayout = b; }
bool canRepaintDuringPerformLayout() const { return m_canRepaintDuringPerformLayout; }
@@ -355,6 +354,8 @@ private:
void gatherDebugLayoutRects(RenderObject* layoutRoot);
+ DocumentLifecycle& lifecycle() const;
+
virtual void repaintContentRectangle(const IntRect&) OVERRIDE;
virtual void contentsResized() OVERRIDE;
virtual void scrollbarExistenceDidChange() OVERRIDE;
@@ -412,7 +413,7 @@ private:
if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled())
return true;
- return !m_inPerformLayout || canRepaintDuringPerformLayout();
+ return !isInPerformLayout() || canRepaintDuringPerformLayout();
}
static double s_currentFrameTimeStamp; // used for detecting decoded resource thrash in the cache
@@ -437,7 +438,6 @@ private:
unsigned m_slowRepaintObjectCount;
bool m_hasPendingLayout;
- bool m_delayedLayout;
RenderObject* m_layoutSubtreeRoot;
bool m_layoutSchedulingEnabled;
« no previous file with comments | « Source/core/frame/Frame.cpp ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698