diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-25 02:33:45 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-25 02:33:45 +0000 |
| commit | da8e3b72ba4c8d1d35c92217ddad7f86a810e210 (patch) | |
| tree | a2092182f652a893859df064aae41a5d931e9860 /mojo/examples/compositor_app | |
| parent | 1fec713d518f340a81bd837b86a290004407a9a7 (diff) | |
| download | chromium_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 'mojo/examples/compositor_app')
| -rw-r--r-- | mojo/examples/compositor_app/compositor_host.cc | 3 | ||||
| -rw-r--r-- | mojo/examples/compositor_app/compositor_host.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mojo/examples/compositor_app/compositor_host.cc b/mojo/examples/compositor_app/compositor_host.cc index 5a8877b..87534ed 100644 --- a/mojo/examples/compositor_app/compositor_host.cc +++ b/mojo/examples/compositor_app/compositor_host.cc @@ -76,7 +76,8 @@ scoped_ptr<cc::OutputSurface> CompositorHost::CreateOutputSurface( new cc::OutputSurface(new MojoContextProvider(gl_pipe_.Pass()))); } -void CompositorHost::DidInitializeOutputSurface(bool success) {} +void CompositorHost::DidInitializeOutputSurface() { +} void CompositorHost::WillCommit() {} void CompositorHost::DidCommit() {} diff --git a/mojo/examples/compositor_app/compositor_host.h b/mojo/examples/compositor_app/compositor_host.h index cd87186..ed8004f 100644 --- a/mojo/examples/compositor_app/compositor_host.h +++ b/mojo/examples/compositor_app/compositor_host.h @@ -37,7 +37,7 @@ class CompositorHost : public cc::LayerTreeHostClient { float page_scale) OVERRIDE; virtual scoped_ptr<cc::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; |