| Index: content/renderer/gpu/render_widget_compositor.cc
|
| diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
|
| index bc4d6528d7fee456754b8c2c484c32b8352514e2..ec12089c04a51c2ddd93dda05368ba100edb341a 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.cc
|
| +++ b/content/renderer/gpu/render_widget_compositor.cc
|
| @@ -279,7 +279,8 @@
|
| }
|
| #endif
|
|
|
| - compositor->Initialize(settings);
|
| + if (!compositor->Initialize(settings))
|
| + return scoped_ptr<RenderWidgetCompositor>();
|
|
|
| return compositor.Pass();
|
| }
|
| @@ -386,7 +387,7 @@
|
| return layer_tree_host_->ScheduleMicroBenchmark(name, value.Pass(), callback);
|
| }
|
|
|
| -void RenderWidgetCompositor::Initialize(cc::LayerTreeSettings settings) {
|
| +bool RenderWidgetCompositor::Initialize(cc::LayerTreeSettings settings) {
|
| scoped_refptr<base::MessageLoopProxy> compositor_message_loop_proxy =
|
| RenderThreadImpl::current()->compositor_message_loop_proxy();
|
| if (compositor_message_loop_proxy.get()) {
|
| @@ -396,7 +397,7 @@
|
| layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded(
|
| this, this, NULL, settings);
|
| }
|
| - DCHECK(layer_tree_host_);
|
| + return layer_tree_host_;
|
| }
|
|
|
| void RenderWidgetCompositor::setSurfaceReady() {
|
|
|