diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-09 04:07:27 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-09 04:07:27 +0000 |
| commit | c9993a8efcedce141194908db2201a06a4a08970 (patch) | |
| tree | 01d405229b4f21e2ab247878a29af9b7109388bf /content | |
| parent | 9c2ccfc62562a4010f53ede5d06126f795730777 (diff) | |
| download | chromium_src-c9993a8efcedce141194908db2201a06a4a08970.zip chromium_src-c9993a8efcedce141194908db2201a06a4a08970.tar.gz chromium_src-c9993a8efcedce141194908db2201a06a4a08970.tar.bz2 | |
Restore software compositing + thread assert on Aura
This essentially reverts r215981, modulo rebase.
BUG=268439
Review URL: https://chromiumcodereview.appspot.com/22382004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216565 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/aura/gpu_process_transport_factory.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/content/browser/aura/gpu_process_transport_factory.cc b/content/browser/aura/gpu_process_transport_factory.cc index 8822e85..4a047c6 100644 --- a/content/browser/aura/gpu_process_transport_factory.cc +++ b/content/browser/aura/gpu_process_transport_factory.cc @@ -232,6 +232,11 @@ scoped_ptr<cc::OutputSurface> GpuProcessTransportFactory::CreateOutputSurface( CreateContextCommon(data->swap_client->AsWeakPtr(), data->surface_id); } if (!context) { + if (ui::Compositor::WasInitializedWithThread()) { + LOG(FATAL) << "Failed to create UI context, but can't use software " + " compositing with browser threaded compositing. Aborting."; + } + scoped_ptr<SoftwareBrowserCompositorOutputSurface> surface = SoftwareBrowserCompositorOutputSurface::Create( CreateSoftwareOutputDevice(compositor)); |