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

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

Issue 1149803002: cc: Make single-thread renderer compositor always synchronous. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: syncsinglethread: . Created 5 years, 7 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
« no previous file with comments | « cc/trees/layer_tree_host_unittest.cc ('k') | content/browser/gpu/compositor_util.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "cc/layers/content_layer.h" 8 #include "cc/layers/content_layer.h"
9 #include "cc/layers/delegated_frame_provider.h" 9 #include "cc/layers/delegated_frame_provider.h"
10 #include "cc/layers/delegated_frame_resource_collection.h" 10 #include "cc/layers/delegated_frame_resource_collection.h"
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 LayerTreeHostClientNotReadyDoesNotCreateOutputSurface); 378 LayerTreeHostClientNotReadyDoesNotCreateOutputSurface);
379 379
380 class MultipleCompositeDoesNotCreateOutputSurface 380 class MultipleCompositeDoesNotCreateOutputSurface
381 : public LayerTreeHostContextTest { 381 : public LayerTreeHostContextTest {
382 public: 382 public:
383 MultipleCompositeDoesNotCreateOutputSurface() 383 MultipleCompositeDoesNotCreateOutputSurface()
384 : LayerTreeHostContextTest(), request_count_(0) {} 384 : LayerTreeHostContextTest(), request_count_(0) {}
385 385
386 void InitializeSettings(LayerTreeSettings* settings) override { 386 void InitializeSettings(LayerTreeSettings* settings) override {
387 settings->single_thread_proxy_scheduler = false; 387 settings->single_thread_proxy_scheduler = false;
388 settings->use_zero_copy = true;
388 } 389 }
389 390
390 void RequestNewOutputSurface() override { 391 void RequestNewOutputSurface() override {
391 EXPECT_GE(1, ++request_count_); 392 EXPECT_GE(1, ++request_count_);
392 EndTest(); 393 EndTest();
393 } 394 }
394 395
395 void BeginTest() override { 396 void BeginTest() override {
396 layer_tree_host()->Composite(base::TimeTicks()); 397 layer_tree_host()->Composite(base::TimeTicks());
397 layer_tree_host()->Composite(base::TimeTicks()); 398 layer_tree_host()->Composite(base::TimeTicks());
(...skipping 17 matching lines...) Expand all
415 // DidFailToInitializeOutputSurface, that future Composite calls will not 416 // DidFailToInitializeOutputSurface, that future Composite calls will not
416 // trigger additional requests for output surfaces. 417 // trigger additional requests for output surfaces.
417 class FailedCreateDoesNotCreateExtraOutputSurface 418 class FailedCreateDoesNotCreateExtraOutputSurface
418 : public LayerTreeHostContextTest { 419 : public LayerTreeHostContextTest {
419 public: 420 public:
420 FailedCreateDoesNotCreateExtraOutputSurface() 421 FailedCreateDoesNotCreateExtraOutputSurface()
421 : LayerTreeHostContextTest(), num_requests_(0), has_failed_(false) {} 422 : LayerTreeHostContextTest(), num_requests_(0), has_failed_(false) {}
422 423
423 void InitializeSettings(LayerTreeSettings* settings) override { 424 void InitializeSettings(LayerTreeSettings* settings) override {
424 settings->single_thread_proxy_scheduler = false; 425 settings->single_thread_proxy_scheduler = false;
426 settings->use_zero_copy = true;
425 } 427 }
426 428
427 void RequestNewOutputSurface() override { 429 void RequestNewOutputSurface() override {
428 num_requests_++; 430 num_requests_++;
429 // There should be one initial request and then one request from 431 // There should be one initial request and then one request from
430 // the LayerTreeTest test hooks DidFailToInitializeOutputSurface (which is 432 // the LayerTreeTest test hooks DidFailToInitializeOutputSurface (which is
431 // hard to skip). This second request is just ignored and is test cruft. 433 // hard to skip). This second request is just ignored and is test cruft.
432 EXPECT_LE(num_requests_, 2); 434 EXPECT_LE(num_requests_, 2);
433 if (num_requests_ > 1) 435 if (num_requests_ > 1)
434 return; 436 return;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 SINGLE_THREAD_NOIMPL_TEST_F(FailedCreateDoesNotCreateExtraOutputSurface); 468 SINGLE_THREAD_NOIMPL_TEST_F(FailedCreateDoesNotCreateExtraOutputSurface);
467 469
468 class LayerTreeHostContextTestCommitAfterDelayedOutputSurface 470 class LayerTreeHostContextTestCommitAfterDelayedOutputSurface
469 : public LayerTreeHostContextTest { 471 : public LayerTreeHostContextTest {
470 public: 472 public:
471 LayerTreeHostContextTestCommitAfterDelayedOutputSurface() 473 LayerTreeHostContextTestCommitAfterDelayedOutputSurface()
472 : LayerTreeHostContextTest(), creating_output_(false) {} 474 : LayerTreeHostContextTest(), creating_output_(false) {}
473 475
474 void InitializeSettings(LayerTreeSettings* settings) override { 476 void InitializeSettings(LayerTreeSettings* settings) override {
475 settings->single_thread_proxy_scheduler = false; 477 settings->single_thread_proxy_scheduler = false;
478 settings->use_zero_copy = true;
476 } 479 }
477 480
478 void RequestNewOutputSurface() override { 481 void RequestNewOutputSurface() override {
479 MainThreadTaskRunner()->PostTask( 482 MainThreadTaskRunner()->PostTask(
480 FROM_HERE, 483 FROM_HERE,
481 base::Bind(&LayerTreeHostContextTestCommitAfterDelayedOutputSurface:: 484 base::Bind(&LayerTreeHostContextTestCommitAfterDelayedOutputSurface::
482 CreateAndSetOutputSurface, 485 CreateAndSetOutputSurface,
483 base::Unretained(this))); 486 base::Unretained(this)));
484 } 487 }
485 488
(...skipping 19 matching lines...) Expand all
505 LayerTreeHostContextTestCommitAfterDelayedOutputSurface); 508 LayerTreeHostContextTestCommitAfterDelayedOutputSurface);
506 509
507 class LayerTreeHostContextTestAvoidUnnecessaryComposite 510 class LayerTreeHostContextTestAvoidUnnecessaryComposite
508 : public LayerTreeHostContextTest { 511 : public LayerTreeHostContextTest {
509 public: 512 public:
510 LayerTreeHostContextTestAvoidUnnecessaryComposite() 513 LayerTreeHostContextTestAvoidUnnecessaryComposite()
511 : LayerTreeHostContextTest(), in_composite_(false) {} 514 : LayerTreeHostContextTest(), in_composite_(false) {}
512 515
513 void InitializeSettings(LayerTreeSettings* settings) override { 516 void InitializeSettings(LayerTreeSettings* settings) override {
514 settings->single_thread_proxy_scheduler = false; 517 settings->single_thread_proxy_scheduler = false;
518 settings->use_zero_copy = true;
515 } 519 }
516 520
517 void RequestNewOutputSurface() override { 521 void RequestNewOutputSurface() override {
518 layer_tree_host()->SetOutputSurface( 522 layer_tree_host()->SetOutputSurface(
519 LayerTreeHostContextTest::CreateOutputSurface()); 523 LayerTreeHostContextTest::CreateOutputSurface());
520 EndTest(); 524 EndTest();
521 } 525 }
522 526
523 void BeginTest() override { 527 void BeginTest() override {
524 in_composite_ = true; 528 in_composite_ = true;
(...skipping 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after
1797 void AfterTest() override {} 1801 void AfterTest() override {}
1798 1802
1799 bool deferred_; 1803 bool deferred_;
1800 }; 1804 };
1801 1805
1802 SINGLE_AND_MULTI_THREAD_TEST_F( 1806 SINGLE_AND_MULTI_THREAD_TEST_F(
1803 LayerTreeHostContextTestLoseAfterSendingBeginMainFrame); 1807 LayerTreeHostContextTestLoseAfterSendingBeginMainFrame);
1804 1808
1805 } // namespace 1809 } // namespace
1806 } // namespace cc 1810 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest.cc ('k') | content/browser/gpu/compositor_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698