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

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

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.cpp
diff --git a/third_party/WebKit/Source/core/frame/RootFrameViewport.cpp b/third_party/WebKit/Source/core/frame/RootFrameViewport.cpp
index f7bce5958ef484b82715c7b7fc5081288f96a26a..e3b1d42578fb339e27fc472f10da2200bcfe75c9 100644
--- a/third_party/WebKit/Source/core/frame/RootFrameViewport.cpp
+++ b/third_party/WebKit/Source/core/frame/RootFrameViewport.cpp
@@ -177,6 +177,84 @@ ScrollBehavior RootFrameViewport::scrollBehaviorStyle() const {
return layoutViewport().scrollBehaviorStyle();
}
+bool RootFrameViewport::hasOverlayScrollbars() const {
+ return layoutViewport().hasOverlayScrollbars();
+}
+
+void RootFrameViewport::setScrollbarNeedsPaintInvalidation(
+ ScrollbarOrientation orientation) {
+ return layoutViewport().setScrollbarNeedsPaintInvalidation(orientation);
+}
+
+LayoutRect RootFrameViewport::visualRectForScrollbarParts() const {
+ return layoutViewport().visualRectForScrollbarParts();
+}
+
+ScrollbarOverlayColorTheme RootFrameViewport::getScrollbarOverlayColorTheme()
+ const {
+ return layoutViewport().getScrollbarOverlayColorTheme();
+}
+
+void RootFrameViewport::setTickmarks(const Vector<IntRect>& tickmarks) {
+ m_tickmarks = tickmarks;
+}
+
+void RootFrameViewport::getTickmarks(Vector<IntRect>& tickmarks) const {
+ if (!m_tickmarks.isEmpty())
+ tickmarks = m_tickmarks;
+ else
+ layoutViewport().getTickmarks(tickmarks);
+}
+
+void RootFrameViewport::mouseEnteredScrollbar(Scrollbar& scrollbar) const {
+ layoutViewport().mouseEnteredScrollbar(scrollbar);
+}
+
+void RootFrameViewport::mouseExitedScrollbar(Scrollbar& scrollbar) const {
+ layoutViewport().mouseExitedScrollbar(scrollbar);
+}
+
+void RootFrameViewport::scrollbarVisibilityChanged() {
+ layoutViewport().scrollbarVisibilityChanged();
+}
+
+IntRect RootFrameViewport::convertFromScrollbarToContainingWidget(
+ const Scrollbar& scrollbar,
+ const IntRect& localRect) const {
+ return layoutViewport().convertFromScrollbarToContainingWidget(scrollbar,
+ localRect);
+}
+
+IntRect RootFrameViewport::convertFromContainingWidgetToScrollbar(
+ const Scrollbar& scrollbar,
+ const IntRect& parentRect) const {
+ return layoutViewport().convertFromContainingWidgetToScrollbar(scrollbar,
+ parentRect);
+}
+
+IntPoint RootFrameViewport::convertFromScrollbarToContainingWidget(
+ const Scrollbar& scrollbar,
+ const IntPoint& localPoint) const {
+ return layoutViewport().convertFromScrollbarToContainingWidget(scrollbar,
+ localPoint);
+}
+
+IntPoint RootFrameViewport::convertFromContainingWidgetToScrollbar(
+ const Scrollbar& scrollbar,
+ const IntPoint& parentPoint) const {
+ return layoutViewport().convertFromContainingWidgetToScrollbar(scrollbar,
+ parentPoint);
+}
+
+ScrollOffset RootFrameViewport::scrollAnimatorDesiredTargetOffset() const {
+ return layoutViewport().scrollAnimatorDesiredTargetOffset() +
+ visualViewport().scrollAnimatorDesiredTargetOffset();
+}
+
+void RootFrameViewport::setScrollCornerNeedsPaintInvalidation() {
+ return layoutViewport().setScrollCornerNeedsPaintInvalidation();
+}
+
LayoutRect RootFrameViewport::scrollIntoView(const LayoutRect& rectInContent,
const ScrollAlignment& alignX,
const ScrollAlignment& alignY,

Powered by Google App Engine
This is Rietveld 408576698