summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content/browser/aura/gpu_process_transport_factory.cc5
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));