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; |