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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/trees/layer_tree_host_unittest_scroll.cc

Issue 2183403002: cc: Move data to LayerTree from LayerTreeHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@layer_tree_change
Patch Set: .. Created 4 years, 5 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
« cc/trees/layer_tree_host.h ('K') | « cc/trees/layer_tree_host_unittest_picture.cc ('k') | cc/trees/layer_tree_host_unittest_serialization.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_unittest_scroll.cc
diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc
index 340c0f2e1de16b95778c562955a2f46b167c25d6..6f5038bd6fd5923f710e2b9e3b9e62bdf6d2acc5 100644
--- a/cc/trees/layer_tree_host_unittest_scroll.cc
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -88,19 +88,26 @@ class LayerTreeHostScrollTestScrollSimple : public LayerTreeHostScrollTest {
void BeginTest() override {
outer_viewport_container_layer_id_ = layer_tree_host()
+ ->GetLayerTree()
->outer_viewport_scroll_layer()
->scroll_clip_layer()
->id();
- layer_tree_host()->outer_viewport_scroll_layer()->SetScrollOffset(
- initial_scroll_);
- layer_tree_host()->outer_viewport_scroll_layer()->set_did_scroll_callback(
- base::Bind(&LayerTreeHostScrollTestScrollSimple::DidScrollOuterViewport,
- base::Unretained(this)));
+ layer_tree_host()
+ ->GetLayerTree()
+ ->outer_viewport_scroll_layer()
+ ->SetScrollOffset(initial_scroll_);
+ layer_tree_host()
+ ->GetLayerTree()
+ ->outer_viewport_scroll_layer()
+ ->set_did_scroll_callback(base::Bind(
+ &LayerTreeHostScrollTestScrollSimple::DidScrollOuterViewport,
+ base::Unretained(this)));
PostSetNeedsCommitToMainThread();
}
void UpdateLayerTreeHost() override {
- Layer* scroll_layer = layer_tree_host()->outer_viewport_scroll_layer();
+ Layer* scroll_layer =
+ layer_tree_host()->GetLayerTree()->outer_viewport_scroll_layer();
if (!layer_tree_host()->source_frame_number()) {
EXPECT_VECTOR_EQ(initial_scroll_, scroll_layer->scroll_offset());
} else {
@@ -162,7 +169,8 @@ class LayerTreeHostScrollTestScrollMultipleRedraw
: initial_scroll_(40, 10), scroll_amount_(-3, 17), num_scrolls_(0) {}
void BeginTest() override {
- scroll_layer_ = layer_tree_host()->outer_viewport_scroll_layer();
+ scroll_layer_ =
+ layer_tree_host()->GetLayerTree()->outer_viewport_scroll_layer();
scroll_layer_->SetScrollOffset(initial_scroll_);
scroll_layer_->set_did_scroll_callback(base::Bind(
&LayerTreeHostScrollTestScrollMultipleRedraw::DidScrollOuterViewport,
@@ -253,10 +261,14 @@ class LayerTreeHostScrollTestScrollAbortedCommit
num_impl_scrolls_(0) {}
void BeginTest() override {
- layer_tree_host()->outer_viewport_scroll_layer()->SetScrollOffset(
- initial_scroll_);
- layer_tree_host()->outer_viewport_scroll_layer()->set_did_scroll_callback(
- base::Bind(
+ layer_tree_host()
+ ->GetLayerTree()
+ ->outer_viewport_scroll_layer()
+ ->SetScrollOffset(initial_scroll_);
+ layer_tree_host()
+ ->GetLayerTree()
+ ->outer_viewport_scroll_layer()
+ ->set_did_scroll_callback(base::Bind(
&LayerTreeHostScrollTestScrollAbortedCommit::DidScrollOuterViewport,
base::Unretained(this)));
PostSetNeedsCommitToMainThread();
@@ -266,7 +278,7 @@ class LayerTreeHostScrollTestScrollAbortedCommit
LayerTreeHostScrollTest::SetupTree();
gfx::Size scroll_layer_bounds(200, 200);
- layer_tree_host()->outer_viewport_scroll_layer()->SetBounds(
+ layer_tree_host()->GetLayerTree()->outer_viewport_scroll_layer()->SetBounds(
scroll_layer_bounds);
layer_tree_host()->SetPageScaleFactorAndLimits(1.f, 0.01f, 100.f);
}
@@ -274,7 +286,7 @@ class LayerTreeHostScrollTestScrollAbortedCommit
void WillBeginMainFrame() override {
num_will_begin_main_frames_++;
Layer* root_scroll_layer =
- layer_tree_host()->outer_viewport_scroll_layer();
+ layer_tree_host()->GetLayerTree()->outer_viewport_scroll_layer();
switch (num_will_begin_main_frames_) {
case 1:
// This will not be aborted because of the initial prop changes.
@@ -498,12 +510,14 @@ class LayerTreeHostScrollTestScrollSnapping : public LayerTreeHostScrollTest {
void SetupTree() override {
LayerTreeHostScrollTest::SetupTree();
layer_tree_host()
+ ->GetLayerTree()
->outer_viewport_scroll_layer()
->scroll_clip_layer()
->SetForceRenderSurfaceForTesting(true);
gfx::Transform translate;
translate.Translate(0.25f, 0.f);
layer_tree_host()
+ ->GetLayerTree()
->outer_viewport_scroll_layer()
->scroll_clip_layer()
->SetTransform(translate);
@@ -588,7 +602,10 @@ class LayerTreeHostScrollTestCaseWithChild : public LayerTreeHostScrollTest {
}
scoped_refptr<Layer> outer_container_layer =
- layer_tree_host()->outer_viewport_scroll_layer()->parent();
+ layer_tree_host()
+ ->GetLayerTree()
+ ->outer_viewport_scroll_layer()
+ ->parent();
child_layer_->SetIsDrawable(true);
child_layer_->SetScrollClipLayerId(outer_container_layer->id());
@@ -609,8 +626,10 @@ class LayerTreeHostScrollTestCaseWithChild : public LayerTreeHostScrollTest {
LayerTreeTest::SetupTree();
fake_content_layer_client_.set_bounds(root_layer->bounds());
- layer_tree_host()->outer_viewport_scroll_layer()->set_did_scroll_callback(
- base::Bind(
+ layer_tree_host()
+ ->GetLayerTree()
+ ->outer_viewport_scroll_layer()
+ ->set_did_scroll_callback(base::Bind(
&LayerTreeHostScrollTestCaseWithChild::DidScrollOuterViewport,
base::Unretained(this)));
}
@@ -871,16 +890,22 @@ class LayerTreeHostScrollTestSimple : public LayerTreeHostScrollTest {
}
void BeginTest() override {
- layer_tree_host()->outer_viewport_scroll_layer()->SetScrollOffset(
- initial_scroll_);
- layer_tree_host()->outer_viewport_scroll_layer()->set_did_scroll_callback(
- base::Bind(&LayerTreeHostScrollTestSimple::DidScrollOuterViewport,
- base::Unretained(this)));
+ layer_tree_host()
+ ->GetLayerTree()
+ ->outer_viewport_scroll_layer()
+ ->SetScrollOffset(initial_scroll_);
+ layer_tree_host()
+ ->GetLayerTree()
+ ->outer_viewport_scroll_layer()
+ ->set_did_scroll_callback(
+ base::Bind(&LayerTreeHostScrollTestSimple::DidScrollOuterViewport,
+ base::Unretained(this)));
PostSetNeedsCommitToMainThread();
}
void UpdateLayerTreeHost() override {
- Layer* scroll_layer = layer_tree_host()->outer_viewport_scroll_layer();
+ Layer* scroll_layer =
+ layer_tree_host()->GetLayerTree()->outer_viewport_scroll_layer();
if (!layer_tree_host()->source_frame_number()) {
EXPECT_VECTOR_EQ(initial_scroll_, scroll_layer->scroll_offset());
} else {
@@ -993,13 +1018,16 @@ class LayerTreeHostScrollTestImplOnlyScroll : public LayerTreeHostScrollTest {
}
void BeginTest() override {
- layer_tree_host()->outer_viewport_scroll_layer()->SetScrollOffset(
- initial_scroll_);
+ layer_tree_host()
+ ->GetLayerTree()
+ ->outer_viewport_scroll_layer()
+ ->SetScrollOffset(initial_scroll_);
PostSetNeedsCommitToMainThread();
}
void WillCommit() override {
- Layer* scroll_layer = layer_tree_host()->outer_viewport_scroll_layer();
+ Layer* scroll_layer =
+ layer_tree_host()->GetLayerTree()->outer_viewport_scroll_layer();
switch (layer_tree_host()->source_frame_number()) {
case 0:
EXPECT_TRUE(
@@ -1130,6 +1158,7 @@ class LayerTreeHostScrollTestScrollZeroMaxScrollOffset
void BeginTest() override {
outer_viewport_container_layer_id_ = layer_tree_host()
+ ->GetLayerTree()
->outer_viewport_scroll_layer()
->scroll_clip_layer()
->id();
@@ -1138,7 +1167,8 @@ class LayerTreeHostScrollTestScrollZeroMaxScrollOffset
void UpdateLayerTreeHost() override {
Layer* root = layer_tree_host()->root_layer();
- Layer* scroll_layer = layer_tree_host()->outer_viewport_scroll_layer();
+ Layer* scroll_layer =
+ layer_tree_host()->GetLayerTree()->outer_viewport_scroll_layer();
switch (layer_tree_host()->source_frame_number()) {
case 0:
scroll_layer->SetScrollClipLayerId(outer_viewport_container_layer_id_);
@@ -1207,10 +1237,16 @@ class LayerTreeHostScrollTestScrollNonDrawnLayer
void SetupTree() override {
LayerTreeHostScrollTest::SetupTree();
- layer_tree_host()->outer_viewport_scroll_layer()->SetIsDrawable(false);
- layer_tree_host()->outer_viewport_scroll_layer()->SetScrollOffset(
- gfx::ScrollOffset(20.f, 20.f));
layer_tree_host()
+ ->GetLayerTree()
+ ->outer_viewport_scroll_layer()
+ ->SetIsDrawable(false);
+ layer_tree_host()
+ ->GetLayerTree()
+ ->outer_viewport_scroll_layer()
+ ->SetScrollOffset(gfx::ScrollOffset(20.f, 20.f));
+ layer_tree_host()
+ ->GetLayerTree()
->outer_viewport_scroll_layer()
->SetNonFastScrollableRegion(gfx::Rect(20, 20, 20, 20));
}
@@ -1258,6 +1294,7 @@ class LayerTreeHostScrollTestImplScrollUnderMainThreadScrollingParent
void SetupTree() override {
LayerTreeHostScrollTest::SetupTree();
layer_tree_host()
+ ->GetLayerTree()
->inner_viewport_scroll_layer()
->AddMainThreadScrollingReasons(
MainThreadScrollingReason::kEventHandlers);
@@ -1399,7 +1436,7 @@ class LayerTreeHostScrollTestLayerStructureChange
layer_tree_host());
Layer* outer_scroll_layer =
- layer_tree_host()->outer_viewport_scroll_layer();
+ layer_tree_host()->GetLayerTree()->outer_viewport_scroll_layer();
Layer* root_scroll_layer =
CreateScrollLayer(outer_scroll_layer, &root_scroll_layer_client_);
@@ -1439,7 +1476,8 @@ class LayerTreeHostScrollTestLayerStructureChange
virtual void DidScroll(Layer* layer) {
if (scroll_destroy_whole_tree_) {
- layer_tree_host()->RegisterViewportLayers(NULL, NULL, NULL, NULL);
+ layer_tree_host()->GetLayerTree()->RegisterViewportLayers(NULL, NULL,
+ NULL, NULL);
layer_tree_host()->SetRootLayer(NULL);
EndTest();
return;
@@ -1521,14 +1559,20 @@ class LayerTreeHostScrollTestScrollMFBA : public LayerTreeHostScrollTest {
void BeginTest() override {
outer_viewport_container_layer_id_ = layer_tree_host()
+ ->GetLayerTree()
->outer_viewport_scroll_layer()
->scroll_clip_layer()
->id();
- layer_tree_host()->outer_viewport_scroll_layer()->SetScrollOffset(
- initial_scroll_);
- layer_tree_host()->outer_viewport_scroll_layer()->set_did_scroll_callback(
- base::Bind(&LayerTreeHostScrollTestScrollMFBA::DidScrollOuterViewport,
- base::Unretained(this)));
+ layer_tree_host()
+ ->GetLayerTree()
+ ->outer_viewport_scroll_layer()
+ ->SetScrollOffset(initial_scroll_);
+ layer_tree_host()
+ ->GetLayerTree()
+ ->outer_viewport_scroll_layer()
+ ->set_did_scroll_callback(base::Bind(
+ &LayerTreeHostScrollTestScrollMFBA::DidScrollOuterViewport,
+ base::Unretained(this)));
PostSetNeedsCommitToMainThread();
}
@@ -1549,7 +1593,8 @@ class LayerTreeHostScrollTestScrollMFBA : public LayerTreeHostScrollTest {
}
void UpdateLayerTreeHost() override {
- Layer* scroll_layer = layer_tree_host()->outer_viewport_scroll_layer();
+ Layer* scroll_layer =
+ layer_tree_host()->GetLayerTree()->outer_viewport_scroll_layer();
switch (layer_tree_host()->source_frame_number()) {
case 0:
EXPECT_VECTOR_EQ(initial_scroll_, scroll_layer->scroll_offset());
@@ -1653,12 +1698,17 @@ class LayerTreeHostScrollTestScrollAbortedCommitMFBA
}
void BeginTest() override {
- layer_tree_host()->outer_viewport_scroll_layer()->SetScrollOffset(
- initial_scroll_);
- layer_tree_host()->outer_viewport_scroll_layer()->set_did_scroll_callback(
- base::Bind(&LayerTreeHostScrollTestScrollAbortedCommitMFBA::
- DidScrollOuterViewport,
- base::Unretained(this)));
+ layer_tree_host()
+ ->GetLayerTree()
+ ->outer_viewport_scroll_layer()
+ ->SetScrollOffset(initial_scroll_);
+ layer_tree_host()
+ ->GetLayerTree()
+ ->outer_viewport_scroll_layer()
+ ->set_did_scroll_callback(
+ base::Bind(&LayerTreeHostScrollTestScrollAbortedCommitMFBA::
+ DidScrollOuterViewport,
+ base::Unretained(this)));
PostSetNeedsCommitToMainThread();
}
@@ -1666,14 +1716,15 @@ class LayerTreeHostScrollTestScrollAbortedCommitMFBA
LayerTreeHostScrollTest::SetupTree();
gfx::Size scroll_layer_bounds(200, 200);
- layer_tree_host()->outer_viewport_scroll_layer()->SetBounds(
+ layer_tree_host()->GetLayerTree()->outer_viewport_scroll_layer()->SetBounds(
scroll_layer_bounds);
layer_tree_host()->SetPageScaleFactorAndLimits(1.f, 0.01f, 100.f);
}
void WillBeginMainFrame() override {
num_will_begin_main_frames_++;
- Layer* root_scroll_layer = layer_tree_host()->outer_viewport_scroll_layer();
+ Layer* root_scroll_layer =
+ layer_tree_host()->GetLayerTree()->outer_viewport_scroll_layer();
switch (num_will_begin_main_frames_) {
case 1:
// This will not be aborted because of the initial prop changes.
« cc/trees/layer_tree_host.h ('K') | « cc/trees/layer_tree_host_unittest_picture.cc ('k') | cc/trees/layer_tree_host_unittest_serialization.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698