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

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

Issue 2454913003: MainFrame scrollbars should work with RFV instead of FV (Closed)
Patch Set: add test + rebase 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 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 54d69c5fea50a6e9bcf3baa63f2afe2aa6cc7ef1..56f241c5dc43312fb06916b638b240791c8e7e12 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;
@@ -100,6 +95,31 @@ class CORE_EXPORT RootFrameViewport final
void clearScrollAnimators() override;
LayoutBox* layoutBox() const override;
+ // Scrollbar related
bokan 2016/10/31 15:25:09 I think we should have a separate interface from S
ymalik 2016/11/03 18:49:12 Agreed. Added a TODO for cleanup.
+ 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);
@@ -123,6 +143,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