cc/CCLayerTreeHost.cpp - Issue 10907075: Roll cc snapshot up to 127605

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: cc/CCLayerTreeHost.cpp

Issue 10907075: Roll cc snapshot up to 127605 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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:

Index: cc/CCLayerTreeHost.cpp

diff --git a/cc/CCLayerTreeHost.cpp b/cc/CCLayerTreeHost.cpp

index f2369632ddfb3b09a1daef96a9ab1a5afc3fd445..e126f15e6bf97f0535a94fd7b4220fa447126b91 100644

--- a/cc/CCLayerTreeHost.cpp

+++ b/cc/CCLayerTreeHost.cpp

@@ -638,7 +638,7 @@ void CCLayerTreeHost::applyScrollAndScale(const CCScrollAndScaleSet& info)

if (layer == rootScrollLayer)

rootScrollDelta += info.scrolls[i].scrollDelta;

else

- layer->scrollBy(info.scrolls[i].scrollDelta);

+ layer->setScrollPosition(layer->scrollPosition() + info.scrolls[i].scrollDelta);

}

if (!rootScrollDelta.isZero() || info.pageScaleDelta != 1)

m_client->applyScrollAndScale(rootScrollDelta, info.pageScaleDelta);

« no previous file with comments | « cc/CCFrameRateController.cpp ('k') | cc/CCLayerTreeHostImpl.h » ('j') | no next file with comments »