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

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.h

Issue 2431613002: Initial viewport is not the same as FrameView rect. (Closed)
Patch Set: DCHECK that initial viewport size is read from main frame only. Created 4 years, 2 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 Copyright (C) 1997 Martin Jones (mjones@kde.org) 2 Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 (C) 1998 Waldo Bastian (bastian@kde.org) 3 (C) 1998 Waldo Bastian (bastian@kde.org)
4 (C) 1998, 1999 Torben Weis (weis@kde.org) 4 (C) 1998, 1999 Torben Weis (weis@kde.org)
5 (C) 1999 Lars Knoll (knoll@kde.org) 5 (C) 1999 Lars Knoll (knoll@kde.org)
6 (C) 1999 Antti Koivisto (koivisto@kde.org) 6 (C) 1999 Antti Koivisto (koivisto@kde.org)
7 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights 7 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
8 reserved. 8 reserved.
9 9
10 This library is free software; you can redistribute it and/or 10 This library is free software; you can redistribute it and/or
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 IntSize layoutSize(IncludeScrollbarsInRect = ExcludeScrollbars) const; 158 IntSize layoutSize(IncludeScrollbarsInRect = ExcludeScrollbars) const;
159 void setLayoutSize(const IntSize&); 159 void setLayoutSize(const IntSize&);
160 160
161 // If this is set to false, the layout size will need to be explicitly set by 161 // If this is set to false, the layout size will need to be explicitly set by
162 // the owner. E.g. WebViewImpl sets its mainFrame's layout size manually 162 // the owner. E.g. WebViewImpl sets its mainFrame's layout size manually
163 void setLayoutSizeFixedToFrameSize(bool isFixed) { 163 void setLayoutSizeFixedToFrameSize(bool isFixed) {
164 m_layoutSizeFixedToFrameSize = isFixed; 164 m_layoutSizeFixedToFrameSize = isFixed;
165 } 165 }
166 bool layoutSizeFixedToFrameSize() { return m_layoutSizeFixedToFrameSize; } 166 bool layoutSizeFixedToFrameSize() { return m_layoutSizeFixedToFrameSize; }
167 167
168 void setInitialViewportSize(const IntSize&);
169 int initialViewportWidth() const;
170 int initialViewportHeight() const;
171
168 void updateAcceleratedCompositingSettings(); 172 void updateAcceleratedCompositingSettings();
169 173
170 void recalcOverflowAfterStyleChange(); 174 void recalcOverflowAfterStyleChange();
171 175
172 bool isEnclosedInCompositingLayer() const; 176 bool isEnclosedInCompositingLayer() const;
173 177
174 void dispose() override; 178 void dispose() override;
175 void detachScrollbars(); 179 void detachScrollbars();
176 void recalculateCustomScrollbarStyle(); 180 void recalculateCustomScrollbarStyle();
177 void invalidateAllCustomScrollbarsOnActiveChanged(); 181 void invalidateAllCustomScrollbarsOnActiveChanged();
(...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 std::unique_ptr<ResizerAreaSet> m_resizerAreas; 974 std::unique_ptr<ResizerAreaSet> m_resizerAreas;
971 std::unique_ptr<ViewportConstrainedObjectSet> m_viewportConstrainedObjects; 975 std::unique_ptr<ViewportConstrainedObjectSet> m_viewportConstrainedObjects;
972 unsigned m_stickyPositionObjectCount; 976 unsigned m_stickyPositionObjectCount;
973 ViewportConstrainedObjectSet m_backgroundAttachmentFixedObjects; 977 ViewportConstrainedObjectSet m_backgroundAttachmentFixedObjects;
974 Member<FrameViewAutoSizeInfo> m_autoSizeInfo; 978 Member<FrameViewAutoSizeInfo> m_autoSizeInfo;
975 979
976 IntSize m_inputEventsOffsetForEmulation; 980 IntSize m_inputEventsOffsetForEmulation;
977 float m_inputEventsScaleFactorForEmulation; 981 float m_inputEventsScaleFactorForEmulation;
978 982
979 IntSize m_layoutSize; 983 IntSize m_layoutSize;
984 IntSize m_initialViewportSize;
980 bool m_layoutSizeFixedToFrameSize; 985 bool m_layoutSizeFixedToFrameSize;
981 986
982 Timer<FrameView> m_didScrollTimer; 987 Timer<FrameView> m_didScrollTimer;
983 988
984 Vector<IntRect> m_tickmarks; 989 Vector<IntRect> m_tickmarks;
985 990
986 float m_topControlsViewportAdjustment; 991 float m_topControlsViewportAdjustment;
987 992
988 bool m_needsUpdateWidgetGeometries; 993 bool m_needsUpdateWidgetGeometries;
989 bool m_needsUpdateViewportIntersection; 994 bool m_needsUpdateViewportIntersection;
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
1107 widget.isFrameView()); 1112 widget.isFrameView());
1108 DEFINE_TYPE_CASTS(FrameView, 1113 DEFINE_TYPE_CASTS(FrameView,
1109 ScrollableArea, 1114 ScrollableArea,
1110 scrollableArea, 1115 scrollableArea,
1111 scrollableArea->isFrameView(), 1116 scrollableArea->isFrameView(),
1112 scrollableArea.isFrameView()); 1117 scrollableArea.isFrameView());
1113 1118
1114 } // namespace blink 1119 } // namespace blink
1115 1120
1116 #endif // FrameView_h 1121 #endif // FrameView_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698