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

Side by Side Diff: cc/trees/layer_tree_host_unittest_proxy.cc

Issue 1783613004: CC Animation: Erase cc::LayerSettings everywhere. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@eraseandroid
Patch Set: Rebase. Created 4 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/compiler_specific.h" 5 #include "base/compiler_specific.h"
6 #include "base/macros.h" 6 #include "base/macros.h"
7 #include "cc/test/fake_content_layer_client.h" 7 #include "cc/test/fake_content_layer_client.h"
8 #include "cc/test/fake_picture_layer.h" 8 #include "cc/test/fake_picture_layer.h"
9 #include "cc/test/layer_tree_test.h" 9 #include "cc/test/layer_tree_test.h"
10 #include "cc/trees/proxy_impl.h" 10 #include "cc/trees/proxy_impl.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 int action_phase_; 70 int action_phase_;
71 71
72 DISALLOW_COPY_AND_ASSIGN(ProxyTestScheduledActionsBasic); 72 DISALLOW_COPY_AND_ASSIGN(ProxyTestScheduledActionsBasic);
73 }; 73 };
74 74
75 PROXY_TEST_SCHEDULED_ACTION(ProxyTestScheduledActionsBasic); 75 PROXY_TEST_SCHEDULED_ACTION(ProxyTestScheduledActionsBasic);
76 76
77 class ProxyMainThreaded : public ProxyTest { 77 class ProxyMainThreaded : public ProxyTest {
78 protected: 78 protected:
79 ProxyMainThreaded() 79 ProxyMainThreaded()
80 : update_check_layer_( 80 : update_check_layer_(FakePictureLayer::Create(&client_)) {}
81 FakePictureLayer::Create(layer_settings(), &client_)) {}
82 ~ProxyMainThreaded() override {} 81 ~ProxyMainThreaded() override {}
83 82
84 void SetupTree() override { 83 void SetupTree() override {
85 layer_tree_host()->SetRootLayer(update_check_layer_); 84 layer_tree_host()->SetRootLayer(update_check_layer_);
86 ProxyTest::SetupTree(); 85 ProxyTest::SetupTree();
87 client_.set_bounds(update_check_layer_->bounds()); 86 client_.set_bounds(update_check_layer_->bounds());
88 } 87 }
89 88
90 protected: 89 protected:
91 FakeContentLayerClient client_; 90 FakeContentLayerClient client_;
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 334
336 private: 335 private:
337 int commits_completed_; 336 int commits_completed_;
338 337
339 DISALLOW_COPY_AND_ASSIGN(ProxyMainThreadedCommitWaitsForActivation); 338 DISALLOW_COPY_AND_ASSIGN(ProxyMainThreadedCommitWaitsForActivation);
340 }; 339 };
341 340
342 PROXY_MAIN_THREADED_TEST_F(ProxyMainThreadedCommitWaitsForActivation); 341 PROXY_MAIN_THREADED_TEST_F(ProxyMainThreadedCommitWaitsForActivation);
343 342
344 } // namespace cc 343 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698