| Index: Source/core/frame/FrameView.h
|
| diff --git a/Source/core/frame/FrameView.h b/Source/core/frame/FrameView.h
|
| index 44647337f61378b2b1c0fb4a8966ea55547ece12..61504f6b9cf7538169ce6d00e8c8f82a53f7039c 100644
|
| --- a/Source/core/frame/FrameView.h
|
| +++ b/Source/core/frame/FrameView.h
|
| @@ -85,7 +85,6 @@ public:
|
|
|
| void layout(bool allowSubtree = true);
|
| bool didFirstLayout() const;
|
| - void layoutTimerFired(Timer<FrameView>*);
|
| void scheduleRelayout();
|
| void scheduleRelayoutOfSubtree(RenderObject*);
|
| void unscheduleRelayout();
|
| @@ -437,7 +436,7 @@ private:
|
| bool m_contentIsOpaque;
|
| unsigned m_slowRepaintObjectCount;
|
|
|
| - Timer<FrameView> m_layoutTimer;
|
| + bool m_hasPendingLayout;
|
| bool m_delayedLayout;
|
| RenderObject* m_layoutSubtreeRoot;
|
|
|
|
|