summaryrefslogtreecommitdiffstats
path: root/cc/test
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-25 02:33:45 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-25 02:33:45 +0000
commitda8e3b72ba4c8d1d35c92217ddad7f86a810e210 (patch)
treea2092182f652a893859df064aae41a5d931e9860 /cc/test
parent1fec713d518f340a81bd837b86a290004407a9a7 (diff)
downloadchromium_src-da8e3b72ba4c8d1d35c92217ddad7f86a810e210.zip
chromium_src-da8e3b72ba4c8d1d35c92217ddad7f86a810e210.tar.gz
chromium_src-da8e3b72ba4c8d1d35c92217ddad7f86a810e210.tar.bz2
cc: Remove the capability to give up and leave compositing mode.
The request to create a fallback OutputSurface should always succeed and there's no way to leave compositing mode. So remove this capability from cc and instead just LOG(FATAL) if the fallback OutputSurface ends up being NULL. The only case where the fallback OutputSurface isn't created is in the ChromeOS browser compositor, and in this case the GpuProcessTransportFactory will LOG(FATAL) before cc even finds out, so this new LOG(FATAL) should never be hit in practice, but documents our expectations. This removes the call to WebWidget::didExitCompositingMode. R=enne BUG=366130,266666 Review URL: https://codereview.chromium.org/256573003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266089 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test')
-rw-r--r--cc/test/fake_layer_tree_host_client.h2
-rw-r--r--cc/test/layer_tree_test.cc4
-rw-r--r--cc/test/layer_tree_test.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/cc/test/fake_layer_tree_host_client.h b/cc/test/fake_layer_tree_host_client.h
index 1b0ec1f..f928453 100644
--- a/cc/test/fake_layer_tree_host_client.h
+++ b/cc/test/fake_layer_tree_host_client.h
@@ -35,7 +35,7 @@ class FakeLayerTreeHostClient : public LayerTreeHostClient,
float page_scale) OVERRIDE {}
virtual scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback) OVERRIDE;
- virtual void DidInitializeOutputSurface(bool success) OVERRIDE {}
+ virtual void DidInitializeOutputSurface() OVERRIDE {}
virtual void WillCommit() OVERRIDE {}
virtual void DidCommit() OVERRIDE {}
virtual void DidCommitAndDrawFrame() OVERRIDE {}
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index f67ee7c..23b5276 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -240,8 +240,8 @@ class LayerTreeHostClientForTesting : public LayerTreeHostClient,
return test_hooks_->CreateOutputSurface(fallback);
}
- virtual void DidInitializeOutputSurface(bool succeeded) OVERRIDE {
- test_hooks_->DidInitializeOutputSurface(succeeded);
+ virtual void DidInitializeOutputSurface() OVERRIDE {
+ test_hooks_->DidInitializeOutputSurface();
}
virtual void DidFailToInitializeOutputSurface() OVERRIDE {
diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h
index 42ef53f..a4a32d2 100644
--- a/cc/test/layer_tree_test.h
+++ b/cc/test/layer_tree_test.h
@@ -64,7 +64,7 @@ class TestHooks : public AnimationDelegate {
virtual void WillBeginMainFrame() {}
virtual void DidBeginMainFrame() {}
virtual void Layout() {}
- virtual void DidInitializeOutputSurface(bool succeeded) {}
+ virtual void DidInitializeOutputSurface() {}
virtual void DidFailToInitializeOutputSurface() {}
virtual void DidAddAnimation() {}
virtual void WillCommit() {}