| 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 96a74c6d06fa30c0c9d76bd51fe06aa21e5cc88f..399c2482b0eaea85617a959e8dea6b65ae20d994 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.cc
|
| +++ b/content/renderer/gpu/render_widget_compositor.cc
|
| @@ -25,6 +25,7 @@
|
| #include "cc/output/copy_output_result.h"
|
| #include "cc/resources/single_release_callback.h"
|
| #include "cc/trees/layer_tree_host.h"
|
| +#include "cc/trees/main_thread_task_runner.h"
|
| #include "content/child/child_shared_bitmap_manager.h"
|
| #include "content/common/content_switches_internal.h"
|
| #include "content/common/gpu/client/context_provider_command_buffer.h"
|
| @@ -34,9 +35,11 @@
|
| #include "content/renderer/render_thread_impl.h"
|
| #include "gpu/command_buffer/client/gles2_interface.h"
|
| #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallback.h"
|
| +#include "third_party/WebKit/public/platform/WebScheduler.h"
|
| #include "third_party/WebKit/public/platform/WebSelectionBound.h"
|
| #include "third_party/WebKit/public/platform/WebSize.h"
|
| #include "third_party/WebKit/public/web/WebWidget.h"
|
| +
|
| #include "ui/gfx/frame_time.h"
|
| #include "ui/gl/gl_switches.h"
|
| #include "ui/native_theme/native_theme_switches.h"
|
| @@ -525,10 +528,13 @@ void RenderWidgetCompositor::Initialize(cc::LayerTreeSettings settings) {
|
| }
|
| if (compositor_message_loop_proxy.get()) {
|
| layer_tree_host_ = cc::LayerTreeHost::CreateThreaded(
|
| - this, shared_bitmap_manager, settings, compositor_message_loop_proxy);
|
| + this, shared_bitmap_manager, settings,
|
| + render_thread->main_thread_task_runner(),
|
| + compositor_message_loop_proxy);
|
| } else {
|
| layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded(
|
| - this, this, shared_bitmap_manager, settings);
|
| + this, this, shared_bitmap_manager, settings,
|
| + render_thread->main_thread_task_runner());
|
| }
|
| DCHECK(layer_tree_host_);
|
| }
|
|
|