summaryrefslogtreecommitdiffstats
path: root/cc/test/layer_tree_test.cc
diff options
context:
space:
mode:
authorrobliao@chromium.org <robliao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-03 22:57:43 +0000
committerrobliao@chromium.org <robliao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-03 22:57:43 +0000
commit5195fc585a5dc844956405835ab258094d460e45 (patch)
tree6c374aa880920de8a68214ed1cb940ed5c918532 /cc/test/layer_tree_test.cc
parenta5a594891ef319d44224d9a67b7698751f820d44 (diff)
downloadchromium_src-5195fc585a5dc844956405835ab258094d460e45.zip
chromium_src-5195fc585a5dc844956405835ab258094d460e45.tar.gz
chromium_src-5195fc585a5dc844956405835ab258094d460e45.tar.bz2
Revert 238458 "cc: Defer first OutputSurface creation until clie..."
Reason: Candidate for Mac 10.6 and 10.7 Break - IOSurfaceReuse > cc: Defer first OutputSurface creation until client is ready > > Remove the |first_output_surface| which was not used before > the client signals ready. > This allows the client to wait before creating a graphics context > until the gpu thread and client channel are set up. > > BUG=270179 > R=danakj@chromium.org, jamesr@chromium.org, jochen@chromium.org > > Review URL: https://codereview.chromium.org/85693007 TBR=sievers@chromium.org Review URL: https://codereview.chromium.org/103163003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/layer_tree_test.cc')
-rw-r--r--cc/test/layer_tree_test.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index d854488..b723c56 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -288,10 +288,12 @@ class LayerTreeHostForTesting : public LayerTreeHost {
scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner) {
scoped_ptr<LayerTreeHostForTesting> layer_tree_host(
new LayerTreeHostForTesting(test_hooks, client, settings));
+ bool success;
if (impl_task_runner.get())
- layer_tree_host->InitializeThreaded(impl_task_runner);
+ success = layer_tree_host->InitializeThreaded(impl_task_runner);
else
- layer_tree_host->InitializeSingleThreaded(client);
+ success = layer_tree_host->InitializeSingleThreaded(client);
+ EXPECT_TRUE(success);
return layer_tree_host.Pass();
}
@@ -456,10 +458,6 @@ void LayerTreeTest::PostSetNextCommitForcesRedrawToMainThread() {
main_thread_weak_ptr_));
}
-void LayerTreeTest::WillBeginTest() {
- layer_tree_host_->SetLayerTreeHostClientReady();
-}
-
void LayerTreeTest::DoBeginTest() {
client_ = LayerTreeHostClientForTesting::Create(this);
@@ -474,7 +472,7 @@ void LayerTreeTest::DoBeginTest() {
started_ = true;
beginning_ = true;
SetupTree();
- WillBeginTest();
+ layer_tree_host_->SetLayerTreeHostClientReady();
BeginTest();
beginning_ = false;
if (end_when_begin_returns_)