Autosizing storage doesnot belong on FrameView

Source/core/frame/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 23 matching lines @@
 #include "wtf/OwnPtr.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class AXObjectCache;
 class DocumentLifecycle;
 class Cursor;
 class Element;
 class FloatSize;
+class FrameView;
 class HTMLFrameOwnerElement;
 class LocalFrame;
 class KURL;
 class Node;
 class Page;
 class RenderBox;
 class RenderEmbeddedObject;
 class RenderObject;
 class RenderScrollbarPart;
 class RenderStyle;
 class RenderView;
 class RenderWidget;
 
 typedef unsigned long long DOMTimeStamp;
 
+struct FrameViewAutoSizeData {

[ostap, 2014/08/10 05:01:51]

Shouldn't it go into separate .h & .cpp ?

[Shanmuga Pandi, 2014/08/10 09:56:48]

I thought it is going to be used only in FrameView. I make it like that. Should
I move it to separate file ?

[Shanmuga Pandi, 2014/08/11 08:58:00]

Done.

[ostap, 2014/08/11 19:24:27]

I see.
Ok.

+    WTF_MAKE_NONCOPYABLE(FrameViewAutoSizeData); WTF_MAKE_FAST_ALLOCATED;
+public:
+    FrameViewAutoSizeData(FrameView *view)
+    : m_frameView(view)
+    , m_shouldAutoSize(false)
+    , m_inAutoSize(false)
+    , m_didRunAutosize(false)
+    {
+    }
+
+    void enableAutoSizeMode(bool enable, const IntSize& minSize, const IntSize& maxSize);
+    void autoSizeIfEnabled();
+
+private:
+    FrameView *m_frameView;
+
+    // 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;
+};
+
 class FrameView FINAL : public ScrollView {
 public:
     friend class RenderView;
     friend class Internals;
 
     static PassRefPtr<FrameView> create(LocalFrame*);
     static PassRefPtr<FrameView> create(LocalFrame*, const IntSize& initialSize);
 
     virtual ~FrameView();
 
@@ skipping 279 matching lines @@
     friend class RenderWidget;
     bool useSlowRepaints(bool considerOverlap = true) const;
     bool useSlowRepaintsIfNotOverlapped() const;
 
     bool contentsInCompositedLayer() const;
 
     void applyOverflowToViewportAndSetRenderer(RenderObject*, ScrollbarMode& hMode, ScrollbarMode& vMode);
     void updateOverflowStatus(bool horizontalOverflow, bool verticalOverflow);
 
     void updateCounters();
-    void autoSizeIfEnabled();
     void forceLayoutParentViewIfNeeded();
     void performPreLayoutTasks();
     void performLayout(RenderObject* rootForThisLayout, bool inSubtreeLayout);
     void scheduleOrPerformPostLayoutTasks();
     void performPostLayoutTasks();
 
     void invalidateTreeIfNeeded();
 
     void gatherDebugLayoutRects(RenderObject* layoutRoot);
 
@@ skipping 38 matching lines @@
     AXObjectCache* axObjectCache() const;
     void removeFromAXObjectCache();
 
     void setLayoutSizeInternal(const IntSize&);
 
     bool paintInvalidationIsAllowed() const
     {
         return !isInPerformLayout() || canInvalidatePaintDuringPerformLayout();
     }
 
+    FrameViewAutoSizeData& ensureAutoSizeData()

[ostap, 2014/08/10 05:01:51]

autoSizeData() ?

[Shanmuga Pandi, 2014/08/10 09:56:48]

I have referred ensureRareData in RenderBox.h. 
Can I rename to autoSizeData() ?

[Shanmuga Pandi, 2014/08/11 08:58:00]

Done.

[ostap, 2014/08/11 19:24:26]

I sees it both ways in code, so it should be fine as is.

+    {
+        if (!m_autoSizeData)
+            m_autoSizeData = adoptPtr(new FrameViewAutoSizeData(this));
+        return *m_autoSizeData.get();
+    }
+
     static double s_currentFrameTimeStamp; // used for detecting decoded resource thrash in the cache
     static bool s_inPaintContents;
 
     LayoutSize m_size;
 
     typedef HashSet<RefPtr<RenderEmbeddedObject> > EmbeddedObjectSet;
     EmbeddedObjectSet m_widgetUpdateSet;
 
     // FIXME: These are just "children" of the FrameView and should be RefPtr<Widget> instead.
     HashSet<RefPtr<RenderWidget> > m_widgets;
@@ skipping 51 matching lines @@
     unsigned m_visuallyNonEmptyCharacterCount;
     unsigned m_visuallyNonEmptyPixelCount;
     bool m_isVisuallyNonEmpty;
     bool m_firstVisuallyNonEmptyLayoutCallbackPending;
 
     RefPtrWillBePersistent<Node> m_maintainScrollPositionAnchor;
 
     // Renderer to hold our custom scroll corner.
     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<FrameViewAutoSizeData> m_autoSizeData;
 
     bool m_hasSoftwareFilters;
 
     float m_visibleContentScaleFactor;
     IntSize m_inputEventsOffsetForEmulation;
     float m_inputEventsScaleFactorForEmulation;
 
     IntSize m_layoutSize;
     bool m_layoutSizeFixedToFrameSize;
 
@@ skipping 47 matching lines @@
         m_view->setCanInvalidatePaintDuringPerformLayout(m_originalValue);
     }
 private:
     FrameView* m_view;
     bool m_originalValue;
 };
 
 } // namespace blink
 
 #endif // FrameView_h