| Index: Source/core/page/FrameView.h
|
| diff --git a/Source/core/page/FrameView.h b/Source/core/page/FrameView.h
|
| index ff021cf007f9659f1daf79d2159ae7c9807b55b5..a2af7015697679b0680ade290a601a28c82282a6 100644
|
| --- a/Source/core/page/FrameView.h
|
| +++ b/Source/core/page/FrameView.h
|
| @@ -99,7 +99,7 @@ public:
|
| void scheduleRelayout();
|
| void scheduleRelayoutOfSubtree(RenderObject*);
|
| void unscheduleRelayout();
|
| - bool layoutPending() const;
|
| + bool layoutIsScheduledWithEmbedder() const;
|
| bool isInLayout() const { return m_inLayout; }
|
|
|
| void layoutLazyBlocks();
|
| @@ -353,6 +353,8 @@ protected:
|
| private:
|
| explicit FrameView(Frame*);
|
|
|
| + void scheduleLayoutWithEmbedder();
|
| +
|
| void reset();
|
| void init();
|
|
|
| @@ -445,7 +447,7 @@ private:
|
| int m_borderX;
|
| int m_borderY;
|
|
|
| - Timer<FrameView> m_layoutTimer;
|
| + bool m_layoutIsScheduledWithEmbedder;
|
| bool m_delayedLayout;
|
| RenderObject* m_layoutRoot;
|
|
|
|
|