cc/trees/layer_tree_host_impl_unittest.cc - Issue 1736073002: cc: Move SyncedScrollOffset to scroll tree

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/trees/layer_tree_host_impl_unittest.cc

Issue 1736073002: cc: Move SyncedScrollOffset to scroll tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resolve comments Created 4 years, 10 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/trees/layer_tree_host_impl_unittest.cc

diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc

index 32e461186d8abe9673795556b86ac7c6d0ee9ba9..54e5d3e8806421f762353b2d525c09c029050219 100644

--- a/cc/trees/layer_tree_host_impl_unittest.cc

+++ b/cc/trees/layer_tree_host_impl_unittest.cc

@@ -2033,7 +2033,7 @@ TEST_F(LayerTreeHostImplTest, PinchGesture) {

host_impl_->active_tree()->PushPageScaleFromMainThread(1.f, min_page_scale,

max_page_scale);

scroll_layer->SetScrollDelta(gfx::Vector2d());

- scroll_layer->PullDeltaForMainThread();

+ scroll_layer->synced_scroll_offset()->PullDeltaForMainThread();

scroll_layer->PushScrollOffsetFromMainThread(gfx::ScrollOffset(50, 50));

float page_scale_delta = 0.1f;

@@ -2056,7 +2056,7 @@ TEST_F(LayerTreeHostImplTest, PinchGesture) {

host_impl_->active_tree()->PushPageScaleFromMainThread(1.f, min_page_scale,

max_page_scale);

scroll_layer->SetScrollDelta(gfx::Vector2d());

- scroll_layer->PullDeltaForMainThread();

+ scroll_layer->synced_scroll_offset()->PullDeltaForMainThread();

scroll_layer->PushScrollOffsetFromMainThread(gfx::ScrollOffset(20, 20));

float page_scale_delta = 1.f;

@@ -2079,7 +2079,7 @@ TEST_F(LayerTreeHostImplTest, PinchGesture) {

host_impl_->active_tree()->PushPageScaleFromMainThread(1.f, min_page_scale,

max_page_scale);

scroll_layer->SetScrollDelta(gfx::Vector2d());

- scroll_layer->PullDeltaForMainThread();

+ scroll_layer->synced_scroll_offset()->PullDeltaForMainThread();

scroll_layer->PushScrollOffsetFromMainThread(gfx::ScrollOffset(20, 20));

float page_scale_delta = 1.f;

@@ -2104,7 +2104,7 @@ TEST_F(LayerTreeHostImplTest, PinchGesture) {

{

host_impl_->active_tree()->PushPageScaleFromMainThread(0.5f, 0.5f, 4.f);

scroll_layer->SetScrollDelta(gfx::Vector2d());

- scroll_layer->PullDeltaForMainThread();

+ scroll_layer->synced_scroll_offset()->PullDeltaForMainThread();

scroll_layer->PushScrollOffsetFromMainThread(gfx::ScrollOffset(0, 0));

host_impl_->ScrollBegin(BeginState(gfx::Point(0, 0)).get(),