cc/layers/layer_impl.cc - Issue 1063853005: Unify Android Webview and Chrome's fling

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/layers/layer_impl.cc

Issue 1063853005: Unify Android Webview and Chrome's fling (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master

Patch Set: Jared's comments Created 5 years, 7 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/layers/layer_impl.cc

diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc

index 0f92266856ede2ca1f32d04182120ca0fafbe86a..532a89da3939955ed023a912f003031e4d82e258 100644

--- a/cc/layers/layer_impl.cc

+++ b/cc/layers/layer_impl.cc

@@ -1131,8 +1131,8 @@ void LayerImpl::SetContentsScale(float contents_scale_x,

NoteLayerPropertyChanged();

}

-bool LayerImpl::IsExternalFlingActive() const {

- return layer_tree_impl_->IsExternalFlingActive();

+bool LayerImpl::IsExternalScrollActive() const {

+ return layer_tree_impl_->IsExternalScrollActive();

}

void LayerImpl::SetCurrentScrollOffset(const gfx::ScrollOffset& scroll_offset) {