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

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

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 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 3b20c40d3703eaf48b1414b6369baa10140f4512..5ea5d10b47f16ec88aaad267a38664af61130ce0 100644
--- a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
@@ -984,7 +984,7 @@ double LocalDOMWindow::scrollX() const
frame()->document()->updateLayoutIgnorePendingStylesheets();
- ScrollableArea* viewport = host->settings().inertVisualViewport() ? view->layoutViewportScrollableArea() : view->scrollableArea();
+ ScrollableArea* viewport = host->settings().inertVisualViewport() ? view->layoutViewportScrollableArea() : view->getScrollableArea();
double viewportX = viewport->scrollPositionDouble().x();
return adjustScrollForAbsoluteZoom(viewportX, frame()->pageZoomFactor());
}
@@ -1004,7 +1004,7 @@ double LocalDOMWindow::scrollY() const
frame()->document()->updateLayoutIgnorePendingStylesheets();
- ScrollableArea* viewport = host->settings().inertVisualViewport() ? view->layoutViewportScrollableArea() : view->scrollableArea();
+ ScrollableArea* viewport = host->settings().inertVisualViewport() ? view->layoutViewportScrollableArea() : view->getScrollableArea();
double viewportY = viewport->scrollPositionDouble().y();
return adjustScrollForAbsoluteZoom(viewportY, frame()->pageZoomFactor());
}
@@ -1120,7 +1120,7 @@ void LocalDOMWindow::scrollBy(double x, double y, ScrollBehavior scrollBehavior)
x = ScrollableArea::normalizeNonFiniteScroll(x);
y = ScrollableArea::normalizeNonFiniteScroll(y);
- ScrollableArea* viewport = host->settings().inertVisualViewport() ? view->layoutViewportScrollableArea() : view->scrollableArea();
+ ScrollableArea* viewport = host->settings().inertVisualViewport() ? view->layoutViewportScrollableArea() : view->getScrollableArea();
DoublePoint currentOffset = viewport->scrollPositionDouble();
DoubleSize scaledDelta(x * frame()->pageZoomFactor(), y * frame()->pageZoomFactor());
@@ -1163,7 +1163,7 @@ void LocalDOMWindow::scrollTo(double x, double y) const
document()->updateLayoutIgnorePendingStylesheets();
DoublePoint layoutPos(x * frame()->pageZoomFactor(), y * frame()->pageZoomFactor());
- ScrollableArea* viewport = host->settings().inertVisualViewport() ? view->layoutViewportScrollableArea() : view->scrollableArea();
+ ScrollableArea* viewport = host->settings().inertVisualViewport() ? view->layoutViewportScrollableArea() : view->getScrollableArea();
viewport->setScrollPosition(layoutPos, ProgrammaticScroll, ScrollBehaviorAuto);
}
@@ -1192,7 +1192,7 @@ void LocalDOMWindow::scrollTo(const ScrollToOptions& scrollToOptions) const
double scaledX = 0.0;
double scaledY = 0.0;
- ScrollableArea* viewport = host->settings().inertVisualViewport() ? view->layoutViewportScrollableArea() : view->scrollableArea();
+ ScrollableArea* viewport = host->settings().inertVisualViewport() ? view->layoutViewportScrollableArea() : view->getScrollableArea();
DoublePoint currentOffset = viewport->scrollPositionDouble();
scaledX = currentOffset.x();
« no previous file with comments | « third_party/WebKit/Source/core/frame/ImageBitmapTest.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