Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(544)

Unified Diff: Source/core/frame/FrameView.h

Issue 459633002: Autosizing storage doesnot belong on FrameView (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Aligned with review comments Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/FrameView.h
diff --git a/Source/core/frame/FrameView.h b/Source/core/frame/FrameView.h
index eb1b5f54e4283f94d42fa6f735bd6d138299f41a..da9990174f24d9895a2b8708cd8cf94fa0878abc 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"
@@ -217,7 +218,8 @@ public:
void incrementVisuallyNonEmptyCharacterCount(unsigned);
void incrementVisuallyNonEmptyPixelCount(const IntSize&);
void setIsVisuallyNonEmpty() { m_isVisuallyNonEmpty = true; }
- void enableAutoSizeMode(bool enable, const IntSize& minSize, const IntSize& maxSize);
+ void enableAutoSizeMode(const IntSize& minSize, const IntSize& maxSize);
+ void disableAutoSizeMode() { m_autoSizeInfo = 0; }
void forceLayout(bool allowSubtree = false);
void forceLayoutForPagination(const FloatSize& pageSize, const FloatSize& originalPageSize, float maximumShrinkFactor);
@@ -345,7 +347,6 @@ private:
void updateOverflowStatus(bool horizontalOverflow, bool verticalOverflow);
void updateCounters();
- void autoSizeIfEnabled();
void forceLayoutParentViewIfNeeded();
void performPreLayoutTasks();
void performLayout(RenderObject* rootForThisLayout, bool inSubtreeLayout);
@@ -472,19 +473,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;
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698