Refactor fixed layout mode

Source/core/page/FrameView.h

 /*
    Copyright (C) 1997 Martin Jones (mjones@kde.org)
              (C) 1998 Waldo Bastian (bastian@kde.org)
              (C) 1998, 1999 Torben Weis (weis@kde.org)
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ skipping 90 matching lines @@
     bool isInLayout() const { return m_inLayout; }
 
     RenderObject* layoutRoot(bool onlyDuringLayout = false) const;
     void clearLayoutRoot() { m_layoutRoot = 0; }
     int layoutCount() const { return m_layoutCount; }
 
     bool needsLayout() const;
     void setNeedsLayout();
     void setViewportConstrainedObjectsNeedLayout();
 
+    // Methods for getting/setting the size Blink should use to layout the contents.
+    IntSize layoutSize(IncludeScrollbarsInRect = ExcludeScrollbars) const;
+    void setLayoutSize(const IntSize&);
+
+    // If this is set to false, the layout size will need to be explicitly set by the owner.
+    // E.g. WebViewImpl sets its mainFrame's layout size manually
+    void setLayoutSizeFixedToFrameSize(bool isFixed) { m_layoutSizeFixedToFrameSize = isFixed; }
+    bool layoutSizeFixedToFrameSize() { return m_layoutSizeFixedToFrameSize; }
+
     bool needsFullRepaint() const { return m_doFullRepaint; }
 
     void serviceScriptedAnimations(double monotonicAnimationStartTime);
 
     void updateCompositingLayersAfterStyleChange();
     void updateCompositingLayersAfterLayout();
 
     bool hasCompositedContent() const;
     bool isEnclosedInCompositingLayer() const;
 
@@ skipping 226 matching lines @@
     explicit FrameView(Frame*);
 
     void beginDeferredRepaints();
     void endDeferredRepaints();
     void flushDeferredRepaints();
     void startDeferredRepaintTimer(double delay);
 
     void reset();
     void init();
 
+    virtual void frameRectsChanged();
     virtual bool isFrameView() const OVERRIDE { return true; }
 
     friend class RenderWidget;
     bool useSlowRepaints(bool considerOverlap = true) const;
     bool useSlowRepaintsIfNotOverlapped() const;
     void updateCanBlitOnScrollRecursively();
     bool contentsInCompositedLayer() const;
 
     void applyOverflowToViewport(RenderObject*, ScrollbarMode& hMode, ScrollbarMode& vMode);
     void applyPaginationToViewport();
 
     void updateOverflowStatus(bool horizontalOverflow, bool verticalOverflow);
 
     void paintControlTints();
 
     void updateCounters();
     void autoSizeIfEnabled();
     void forceLayoutParentViewIfNeeded();
     void performPreLayoutTasks();
     void performLayout(RenderObject* rootForThisLayout, bool inSubtreeLayout);
     void scheduleOrPerformPostLayoutTasks();
     void performPostLayoutTasks();
 
     virtual void repaintContentRectangle(const IntRect&);
     virtual void contentsResized() OVERRIDE;
-    virtual void visibleContentsResized();
+    virtual void scrollbarExistenceDidChange();
 
     // Override ScrollView methods to do point conversion via renderers, in order to
     // take transforms into account.
     virtual IntRect convertToContainingView(const IntRect&) const OVERRIDE;
     virtual IntRect convertFromContainingView(const IntRect&) const OVERRIDE;
     virtual IntPoint convertToContainingView(const IntPoint&) const OVERRIDE;
     virtual IntPoint convertFromContainingView(const IntPoint&) const OVERRIDE;
 
     // ScrollableArea interface
     virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&) OVERRIDE;
@@ skipping 32 matching lines @@
 
     virtual void updateScrollCorner();
 
     FrameView* parentFrameView() const;
 
     virtual AXObjectCache* axObjectCache() const;
     void removeFromAXObjectCache();
 
     bool isMainFrame() const;
 
+    void setLayoutSizeInternal(const IntSize&);
+
     static double s_currentFrameTimeStamp; // used for detecting decoded resource thrash in the cache
     static bool s_inPaintContents;
 
     LayoutSize m_size;
     LayoutSize m_margins;
 
     typedef HashSet<RenderObject*> RenderObjectSet;
     OwnPtr<RenderObjectSet> m_widgetUpdateSet;
     RefPtr<Frame> m_frame;
 
@@ skipping 89 matching lines @@
     static double s_normalDeferredRepaintDelay;
     static double s_initialDeferredRepaintDelayDuringLoading;
     static double s_maxDeferredRepaintDelayDuringLoading;
     static double s_deferredRepaintDelayIncrementDuringLoading;
 
     bool m_hasSoftwareFilters;
 
     float m_visibleContentScaleFactor;
 
     PartialLayoutState m_partialLayout;
+    IntSize m_layoutSize;
+    bool m_layoutSizeFixedToFrameSize;
 };
 
 inline void FrameView::incrementVisuallyNonEmptyCharacterCount(unsigned count)
 {
     if (m_isVisuallyNonEmpty)
         return;
     m_visuallyNonEmptyCharacterCount += count;
     // Use a threshold value to prevent very small amounts of visible content from triggering didFirstVisuallyNonEmptyLayout.
     // The first few hundred characters rarely contain the interesting content of the page.
     static const unsigned visualCharacterThreshold = 200;
@@ skipping 23 matching lines @@
     ASSERT(!widget || widget->isFrameView());
     return static_cast<const FrameView*>(widget);
 }
 
 // This will catch anyone doing an unnecessary cast.
 void toFrameView(const FrameView*);
 
 } // namespace WebCore
 
 #endif // FrameView_h