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

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

Issue 18454002: Reland "Shouldn't access LayerTreeTest::layer_tree_host on impl thread" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/test/layer_tree_test.cc ('k') | cc/trees/layer_tree_host_unittest_animation.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 "cc/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/synchronization/lock.h" 9 #include "base/synchronization/lock.h"
10 #include "cc/animation/timing_function.h" 10 #include "cc/animation/timing_function.h"
(...skipping 2198 matching lines...) Expand 10 before | Expand all | Expand 10 after
2209 virtual void AfterTest() OVERRIDE {} 2209 virtual void AfterTest() OVERRIDE {}
2210 2210
2211 private: 2211 private:
2212 FakeContentLayerClient client_; 2212 FakeContentLayerClient client_;
2213 scoped_refptr<FakeContentLayer> root_layer_; 2213 scoped_refptr<FakeContentLayer> root_layer_;
2214 scoped_refptr<FakeContentLayer> child_layer1_; 2214 scoped_refptr<FakeContentLayer> child_layer1_;
2215 scoped_refptr<FakeContentLayer> child_layer2_; 2215 scoped_refptr<FakeContentLayer> child_layer2_;
2216 int num_commits_; 2216 int num_commits_;
2217 }; 2217 };
2218 2218
2219 SINGLE_AND_MULTI_THREAD_TEST_F( 2219 SINGLE_AND_MULTI_THREAD_MAIN_THREAD_PAINT_TEST_F(
danakj 2013/07/02 02:07:55 I think I'd prefer if this test just set impl_side
2220 LayerTreeHostTestShutdownWithOnlySomeResourcesEvicted); 2220 LayerTreeHostTestShutdownWithOnlySomeResourcesEvicted);
2221 2221
2222 class LayerTreeHostTestLCDNotification : public LayerTreeHostTest { 2222 class LayerTreeHostTestLCDNotification : public LayerTreeHostTest {
2223 public: 2223 public:
2224 class NotificationClient : public ContentLayerClient { 2224 class NotificationClient : public ContentLayerClient {
2225 public: 2225 public:
2226 NotificationClient() 2226 NotificationClient()
2227 : layer_(0), paint_count_(0), lcd_notification_count_(0) {} 2227 : layer_(0), paint_count_(0), lcd_notification_count_(0) {}
2228 2228
2229 void set_layer(Layer* layer) { layer_ = layer; } 2229 void set_layer(Layer* layer) { layer_ = layer; }
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
2950 private: 2950 private:
2951 FakeContentLayerClient client_; 2951 FakeContentLayerClient client_;
2952 scoped_refptr<FakePictureLayer> layer_; 2952 scoped_refptr<FakePictureLayer> layer_;
2953 bool initialized_gl_; 2953 bool initialized_gl_;
2954 }; 2954 };
2955 2955
2956 MULTI_THREAD_TEST_F(LayerTreeHostTestDeferredInitialize); 2956 MULTI_THREAD_TEST_F(LayerTreeHostTestDeferredInitialize);
2957 2957
2958 } // namespace 2958 } // namespace
2959 } // namespace cc 2959 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_tree_test.cc ('k') | cc/trees/layer_tree_host_unittest_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698