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

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

Issue 1158673006: Replace various ScrollableArea scroll methods with setScrollPosition (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Build fix Created 5 years, 6 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
« no previous file with comments | « Source/core/frame/PinchViewport.cpp ('k') | Source/core/frame/RootFrameViewport.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/RootFrameViewport.h
diff --git a/Source/core/frame/RootFrameViewport.h b/Source/core/frame/RootFrameViewport.h
index ea7501e57516c35d1a1e2d793388d4b36e98a671..afa481d7f3849147fb07d1db23642f20c0dba534 100644
--- a/Source/core/frame/RootFrameViewport.h
+++ b/Source/core/frame/RootFrameViewport.h
@@ -29,7 +29,7 @@ public:
}
// ScrollableArea Implementation
- void setScrollPosition(const DoublePoint&, ScrollBehavior = ScrollBehaviorInstant) override;
+ void setScrollPosition(const DoublePoint&, ScrollType, ScrollBehavior = ScrollBehaviorInstant) override;
LayoutRect scrollIntoView(
const LayoutRect& rectInContent,
const ScrollAlignment& alignX,
@@ -41,8 +41,8 @@ public:
int scrollSize(ScrollbarOrientation) const override;
bool isScrollCornerVisible() const override;
IntRect scrollCornerRect() const override;
- void setScrollOffset(const IntPoint&) override;
- void setScrollOffset(const DoublePoint&) override;
+ void setScrollOffset(const IntPoint&, ScrollType) override;
+ void setScrollOffset(const DoublePoint&, ScrollType) override;
IntPoint scrollPosition() const override;
DoublePoint scrollPositionDouble() const override;
IntPoint minimumScrollPosition() const override;
@@ -64,6 +64,7 @@ public:
HostWindow* hostWindow() const override;
void serviceScrollAnimations(double) override;
void updateCompositorScrollAnimations() override;
+ virtual ScrollBehavior scrollBehaviorStyle() const override;
// TODO(bokan): This method should be removed. It should be replaced by
// making EventHandler::handleWheelEvent unpack the WheelEvent and make a
// call to this class' scroll method.
« no previous file with comments | « Source/core/frame/PinchViewport.cpp ('k') | Source/core/frame/RootFrameViewport.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698