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

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

Issue 2443613002: Rename classes related to top controls (Closed)
Patch Set: fix test Created 4 years, 1 month 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 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 // Sets the tickmarks for the FrameView, overriding the default behavior 399 // Sets the tickmarks for the FrameView, overriding the default behavior
400 // which is to display the tickmarks corresponding to find results. 400 // which is to display the tickmarks corresponding to find results.
401 // If |m_tickmarks| is empty, the default behavior is restored. 401 // If |m_tickmarks| is empty, the default behavior is restored.
402 void setTickmarks(const Vector<IntRect>& tickmarks) { 402 void setTickmarks(const Vector<IntRect>& tickmarks) {
403 m_tickmarks = tickmarks; 403 m_tickmarks = tickmarks;
404 invalidatePaintForTickmarks(); 404 invalidatePaintForTickmarks();
405 } 405 }
406 406
407 void invalidatePaintForTickmarks(); 407 void invalidatePaintForTickmarks();
408 408
409 // Since the compositor can resize the viewport due to top controls and 409 // Since the compositor can resize the viewport due to browser controls and
410 // commit scroll offsets before a WebView::resize occurs, we need to adjust 410 // commit scroll offsets before a WebView::resize occurs, we need to adjust
411 // our scroll extents to prevent clamping the scroll offsets. 411 // our scroll extents to prevent clamping the scroll offsets.
412 void setTopControlsViewportAdjustment(float); 412 void setBrowserControlsViewportAdjustment(float);
413 IntSize topControlsSize() const { 413 IntSize browserControlsSize() const {
414 return IntSize(0, ceilf(m_topControlsViewportAdjustment)); 414 return IntSize(0, ceilf(m_browserControlsViewportAdjustment));
415 } 415 }
416 416
417 IntSize maximumScrollOffsetInt() const override; 417 IntSize maximumScrollOffsetInt() const override;
418 418
419 // ScrollableArea interface 419 // ScrollableArea interface
420 void getTickmarks(Vector<IntRect>&) const override; 420 void getTickmarks(Vector<IntRect>&) const override;
421 IntRect scrollableAreaBoundingBox() const override; 421 IntRect scrollableAreaBoundingBox() const override;
422 bool scrollAnimatorEnabled() const override; 422 bool scrollAnimatorEnabled() const override;
423 bool usesCompositedScrolling() const override; 423 bool usesCompositedScrolling() const override;
424 bool shouldScrollOnMainThread() const override; 424 bool shouldScrollOnMainThread() const override;
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after
982 float m_inputEventsScaleFactorForEmulation; 982 float m_inputEventsScaleFactorForEmulation;
983 983
984 IntSize m_layoutSize; 984 IntSize m_layoutSize;
985 IntSize m_initialViewportSize; 985 IntSize m_initialViewportSize;
986 bool m_layoutSizeFixedToFrameSize; 986 bool m_layoutSizeFixedToFrameSize;
987 987
988 Timer<FrameView> m_didScrollTimer; 988 Timer<FrameView> m_didScrollTimer;
989 989
990 Vector<IntRect> m_tickmarks; 990 Vector<IntRect> m_tickmarks;
991 991
992 float m_topControlsViewportAdjustment; 992 float m_browserControlsViewportAdjustment;
993 993
994 bool m_needsUpdateWidgetGeometries; 994 bool m_needsUpdateWidgetGeometries;
995 bool m_needsUpdateViewportIntersection; 995 bool m_needsUpdateViewportIntersection;
996 bool m_needsUpdateViewportIntersectionInSubtree; 996 bool m_needsUpdateViewportIntersectionInSubtree;
997 997
998 #if ENABLE(ASSERT) 998 #if ENABLE(ASSERT)
999 // Verified when finalizing. 999 // Verified when finalizing.
1000 bool m_hasBeenDisposed; 1000 bool m_hasBeenDisposed;
1001 #endif 1001 #endif
1002 1002
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1113 widget.isFrameView()); 1113 widget.isFrameView());
1114 DEFINE_TYPE_CASTS(FrameView, 1114 DEFINE_TYPE_CASTS(FrameView,
1115 ScrollableArea, 1115 ScrollableArea,
1116 scrollableArea, 1116 scrollableArea,
1117 scrollableArea->isFrameView(), 1117 scrollableArea->isFrameView(),
1118 scrollableArea.isFrameView()); 1118 scrollableArea.isFrameView());
1119 1119
1120 } // namespace blink 1120 } // namespace blink
1121 1121
1122 #endif // FrameView_h 1122 #endif // FrameView_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameHost.cpp ('k') | third_party/WebKit/Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698