diff options
Diffstat (limited to 'content/renderer/gpu')
-rw-r--r-- | content/renderer/gpu/render_widget_compositor.cc | 7 | ||||
-rw-r--r-- | content/renderer/gpu/render_widget_compositor.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc index 90ae2fe..2588050 100644 --- a/content/renderer/gpu/render_widget_compositor.cc +++ b/content/renderer/gpu/render_widget_compositor.cc @@ -281,8 +281,7 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create( } #endif - if (!compositor->Initialize(settings)) - return scoped_ptr<RenderWidgetCompositor>(); + compositor->Initialize(settings); return compositor.Pass(); } @@ -390,7 +389,7 @@ bool RenderWidgetCompositor::ScheduleMicroBenchmark( return layer_tree_host_->ScheduleMicroBenchmark(name, value.Pass(), callback); } -bool RenderWidgetCompositor::Initialize(cc::LayerTreeSettings settings) { +void 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()) { @@ -400,7 +399,7 @@ bool RenderWidgetCompositor::Initialize(cc::LayerTreeSettings settings) { layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded( this, this, NULL, settings); } - return layer_tree_host_; + DCHECK(layer_tree_host_); } void RenderWidgetCompositor::setSurfaceReady() { diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h index 941fe31..5e4cadf 100644 --- a/content/renderer/gpu/render_widget_compositor.h +++ b/content/renderer/gpu/render_widget_compositor.h @@ -144,7 +144,7 @@ class RenderWidgetCompositor : public blink::WebLayerTreeView, private: RenderWidgetCompositor(RenderWidget* widget, bool threaded); - bool Initialize(cc::LayerTreeSettings settings); + void Initialize(cc::LayerTreeSettings settings); bool threaded_; bool suppress_schedule_composite_; |