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

Unified Diff: third_party/WebKit/Source/core/frame/RootFrameViewport.h

Issue 2454913003: MainFrame scrollbars should work with RFV instead of FV (Closed)
Patch Set: Fix VisualViewportTest 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/frame/RootFrameViewport.h
diff --git a/third_party/WebKit/Source/core/frame/RootFrameViewport.h b/third_party/WebKit/Source/core/frame/RootFrameViewport.h
index ee0587ad976f6735c067ab6b8466356570c95841..bb07cf53c610bc834c65a61f3b936b2f44c666a6 100644
--- a/third_party/WebKit/Source/core/frame/RootFrameViewport.h
+++ b/third_party/WebKit/Source/core/frame/RootFrameViewport.h
@@ -64,11 +64,6 @@ class CORE_EXPORT RootFrameViewport final
IntRect visibleContentRect(
IncludeScrollbarsInRect = ExcludeScrollbars) const override;
bool shouldUseIntegerScrollOffset() const override;
- LayoutRect visualRectForScrollbarParts() const override {
- ASSERT_NOT_REACHED();
- return LayoutRect();
- }
- bool isActive() const override;
int scrollSize(ScrollbarOrientation) const override;
bool isScrollCornerVisible() const override;
IntRect scrollCornerRect() const override;
@@ -107,6 +102,35 @@ class CORE_EXPORT RootFrameViewport final
const LayoutObject*,
unsigned = 0) const final;
+ // Scrollbar related
+ // TODO(crbug.com/661236): Seperate the scrollbar related logic from
+ // ScrollableArea.
+ Scrollbar* horizontalScrollbar() const override;
+ Scrollbar* verticalScrollbar() const override;
+ bool isActive() const override;
+ bool hasOverlayScrollbars() const override;
+ void setScrollbarNeedsPaintInvalidation(ScrollbarOrientation) override;
+ LayoutRect visualRectForScrollbarParts() const override;
+ ScrollbarOverlayColorTheme getScrollbarOverlayColorTheme() const override;
+ void getTickmarks(Vector<IntRect>& rects) const override;
+ void mouseEnteredScrollbar(Scrollbar&) const override;
+ void mouseExitedScrollbar(Scrollbar&) const override;
+ void scrollbarVisibilityChanged() override;
+ IntRect convertFromScrollbarToContainingWidget(const Scrollbar&,
+ const IntRect&) const override;
+ IntRect convertFromContainingWidgetToScrollbar(const Scrollbar&,
+ const IntRect&) const override;
+ IntPoint convertFromScrollbarToContainingWidget(
+ const Scrollbar&,
+ const IntPoint&) const override;
+ IntPoint convertFromContainingWidgetToScrollbar(
+ const Scrollbar&,
+ const IntPoint&) const override;
+ ScrollOffset scrollAnimatorDesiredTargetOffset() const override;
+ void setScrollCornerNeedsPaintInvalidation() override;
+
+ void setTickmarks(const Vector<IntRect>&);
+
private:
RootFrameViewport(ScrollableArea& visualViewport,
ScrollableArea& layoutViewport);
@@ -130,6 +154,8 @@ class CORE_EXPORT RootFrameViewport final
return *m_visualViewport;
}
+ Vector<IntRect> m_tickmarks;
+
Member<ScrollableArea> m_visualViewport;
Member<ScrollableArea> m_layoutViewport;
};

Powered by Google App Engine
This is Rietveld 408576698