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

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

Issue 2501723003: Disable scrollbars on the root scroller when using visual viewport scrollbars. (Closed)
Patch Set: Rebase 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 751 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 bool scrollContentsFastPath(const IntSize& scrollDelta); 762 bool scrollContentsFastPath(const IntSize& scrollDelta);
763 763
764 // Scroll the content by invalidating everything. 764 // Scroll the content by invalidating everything.
765 void scrollContentsSlowPath(); 765 void scrollContentsSlowPath();
766 766
767 ScrollBehavior scrollBehaviorStyle() const override; 767 ScrollBehavior scrollBehaviorStyle() const override;
768 768
769 void scrollContentsIfNeeded(); 769 void scrollContentsIfNeeded();
770 770
771 enum ComputeScrollbarExistenceOption { FirstPass, Incremental }; 771 enum ComputeScrollbarExistenceOption { FirstPass, Incremental };
772 void computeScrollbarExistence( 772 void computeScrollbarExistence(bool& newHasHorizontalScrollbar,
773 bool& newHasHorizontalScrollbar, 773 bool& newHasVerticalScrollbar,
774 bool& newHasVerticalScrollbar, 774 const IntSize& docSize,
775 const IntSize& docSize, 775 ComputeScrollbarExistenceOption = FirstPass);
776 ComputeScrollbarExistenceOption = FirstPass) const;
777 void updateScrollbarGeometry(); 776 void updateScrollbarGeometry();
778 777
779 // Called to update the scrollbars to accurately reflect the state of the 778 // Called to update the scrollbars to accurately reflect the state of the
780 // view. 779 // view.
781 void updateScrollbars(); 780 void updateScrollbars();
782 void updateScrollbarsIfNeeded(); 781 void updateScrollbarsIfNeeded();
783 782
784 class InUpdateScrollbarsScope { 783 class InUpdateScrollbarsScope {
785 STACK_ALLOCATED(); 784 STACK_ALLOCATED();
786 785
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
861 void contentsResized() override; 860 void contentsResized() override;
862 void scrollbarExistenceDidChange(); 861 void scrollbarExistenceDidChange();
863 862
864 // Override Widget methods to do point conversion via layoutObjects, in order 863 // Override Widget methods to do point conversion via layoutObjects, in order
865 // to take transforms into account. 864 // to take transforms into account.
866 IntRect convertToContainingWidget(const IntRect&) const override; 865 IntRect convertToContainingWidget(const IntRect&) const override;
867 IntRect convertFromContainingWidget(const IntRect&) const override; 866 IntRect convertFromContainingWidget(const IntRect&) const override;
868 IntPoint convertToContainingWidget(const IntPoint&) const override; 867 IntPoint convertToContainingWidget(const IntPoint&) const override;
869 IntPoint convertFromContainingWidget(const IntPoint&) const override; 868 IntPoint convertFromContainingWidget(const IntPoint&) const override;
870 869
870 void didChangeGlobalRootScroller() override;
871
871 void updateWidgetGeometriesIfNeeded(); 872 void updateWidgetGeometriesIfNeeded();
872 873
873 bool wasViewportResized(); 874 bool wasViewportResized();
874 void sendResizeEventIfNeeded(); 875 void sendResizeEventIfNeeded();
875 876
876 void updateParentScrollableAreaSet(); 877 void updateParentScrollableAreaSet();
877 878
878 void scheduleUpdateWidgetsIfNecessary(); 879 void scheduleUpdateWidgetsIfNecessary();
879 void updateWidgetsTimerFired(TimerBase*); 880 void updateWidgetsTimerFired(TimerBase*);
880 bool updateWidgets(); 881 bool updateWidgets();
(...skipping 27 matching lines...) Expand all
908 909
909 void updateScrollCorner(); 910 void updateScrollCorner();
910 911
911 AXObjectCache* axObjectCache() const; 912 AXObjectCache* axObjectCache() const;
912 913
913 void setLayoutSizeInternal(const IntSize&); 914 void setLayoutSizeInternal(const IntSize&);
914 915
915 bool adjustScrollbarExistence(ComputeScrollbarExistenceOption = FirstPass); 916 bool adjustScrollbarExistence(ComputeScrollbarExistenceOption = FirstPass);
916 void adjustScrollbarOpacity(); 917 void adjustScrollbarOpacity();
917 void adjustScrollOffsetFromUpdateScrollbars(); 918 void adjustScrollOffsetFromUpdateScrollbars();
918 bool visualViewportSuppliesScrollbars() const; 919 bool visualViewportSuppliesScrollbars();
skobes 2016/11/15 20:18:43 Why can't this be const anymore?
bokan 2016/11/15 22:04:10 Because of the check: root scroller == layoutViewp
919 920
920 bool isFrameViewScrollbar(const Widget* child) const { 921 bool isFrameViewScrollbar(const Widget* child) const {
921 return horizontalScrollbar() == child || verticalScrollbar() == child; 922 return horizontalScrollbar() == child || verticalScrollbar() == child;
922 } 923 }
923 924
924 ScrollingCoordinator* scrollingCoordinator() const; 925 ScrollingCoordinator* scrollingCoordinator() const;
925 926
926 void prepareLayoutAnalyzer(); 927 void prepareLayoutAnalyzer();
927 std::unique_ptr<TracedValue> analyzerCounters(); 928 std::unique_ptr<TracedValue> analyzerCounters();
928 929
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
1150 widget.isFrameView()); 1151 widget.isFrameView());
1151 DEFINE_TYPE_CASTS(FrameView, 1152 DEFINE_TYPE_CASTS(FrameView,
1152 ScrollableArea, 1153 ScrollableArea,
1153 scrollableArea, 1154 scrollableArea,
1154 scrollableArea->isFrameView(), 1155 scrollableArea->isFrameView(),
1155 scrollableArea.isFrameView()); 1156 scrollableArea.isFrameView());
1156 1157
1157 } // namespace blink 1158 } // namespace blink
1158 1159
1159 #endif // FrameView_h 1160 #endif // FrameView_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698