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

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

Issue 2387883002: Use float for scroll offset. (Closed)
Patch Set: Fix README.md 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/LocalDOMWindow.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
index 731e27625eb36596e3c9713d0cf39b7b313599f6..bc0c6fccbfdae428e580591c2cb613fd7549a6c5 100644
--- a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
@@ -976,7 +976,7 @@ double LocalDOMWindow::scrollX() const {
document()->updateStyleAndLayoutIgnorePendingStylesheets();
double viewportX =
- view->layoutViewportScrollableArea()->scrollPositionDouble().x();
+ view->layoutViewportScrollableArea()->scrollOffset().width();
return adjustScrollForAbsoluteZoom(viewportX, frame()->pageZoomFactor());
}
@@ -994,7 +994,7 @@ double LocalDOMWindow::scrollY() const {
document()->updateStyleAndLayoutIgnorePendingStylesheets();
double viewportY =
- view->layoutViewportScrollableArea()->scrollPositionDouble().y();
+ view->layoutViewportScrollableArea()->scrollOffset().height();
return adjustScrollForAbsoluteZoom(viewportY, frame()->pageZoomFactor());
}
@@ -1120,12 +1120,12 @@ void LocalDOMWindow::scrollBy(double x,
? view->layoutViewportScrollableArea()
: view->getScrollableArea();
- DoublePoint currentOffset = viewport->scrollPositionDouble();
- DoubleSize scaledDelta(x * frame()->pageZoomFactor(),
- y * frame()->pageZoomFactor());
+ ScrollOffset currentOffset = viewport->scrollOffset();
+ ScrollOffset scaledDelta(x * frame()->pageZoomFactor(),
+ y * frame()->pageZoomFactor());
- viewport->setScrollPosition(currentOffset + scaledDelta, ProgrammaticScroll,
- scrollBehavior);
+ viewport->setScrollOffset(currentOffset + scaledDelta, ProgrammaticScroll,
+ scrollBehavior);
}
void LocalDOMWindow::scrollBy(const ScrollToOptions& scrollToOptions) const {
@@ -1161,13 +1161,13 @@ void LocalDOMWindow::scrollTo(double x, double y) const {
if (x || y)
document()->updateStyleAndLayoutIgnorePendingStylesheets();
- DoublePoint layoutPos(x * frame()->pageZoomFactor(),
- y * frame()->pageZoomFactor());
+ ScrollOffset layoutOffset(x * frame()->pageZoomFactor(),
+ y * frame()->pageZoomFactor());
ScrollableArea* viewport = host->settings().inertVisualViewport()
? view->layoutViewportScrollableArea()
: view->getScrollableArea();
- viewport->setScrollPosition(layoutPos, ProgrammaticScroll,
- ScrollBehaviorAuto);
+ viewport->setScrollOffset(layoutOffset, ProgrammaticScroll,
+ ScrollBehaviorAuto);
}
void LocalDOMWindow::scrollTo(const ScrollToOptions& scrollToOptions) const {
@@ -1196,9 +1196,9 @@ void LocalDOMWindow::scrollTo(const ScrollToOptions& scrollToOptions) const {
? view->layoutViewportScrollableArea()
: view->getScrollableArea();
- DoublePoint currentOffset = viewport->scrollPositionDouble();
- scaledX = currentOffset.x();
- scaledY = currentOffset.y();
+ ScrollOffset currentOffset = viewport->scrollOffset();
+ scaledX = currentOffset.width();
+ scaledY = currentOffset.height();
if (scrollToOptions.hasLeft())
scaledX = ScrollableArea::normalizeNonFiniteScroll(scrollToOptions.left()) *
@@ -1212,8 +1212,8 @@ void LocalDOMWindow::scrollTo(const ScrollToOptions& scrollToOptions) const {
ScrollableArea::scrollBehaviorFromString(scrollToOptions.behavior(),
scrollBehavior);
- viewport->setScrollPosition(DoublePoint(scaledX, scaledY), ProgrammaticScroll,
- scrollBehavior);
+ viewport->setScrollOffset(ScrollOffset(scaledX, scaledY), ProgrammaticScroll,
+ scrollBehavior);
}
void LocalDOMWindow::moveBy(int x, int y) const {
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameViewTest.cpp ('k') | third_party/WebKit/Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698