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

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

Issue 2251143002: cc: Reland Move data to LayerTree from LayerTreeHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: better fix? Created 4 years, 4 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"
11 #include "cc/trees/proxy_main.h" 11 #include "cc/trees/proxy_main.h"
12 12
13 namespace cc { 13 namespace cc {
14 14
15 class LayerTreeHostProxyTest : public LayerTreeTest { 15 class LayerTreeHostProxyTest : public LayerTreeTest {
16 protected: 16 protected:
17 void SetupTree() override { 17 void SetupTree() override {
18 update_check_layer_ = FakePictureLayer::Create(&client_); 18 update_check_layer_ = FakePictureLayer::Create(&client_);
19 layer_tree_host()->SetRootLayer(update_check_layer_); 19 layer_tree()->SetRootLayer(update_check_layer_);
20 LayerTreeTest::SetupTree(); 20 LayerTreeTest::SetupTree();
21 client_.set_bounds(update_check_layer_->bounds()); 21 client_.set_bounds(update_check_layer_->bounds());
22 } 22 }
23 23
24 FakePictureLayer* update_check_layer() const { 24 FakePictureLayer* update_check_layer() const {
25 return update_check_layer_.get(); 25 return update_check_layer_.get();
26 } 26 }
27 27
28 ProxyMain* GetProxyMain() const { 28 ProxyMain* GetProxyMain() const {
29 DCHECK(HasImplThread()); 29 DCHECK(HasImplThread());
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 private: 414 private:
415 base::Lock activate_blocked_lock_; 415 base::Lock activate_blocked_lock_;
416 bool activate_blocked_ = false; 416 bool activate_blocked_ = false;
417 417
418 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostProxyTestCommitWaitsForActivationMFBA); 418 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostProxyTestCommitWaitsForActivationMFBA);
419 }; 419 };
420 420
421 MULTI_THREAD_TEST_F(LayerTreeHostProxyTestCommitWaitsForActivationMFBA); 421 MULTI_THREAD_TEST_F(LayerTreeHostProxyTestCommitWaitsForActivationMFBA);
422 422
423 } // namespace cc 423 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698