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

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

Issue 22900018: cc: Set the mapped memory reclaim limit for the renderer compositor on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment Created 7 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 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/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/synchronization/lock.h" 10 #include "base/synchronization/lock.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 using testing::_; 57 using testing::_;
58 using testing::AnyNumber; 58 using testing::AnyNumber;
59 using testing::AtLeast; 59 using testing::AtLeast;
60 using testing::Mock; 60 using testing::Mock;
61 61
62 namespace cc { 62 namespace cc {
63 namespace { 63 namespace {
64 64
65 class LayerTreeHostTest : public LayerTreeTest { 65 class LayerTreeHostTest : public LayerTreeTest {
66 protected:
67 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
68 settings->max_bytes_pending_upload = 16 * 1024 * 1024;
69 }
66 }; 70 };
67 71
68 // Two setNeedsCommits in a row should lead to at least 1 commit and at least 1 72 // Two setNeedsCommits in a row should lead to at least 1 commit and at least 1
69 // draw with frame 0. 73 // draw with frame 0.
70 class LayerTreeHostTestSetNeedsCommit1 : public LayerTreeHostTest { 74 class LayerTreeHostTestSetNeedsCommit1 : public LayerTreeHostTest {
71 public: 75 public:
72 LayerTreeHostTestSetNeedsCommit1() : num_commits_(0), num_draws_(0) {} 76 LayerTreeHostTestSetNeedsCommit1() : num_commits_(0), num_draws_(0) {}
73 77
74 virtual void BeginTest() OVERRIDE { 78 virtual void BeginTest() OVERRIDE {
75 PostSetNeedsCommitToMainThread(); 79 PostSetNeedsCommitToMainThread();
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 FakeContentLayerClient client_; 328 FakeContentLayerClient client_;
325 scoped_refptr<ContentLayer> root_layer_; 329 scoped_refptr<ContentLayer> root_layer_;
326 }; 330 };
327 331
328 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestSetNeedsRedrawRect); 332 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestSetNeedsRedrawRect);
329 333
330 class LayerTreeHostTestNoExtraCommitFromInvalidate : public LayerTreeHostTest { 334 class LayerTreeHostTestNoExtraCommitFromInvalidate : public LayerTreeHostTest {
331 public: 335 public:
332 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE { 336 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
333 settings->layer_transforms_should_scale_layer_contents = true; 337 settings->layer_transforms_should_scale_layer_contents = true;
338 settings->max_bytes_pending_upload = 16 * 1024 * 1024;
334 } 339 }
335 340
336 virtual void SetupTree() OVERRIDE { 341 virtual void SetupTree() OVERRIDE {
337 root_layer_ = Layer::Create(); 342 root_layer_ = Layer::Create();
338 root_layer_->SetBounds(gfx::Size(10, 20)); 343 root_layer_->SetBounds(gfx::Size(10, 20));
339 344
340 scaled_layer_ = FakeContentLayer::Create(&client_); 345 scaled_layer_ = FakeContentLayer::Create(&client_);
341 scaled_layer_->SetBounds(gfx::Size(1, 1)); 346 scaled_layer_->SetBounds(gfx::Size(1, 1));
342 root_layer_->AddChild(scaled_layer_); 347 root_layer_->AddChild(scaled_layer_);
343 348
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 scoped_refptr<FakeContentLayer> scaled_layer_; 384 scoped_refptr<FakeContentLayer> scaled_layer_;
380 }; 385 };
381 386
382 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestNoExtraCommitFromInvalidate); 387 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestNoExtraCommitFromInvalidate);
383 388
384 class LayerTreeHostTestNoExtraCommitFromScrollbarInvalidate 389 class LayerTreeHostTestNoExtraCommitFromScrollbarInvalidate
385 : public LayerTreeHostTest { 390 : public LayerTreeHostTest {
386 public: 391 public:
387 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE { 392 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
388 settings->layer_transforms_should_scale_layer_contents = true; 393 settings->layer_transforms_should_scale_layer_contents = true;
394 settings->max_bytes_pending_upload = 16 * 1024 * 1024;
389 } 395 }
390 396
391 virtual void SetupTree() OVERRIDE { 397 virtual void SetupTree() OVERRIDE {
392 root_layer_ = Layer::Create(); 398 root_layer_ = Layer::Create();
393 root_layer_->SetBounds(gfx::Size(10, 20)); 399 root_layer_->SetBounds(gfx::Size(10, 20));
394 400
395 bool paint_scrollbar = true; 401 bool paint_scrollbar = true;
396 bool has_thumb = false; 402 bool has_thumb = false;
397 scrollbar_ = FakeScrollbarLayer::Create(paint_scrollbar, 403 scrollbar_ = FakeScrollbarLayer::Create(paint_scrollbar,
398 has_thumb, 404 has_thumb,
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 MULTI_THREAD_TEST_F(LayerTreeHostTestDeviceScaleFactorScalesViewportAndLayers); 1118 MULTI_THREAD_TEST_F(LayerTreeHostTestDeviceScaleFactorScalesViewportAndLayers);
1113 1119
1114 // Verify atomicity of commits and reuse of textures. 1120 // Verify atomicity of commits and reuse of textures.
1115 class LayerTreeHostTestDirectRendererAtomicCommit : public LayerTreeHostTest { 1121 class LayerTreeHostTestDirectRendererAtomicCommit : public LayerTreeHostTest {
1116 public: 1122 public:
1117 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE { 1123 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
1118 // Make sure partial texture updates are turned off. 1124 // Make sure partial texture updates are turned off.
1119 settings->max_partial_texture_updates = 0; 1125 settings->max_partial_texture_updates = 0;
1120 // Linear fade animator prevents scrollbars from drawing immediately. 1126 // Linear fade animator prevents scrollbars from drawing immediately.
1121 settings->use_linear_fade_scrollbar_animator = false; 1127 settings->use_linear_fade_scrollbar_animator = false;
1128 settings->max_bytes_pending_upload = 16 * 1024 * 1024;
1122 } 1129 }
1123 1130
1124 virtual void SetupTree() OVERRIDE { 1131 virtual void SetupTree() OVERRIDE {
1125 layer_ = FakeContentLayer::Create(&client_); 1132 layer_ = FakeContentLayer::Create(&client_);
1126 layer_->SetBounds(gfx::Size(10, 20)); 1133 layer_->SetBounds(gfx::Size(10, 20));
1127 1134
1128 bool paint_scrollbar = true; 1135 bool paint_scrollbar = true;
1129 bool has_thumb = false; 1136 bool has_thumb = false;
1130 scrollbar_ = 1137 scrollbar_ =
1131 FakeScrollbarLayer::Create(paint_scrollbar, has_thumb, layer_->id()); 1138 FakeScrollbarLayer::Create(paint_scrollbar, has_thumb, layer_->id());
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
1290 } 1297 }
1291 1298
1292 class LayerTreeHostTestAtomicCommitWithPartialUpdate 1299 class LayerTreeHostTestAtomicCommitWithPartialUpdate
1293 : public LayerTreeHostTest { 1300 : public LayerTreeHostTest {
1294 public: 1301 public:
1295 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE { 1302 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
1296 // Allow one partial texture update. 1303 // Allow one partial texture update.
1297 settings->max_partial_texture_updates = 1; 1304 settings->max_partial_texture_updates = 1;
1298 // No partial updates when impl side painting is enabled. 1305 // No partial updates when impl side painting is enabled.
1299 settings->impl_side_painting = false; 1306 settings->impl_side_painting = false;
1307 settings->max_bytes_pending_upload = 16 * 1024 * 1024;
1300 } 1308 }
1301 1309
1302 virtual void SetupTree() OVERRIDE { 1310 virtual void SetupTree() OVERRIDE {
1303 parent_ = FakeContentLayer::Create(&client_); 1311 parent_ = FakeContentLayer::Create(&client_);
1304 parent_->SetBounds(gfx::Size(10, 20)); 1312 parent_->SetBounds(gfx::Size(10, 20));
1305 1313
1306 child_ = FakeContentLayer::Create(&client_); 1314 child_ = FakeContentLayer::Create(&client_);
1307 child_->SetPosition(gfx::Point(0, 10)); 1315 child_->SetPosition(gfx::Point(0, 10));
1308 child_->SetBounds(gfx::Size(3, 10)); 1316 child_->SetBounds(gfx::Size(3, 10));
1309 1317
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
1497 virtual void AfterTest() OVERRIDE {} 1505 virtual void AfterTest() OVERRIDE {}
1498 }; 1506 };
1499 1507
1500 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestCompositeAndReadbackCleanup); 1508 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestCompositeAndReadbackCleanup);
1501 1509
1502 class LayerTreeHostTestSurfaceNotAllocatedForLayersOutsideMemoryLimit 1510 class LayerTreeHostTestSurfaceNotAllocatedForLayersOutsideMemoryLimit
1503 : public LayerTreeHostTest { 1511 : public LayerTreeHostTest {
1504 protected: 1512 protected:
1505 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE { 1513 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
1506 settings->cache_render_pass_contents = true; 1514 settings->cache_render_pass_contents = true;
1515 settings->max_bytes_pending_upload = 16 * 1024 * 1024;
1507 } 1516 }
1508 1517
1509 virtual void SetupTree() OVERRIDE { 1518 virtual void SetupTree() OVERRIDE {
1510 root_layer_ = FakeContentLayer::Create(&client_); 1519 root_layer_ = FakeContentLayer::Create(&client_);
1511 root_layer_->SetBounds(gfx::Size(100, 100)); 1520 root_layer_->SetBounds(gfx::Size(100, 100));
1512 1521
1513 surface_layer1_ = FakeContentLayer::Create(&client_); 1522 surface_layer1_ = FakeContentLayer::Create(&client_);
1514 surface_layer1_->SetBounds(gfx::Size(100, 100)); 1523 surface_layer1_->SetBounds(gfx::Size(100, 100));
1515 surface_layer1_->SetForceRenderSurface(true); 1524 surface_layer1_->SetForceRenderSurface(true);
1516 surface_layer1_->SetOpacity(0.5f); 1525 surface_layer1_->SetOpacity(0.5f);
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
2227 NotificationClient client_; 2236 NotificationClient client_;
2228 }; 2237 };
2229 2238
2230 SINGLE_THREAD_TEST_F(LayerTreeHostTestLCDNotification); 2239 SINGLE_THREAD_TEST_F(LayerTreeHostTestLCDNotification);
2231 2240
2232 // Verify that the BeginFrame notification is used to initiate rendering. 2241 // Verify that the BeginFrame notification is used to initiate rendering.
2233 class LayerTreeHostTestBeginFrameNotification : public LayerTreeHostTest { 2242 class LayerTreeHostTestBeginFrameNotification : public LayerTreeHostTest {
2234 public: 2243 public:
2235 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE { 2244 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
2236 settings->begin_frame_scheduling_enabled = true; 2245 settings->begin_frame_scheduling_enabled = true;
2246 settings->max_bytes_pending_upload = 16 * 1024 * 1024;
2237 } 2247 }
2238 2248
2239 virtual void BeginTest() OVERRIDE { 2249 virtual void BeginTest() OVERRIDE {
2240 // This will trigger a SetNeedsBeginFrame which will trigger a BeginFrame. 2250 // This will trigger a SetNeedsBeginFrame which will trigger a BeginFrame.
2241 PostSetNeedsCommitToMainThread(); 2251 PostSetNeedsCommitToMainThread();
2242 } 2252 }
2243 2253
2244 virtual bool PrepareToDrawOnThread( 2254 virtual bool PrepareToDrawOnThread(
2245 LayerTreeHostImpl* host_impl, 2255 LayerTreeHostImpl* host_impl,
2246 LayerTreeHostImpl::FrameData* frame, 2256 LayerTreeHostImpl::FrameData* frame,
2247 bool result) OVERRIDE { 2257 bool result) OVERRIDE {
2248 EndTest(); 2258 EndTest();
2249 return true; 2259 return true;
2250 } 2260 }
2251 2261
2252 virtual void AfterTest() OVERRIDE {} 2262 virtual void AfterTest() OVERRIDE {}
2253 2263
2254 private: 2264 private:
2255 base::TimeTicks frame_time_; 2265 base::TimeTicks frame_time_;
2256 }; 2266 };
2257 2267
2258 MULTI_THREAD_TEST_F(LayerTreeHostTestBeginFrameNotification); 2268 MULTI_THREAD_TEST_F(LayerTreeHostTestBeginFrameNotification);
2259 2269
2260 class LayerTreeHostTestBeginFrameNotificationShutdownWhileEnabled 2270 class LayerTreeHostTestBeginFrameNotificationShutdownWhileEnabled
2261 : public LayerTreeHostTest { 2271 : public LayerTreeHostTest {
2262 public: 2272 public:
2263 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE { 2273 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
2264 settings->begin_frame_scheduling_enabled = true; 2274 settings->begin_frame_scheduling_enabled = true;
2265 settings->using_synchronous_renderer_compositor = true; 2275 settings->using_synchronous_renderer_compositor = true;
2276 settings->max_bytes_pending_upload = 16 * 1024 * 1024;
2266 } 2277 }
2267 2278
2268 virtual void BeginTest() OVERRIDE { PostSetNeedsCommitToMainThread(); } 2279 virtual void BeginTest() OVERRIDE { PostSetNeedsCommitToMainThread(); }
2269 2280
2270 virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) OVERRIDE { 2281 virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
2271 // The BeginFrame notification is turned off now but will get enabled 2282 // The BeginFrame notification is turned off now but will get enabled
2272 // once we return. End test while it's enabled. 2283 // once we return. End test while it's enabled.
2273 ImplThreadTaskRunner()->PostTask( 2284 ImplThreadTaskRunner()->PostTask(
2274 FROM_HERE, 2285 FROM_HERE,
2275 base::Bind(&LayerTreeHostTestBeginFrameNotification::EndTest, 2286 base::Bind(&LayerTreeHostTestBeginFrameNotification::EndTest,
2276 base::Unretained(this))); 2287 base::Unretained(this)));
2277 } 2288 }
2278 2289
2279 virtual void AfterTest() OVERRIDE {} 2290 virtual void AfterTest() OVERRIDE {}
2280 }; 2291 };
2281 2292
2282 MULTI_THREAD_TEST_F( 2293 MULTI_THREAD_TEST_F(
2283 LayerTreeHostTestBeginFrameNotificationShutdownWhileEnabled); 2294 LayerTreeHostTestBeginFrameNotificationShutdownWhileEnabled);
2284 2295
2285 class LayerTreeHostTestUninvertibleTransformDoesNotBlockActivation 2296 class LayerTreeHostTestUninvertibleTransformDoesNotBlockActivation
2286 : public LayerTreeHostTest { 2297 : public LayerTreeHostTest {
2287 protected: 2298 protected:
2288 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE { 2299 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
2289 settings->impl_side_painting = true; 2300 settings->impl_side_painting = true;
2301 settings->max_bytes_pending_upload = 16 * 1024 * 1024;
2290 } 2302 }
2291 2303
2292 virtual void SetupTree() OVERRIDE { 2304 virtual void SetupTree() OVERRIDE {
2293 LayerTreeHostTest::SetupTree(); 2305 LayerTreeHostTest::SetupTree();
2294 2306
2295 scoped_refptr<Layer> layer = PictureLayer::Create(&client_); 2307 scoped_refptr<Layer> layer = PictureLayer::Create(&client_);
2296 layer->SetTransform(gfx::Transform(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)); 2308 layer->SetTransform(gfx::Transform(0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
2297 layer->SetBounds(gfx::Size(10, 10)); 2309 layer->SetBounds(gfx::Size(10, 10));
2298 layer_tree_host()->root_layer()->AddChild(layer); 2310 layer_tree_host()->root_layer()->AddChild(layer);
2299 } 2311 }
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
2833 2845
2834 // No output to copy for delegated renderers. 2846 // No output to copy for delegated renderers.
2835 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F( 2847 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
2836 LayerTreeHostTestAsyncReadbackInHiddenSubtree); 2848 LayerTreeHostTestAsyncReadbackInHiddenSubtree);
2837 2849
2838 class LayerTreeHostTestHiddenSurfaceNotAllocatedForSubtreeCopyRequest 2850 class LayerTreeHostTestHiddenSurfaceNotAllocatedForSubtreeCopyRequest
2839 : public LayerTreeHostTest { 2851 : public LayerTreeHostTest {
2840 protected: 2852 protected:
2841 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE { 2853 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
2842 settings->cache_render_pass_contents = true; 2854 settings->cache_render_pass_contents = true;
2855 settings->max_bytes_pending_upload = 16 * 1024 * 1024;
2843 } 2856 }
2844 2857
2845 virtual void SetupTree() OVERRIDE { 2858 virtual void SetupTree() OVERRIDE {
2846 root_ = FakeContentLayer::Create(&client_); 2859 root_ = FakeContentLayer::Create(&client_);
2847 root_->SetBounds(gfx::Size(20, 20)); 2860 root_->SetBounds(gfx::Size(20, 20));
2848 2861
2849 grand_parent_layer_ = FakeContentLayer::Create(&client_); 2862 grand_parent_layer_ = FakeContentLayer::Create(&client_);
2850 grand_parent_layer_->SetBounds(gfx::Size(15, 15)); 2863 grand_parent_layer_->SetBounds(gfx::Size(15, 15));
2851 grand_parent_layer_->SetHideLayerAndSubtree(true); 2864 grand_parent_layer_->SetHideLayerAndSubtree(true);
2852 root_->AddChild(grand_parent_layer_); 2865 root_->AddChild(grand_parent_layer_);
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
3245 TEST_F(LayerTreeHostTestNumFramesPending, GLRenderer) { 3258 TEST_F(LayerTreeHostTestNumFramesPending, GLRenderer) {
3246 RunTest(true, false, true); 3259 RunTest(true, false, true);
3247 } 3260 }
3248 3261
3249 class LayerTreeHostTestDeferredInitialize : public LayerTreeHostTest { 3262 class LayerTreeHostTestDeferredInitialize : public LayerTreeHostTest {
3250 public: 3263 public:
3251 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE { 3264 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
3252 // PictureLayer can only be used with impl side painting enabled. 3265 // PictureLayer can only be used with impl side painting enabled.
3253 settings->impl_side_painting = true; 3266 settings->impl_side_painting = true;
3254 settings->solid_color_scrollbars = true; 3267 settings->solid_color_scrollbars = true;
3268 settings->max_bytes_pending_upload = 16 * 1024 * 1024;
3255 } 3269 }
3256 3270
3257 virtual void SetupTree() OVERRIDE { 3271 virtual void SetupTree() OVERRIDE {
3258 layer_ = FakePictureLayer::Create(&client_); 3272 layer_ = FakePictureLayer::Create(&client_);
3259 // Force commits to not be aborted so new frames get drawn, otherwise 3273 // Force commits to not be aborted so new frames get drawn, otherwise
3260 // the renderer gets deferred initialized but nothing new needs drawing. 3274 // the renderer gets deferred initialized but nothing new needs drawing.
3261 layer_->set_always_update_resources(true); 3275 layer_->set_always_update_resources(true);
3262 layer_tree_host()->SetRootLayer(layer_); 3276 layer_tree_host()->SetRootLayer(layer_);
3263 LayerTreeHostTest::SetupTree(); 3277 LayerTreeHostTest::SetupTree();
3264 } 3278 }
(...skipping 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after
4369 scoped_refptr<SolidColorLayer> parent_layer_; 4383 scoped_refptr<SolidColorLayer> parent_layer_;
4370 scoped_refptr<SolidColorLayer> child_layer_; 4384 scoped_refptr<SolidColorLayer> child_layer_;
4371 }; 4385 };
4372 4386
4373 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPushHiddenLayer); 4387 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPushHiddenLayer);
4374 4388
4375 class LayerTreeHostTestUpdateLayerInEmptyViewport : public LayerTreeHostTest { 4389 class LayerTreeHostTestUpdateLayerInEmptyViewport : public LayerTreeHostTest {
4376 protected: 4390 protected:
4377 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE { 4391 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
4378 settings->impl_side_painting = true; 4392 settings->impl_side_painting = true;
4393 settings->max_bytes_pending_upload = 16 * 1024 * 1024;
4379 } 4394 }
4380 4395
4381 virtual void SetupTree() OVERRIDE { 4396 virtual void SetupTree() OVERRIDE {
4382 root_layer_ = FakePictureLayer::Create(&client_); 4397 root_layer_ = FakePictureLayer::Create(&client_);
4383 root_layer_->SetAnchorPoint(gfx::PointF()); 4398 root_layer_->SetAnchorPoint(gfx::PointF());
4384 root_layer_->SetBounds(gfx::Size(10, 10)); 4399 root_layer_->SetBounds(gfx::Size(10, 10));
4385 4400
4386 layer_tree_host()->SetRootLayer(root_layer_); 4401 layer_tree_host()->SetRootLayer(root_layer_);
4387 LayerTreeHostTest::SetupTree(); 4402 LayerTreeHostTest::SetupTree();
4388 } 4403 }
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
4466 int num_will_begin_frames_; 4481 int num_will_begin_frames_;
4467 int num_impl_commits_; 4482 int num_impl_commits_;
4468 }; 4483 };
4469 4484
4470 // Commits can only be aborted when using the thread proxy. 4485 // Commits can only be aborted when using the thread proxy.
4471 MULTI_THREAD_TEST_F(LayerTreeHostTestAbortEvictedTextures); 4486 MULTI_THREAD_TEST_F(LayerTreeHostTestAbortEvictedTextures);
4472 4487
4473 } // namespace 4488 } // namespace
4474 4489
4475 } // namespace cc 4490 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698