third_party/WebKit/Source/web/WebViewImpl.cpp - Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/web/WebViewImpl.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

« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | third_party/WebKit/Source/web/WebViewImplPaintArtifactCompositorTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/WebViewImpl.cpp

diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp

index 99081bb388551d3adc08974e9f66e3ec94bb0087..6e4f66214a0ab35397835f667f938b626b76f329 100644

--- a/third_party/WebKit/Source/web/WebViewImpl.cpp

+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp

@@ -964,8 +964,8 @@ bool WebViewImpl::startPageScaleAnimation(const IntPoint& targetPosition, bool u

setPageScaleFactor(newScale);

FrameView* view = mainFrameImpl()->frameView();

- if (view && view->scrollableArea())

- view->scrollableArea()->setScrollPosition(DoublePoint(clampedPoint.x, clampedPoint.y), ProgrammaticScroll);

+ if (view && view->getScrollableArea())

+ view->getScrollableArea()->setScrollPosition(DoublePoint(clampedPoint.x, clampedPoint.y), ProgrammaticScroll);

return false;

}

@@ -4553,7 +4553,7 @@ void WebViewImpl::attachPaintArtifactCompositor()

// TODO(jbroman): This should probably have hookups for overlays, visual

// viewport, etc.

- WebLayer* rootLayer = m_paintArtifactCompositor.webLayer();

+ WebLayer* rootLayer = m_paintArtifactCompositor.getWebLayer();

ASSERT(rootLayer);

m_layerTreeView->setRootLayer(*rootLayer);