Chromium Code Reviews| Index: Source/core/frame/FrameView.h |
| diff --git a/Source/core/frame/FrameView.h b/Source/core/frame/FrameView.h |
| index f9c47582871ce2fdf1958d1b219f6a6ae6fd0d3f..42ee314a8973262e38af1fcc25c120b2d9cc3933 100644 |
| --- a/Source/core/frame/FrameView.h |
| +++ b/Source/core/frame/FrameView.h |
| @@ -25,6 +25,7 @@ |
| #ifndef FrameView_h |
| #define FrameView_h |
| +#include "core/frame/FrameViewAutoSizeInfo.h" |
| #include "core/rendering/PaintPhase.h" |
| #include "platform/RuntimeEnabledFeatures.h" |
| #include "platform/geometry/LayoutRect.h" |
| @@ -345,7 +346,6 @@ private: |
| void updateOverflowStatus(bool horizontalOverflow, bool verticalOverflow); |
| void updateCounters(); |
| - void autoSizeIfEnabled(); |
| void forceLayoutParentViewIfNeeded(); |
| void performPreLayoutTasks(); |
| void performLayout(RenderObject* rootForThisLayout, bool inSubtreeLayout); |
| @@ -404,6 +404,13 @@ private: |
| return !isInPerformLayout() || canInvalidatePaintDuringPerformLayout(); |
| } |
| + FrameViewAutoSizeInfo& autoSizeInfo() |
| + { |
| + if (!m_autoSizeInfo) |
| + m_autoSizeInfo = adoptPtr(new FrameViewAutoSizeInfo(this)); |
|
eseidel
2014/08/19 16:35:00
Note that the way this is designed, we're always g
Shanmuga Pandi
2014/08/20 14:54:12
Changed logic.
|
| + return *m_autoSizeInfo.get(); |
| + } |
| + |
| static double s_currentFrameTimeStamp; // used for detecting decoded resource thrash in the cache |
| static bool s_inPaintContents; |
| @@ -472,19 +479,10 @@ private: |
| // Renderer to hold our custom scroll corner. |
| RawPtrWillBePersistent<RenderScrollbarPart> m_scrollCorner; |
| - // If true, automatically resize the frame view around its content. |
| - bool m_shouldAutoSize; |
| - bool m_inAutoSize; |
| - // True if autosize has been run since m_shouldAutoSize was set. |
| - bool m_didRunAutosize; |
| - // The lower bound on the size when autosizing. |
| - IntSize m_minAutoSize; |
| - // The upper bound on the size when autosizing. |
| - IntSize m_maxAutoSize; |
| - |
| OwnPtr<ScrollableAreaSet> m_scrollableAreas; |
| OwnPtr<ResizerAreaSet> m_resizerAreas; |
| OwnPtr<ViewportConstrainedObjectSet> m_viewportConstrainedObjects; |
| + OwnPtr<FrameViewAutoSizeInfo> m_autoSizeInfo; |
| bool m_hasSoftwareFilters; |