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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/trees/layer_tree_host_unittest_scroll.cc

Issue 2317753002: cc: Abstract the LayerTreeHost. (Closed)
Patch Set: Rebase Created 4 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_host_unittest_remote_server.cc ('k') | cc/trees/property_tree_builder.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 63440d561d428a32f04e78f4355e6a8fcd305b66..4c748b67477038928ecb6e69d57f46430f07b651 100644
--- a/cc/trees/layer_tree_host_unittest_scroll.cc
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -103,7 +103,7 @@ class LayerTreeHostScrollTestScrollSimple : public LayerTreeHostScrollTest {
void UpdateLayerTreeHost() override {
Layer* scroll_layer = layer_tree()->outer_viewport_scroll_layer();
- if (!layer_tree_host()->source_frame_number()) {
+ if (!layer_tree_host()->SourceFrameNumber()) {
EXPECT_VECTOR_EQ(initial_scroll_, scroll_layer->scroll_offset());
} else {
EXPECT_VECTOR_EQ(gfx::ScrollOffsetWithDelta(initial_scroll_,
@@ -173,7 +173,7 @@ class LayerTreeHostScrollTestScrollMultipleRedraw
}
void BeginCommitOnThread(LayerTreeHostImpl* impl) override {
- switch (layer_tree_host()->source_frame_number()) {
+ switch (layer_tree_host()->SourceFrameNumber()) {
case 0:
EXPECT_VECTOR_EQ(initial_scroll_, scroll_layer_->scroll_offset());
break;
@@ -279,7 +279,7 @@ class LayerTreeHostScrollTestScrollAbortedCommit
case 1:
// This will not be aborted because of the initial prop changes.
EXPECT_EQ(0, num_impl_scrolls_);
- EXPECT_EQ(0, layer_tree_host()->source_frame_number());
+ EXPECT_EQ(0, layer_tree_host()->SourceFrameNumber());
EXPECT_VECTOR_EQ(initial_scroll_, root_scroll_layer->scroll_offset());
EXPECT_EQ(1.f, layer_tree()->page_scale_factor());
break;
@@ -287,7 +287,7 @@ class LayerTreeHostScrollTestScrollAbortedCommit
// This commit will be aborted, and another commit will be
// initiated from the redraw.
EXPECT_EQ(1, num_impl_scrolls_);
- EXPECT_EQ(1, layer_tree_host()->source_frame_number());
+ EXPECT_EQ(1, layer_tree_host()->SourceFrameNumber());
EXPECT_VECTOR_EQ(
gfx::ScrollOffsetWithDelta(initial_scroll_, impl_scroll_),
root_scroll_layer->scroll_offset());
@@ -298,7 +298,7 @@ class LayerTreeHostScrollTestScrollAbortedCommit
// This commit will not be aborted because of the scroll change.
EXPECT_EQ(2, num_impl_scrolls_);
// The source frame number still increases even with the abort.
- EXPECT_EQ(2, layer_tree_host()->source_frame_number());
+ EXPECT_EQ(2, layer_tree_host()->SourceFrameNumber());
EXPECT_VECTOR_EQ(
gfx::ScrollOffsetWithDelta(initial_scroll_,
impl_scroll_ + impl_scroll_),
@@ -310,7 +310,7 @@ class LayerTreeHostScrollTestScrollAbortedCommit
case 4:
// This commit will also be aborted.
EXPECT_EQ(3, num_impl_scrolls_);
- EXPECT_EQ(3, layer_tree_host()->source_frame_number());
+ EXPECT_EQ(3, layer_tree_host()->SourceFrameNumber());
gfx::Vector2dF delta =
impl_scroll_ + impl_scroll_ + impl_scroll_ + second_main_scroll_;
EXPECT_VECTOR_EQ(gfx::ScrollOffsetWithDelta(initial_scroll_, delta),
@@ -619,7 +619,7 @@ class LayerTreeHostScrollTestCaseWithChild : public LayerTreeHostScrollTest {
void WillCommit() override {
// Keep the test committing (otherwise the early out for no update
// will stall the test).
- if (layer_tree_host()->source_frame_number() < 2) {
+ if (layer_tree_host()->SourceFrameNumber() < 2) {
layer_tree_host()->SetNeedsCommit();
}
}
@@ -634,7 +634,7 @@ class LayerTreeHostScrollTestCaseWithChild : public LayerTreeHostScrollTest {
EXPECT_VECTOR_EQ(gfx::Vector2d(),
expected_no_scroll_layer_->scroll_offset());
- switch (layer_tree_host()->source_frame_number()) {
+ switch (layer_tree_host()->SourceFrameNumber()) {
case 0:
EXPECT_VECTOR_EQ(initial_offset_,
expected_scroll_layer_->scroll_offset());
@@ -836,7 +836,7 @@ class LayerTreeHostScrollTestSimple : public LayerTreeHostScrollTest {
void UpdateLayerTreeHost() override {
Layer* scroll_layer = layer_tree()->outer_viewport_scroll_layer();
- if (!layer_tree_host()->source_frame_number()) {
+ if (!layer_tree_host()->SourceFrameNumber()) {
EXPECT_VECTOR_EQ(initial_scroll_, scroll_layer->scroll_offset());
} else {
EXPECT_VECTOR_EQ(
@@ -955,7 +955,7 @@ class LayerTreeHostScrollTestImplOnlyScroll : public LayerTreeHostScrollTest {
void WillCommit() override {
Layer* scroll_layer = layer_tree()->outer_viewport_scroll_layer();
- switch (layer_tree_host()->source_frame_number()) {
+ switch (layer_tree_host()->SourceFrameNumber()) {
case 0:
EXPECT_TRUE(
scroll_layer->GetLayerTree()->LayerNeedsPushPropertiesForTesting(
@@ -1092,7 +1092,7 @@ class LayerTreeHostScrollTestScrollZeroMaxScrollOffset
void UpdateLayerTreeHost() override {
Layer* root = layer_tree()->root_layer();
Layer* scroll_layer = layer_tree()->outer_viewport_scroll_layer();
- switch (layer_tree_host()->source_frame_number()) {
+ switch (layer_tree_host()->SourceFrameNumber()) {
case 0:
scroll_layer->SetScrollClipLayerId(outer_viewport_container_layer_id_);
// Set max_scroll_offset = (100, 100).
@@ -1317,7 +1317,7 @@ TEST(LayerTreeHostFlingTest, DidStopFlingingThread) {
params.settings = &settings;
params.main_task_runner = base::ThreadTaskRunnerHandle::Get();
params.animation_host = AnimationHost::CreateForTesting(ThreadInstance::MAIN);
- std::unique_ptr<LayerTreeHost> layer_tree_host =
+ std::unique_ptr<LayerTreeHostInterface> layer_tree_host =
LayerTreeHost::CreateThreaded(impl_thread.task_runner(), &params);
ThreadCheckingInputHandlerClient input_handler_client(
@@ -1497,7 +1497,7 @@ class LayerTreeHostScrollTestScrollMFBA : public LayerTreeHostScrollTest {
void UpdateLayerTreeHost() override {
Layer* scroll_layer = layer_tree()->outer_viewport_scroll_layer();
- switch (layer_tree_host()->source_frame_number()) {
+ switch (layer_tree_host()->SourceFrameNumber()) {
case 0:
EXPECT_VECTOR_EQ(initial_scroll_, scroll_layer->scroll_offset());
break;
@@ -1624,13 +1624,13 @@ class LayerTreeHostScrollTestScrollAbortedCommitMFBA
case 1:
// This will not be aborted because of the initial prop changes.
EXPECT_EQ(0, num_impl_scrolls_);
- EXPECT_EQ(0, layer_tree_host()->source_frame_number());
+ EXPECT_EQ(0, layer_tree_host()->SourceFrameNumber());
EXPECT_VECTOR_EQ(initial_scroll_, root_scroll_layer->scroll_offset());
break;
case 2:
// This commit will not be aborted because of the scroll change.
EXPECT_EQ(1, num_impl_scrolls_);
- EXPECT_EQ(1, layer_tree_host()->source_frame_number());
+ EXPECT_EQ(1, layer_tree_host()->SourceFrameNumber());
EXPECT_VECTOR_EQ(
gfx::ScrollOffsetWithDelta(initial_scroll_, impl_scroll_),
root_scroll_layer->scroll_offset());
@@ -1641,7 +1641,7 @@ class LayerTreeHostScrollTestScrollAbortedCommitMFBA
// This commit will be aborted.
EXPECT_EQ(2, num_impl_scrolls_);
// The source frame number still increases even with the abort.
- EXPECT_EQ(2, layer_tree_host()->source_frame_number());
+ EXPECT_EQ(2, layer_tree_host()->SourceFrameNumber());
gfx::Vector2dF delta =
impl_scroll_ + impl_scroll_ + second_main_scroll_;
EXPECT_VECTOR_EQ(gfx::ScrollOffsetWithDelta(initial_scroll_, delta),
@@ -1651,7 +1651,7 @@ class LayerTreeHostScrollTestScrollAbortedCommitMFBA
case 4: {
// This commit will also be aborted.
EXPECT_EQ(3, num_impl_scrolls_);
- EXPECT_EQ(3, layer_tree_host()->source_frame_number());
+ EXPECT_EQ(3, layer_tree_host()->SourceFrameNumber());
gfx::Vector2dF delta =
impl_scroll_ + impl_scroll_ + impl_scroll_ + second_main_scroll_;
EXPECT_VECTOR_EQ(gfx::ScrollOffsetWithDelta(initial_scroll_, delta),
« no previous file with comments | « cc/trees/layer_tree_host_unittest_remote_server.cc ('k') | cc/trees/property_tree_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698