| 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 2e44518ee039b19935f99866f217352e726b7cb4..f6e99e7a168efcaa158ded165538e88e0a99a189 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.cc
|
| +++ b/content/renderer/gpu/render_widget_compositor.cc
|
| @@ -307,8 +307,7 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
|
| }
|
| #endif
|
|
|
| - if (!compositor->Initialize(settings))
|
| - return scoped_ptr<RenderWidgetCompositor>();
|
| + compositor->Initialize(settings);
|
|
|
| return compositor.Pass();
|
| }
|
| @@ -413,7 +412,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()) {
|
| @@ -423,11 +422,11 @@ 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() {
|
| - layer_tree_host_->SetLayerTreeHostClientReady();
|
| + layer_tree_host_->SetLayerTreeHostClientReady(CreateOutputSurface(false));
|
| }
|
|
|
| void RenderWidgetCompositor::setRootLayer(const blink::WebLayer& layer) {
|
|
|