Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(366)

Unified Diff: trunk/src/content/renderer/gpu/render_widget_compositor.cc

Issue 488273004: Revert 290845 "Forward input and compositing tasks to the Blink ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/content/content_tests.gypi ('k') | trunk/src/content/renderer/input/input_event_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/renderer/gpu/render_widget_compositor.cc
===================================================================
--- trunk/src/content/renderer/gpu/render_widget_compositor.cc (revision 290956)
+++ trunk/src/content/renderer/gpu/render_widget_compositor.cc (working copy)
@@ -520,8 +520,6 @@
void RenderWidgetCompositor::Initialize(cc::LayerTreeSettings settings) {
scoped_refptr<base::MessageLoopProxy> compositor_message_loop_proxy;
- scoped_refptr<base::SingleThreadTaskRunner>
- main_thread_compositor_task_runner(base::MessageLoopProxy::current());
RenderThreadImpl* render_thread = RenderThreadImpl::current();
cc::SharedBitmapManager* shared_bitmap_manager = NULL;
// render_thread may be NULL in tests.
@@ -529,23 +527,21 @@
compositor_message_loop_proxy =
render_thread->compositor_message_loop_proxy();
shared_bitmap_manager = render_thread->shared_bitmap_manager();
- main_thread_compositor_task_runner =
- render_thread->main_thread_compositor_task_runner();
}
if (compositor_message_loop_proxy.get()) {
- layer_tree_host_ =
- cc::LayerTreeHost::CreateThreaded(this,
- shared_bitmap_manager,
- settings,
- main_thread_compositor_task_runner,
- compositor_message_loop_proxy);
+ layer_tree_host_ = cc::LayerTreeHost::CreateThreaded(
+ this,
+ shared_bitmap_manager,
+ settings,
+ base::MessageLoopProxy::current(),
+ compositor_message_loop_proxy);
} else {
layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded(
this,
this,
shared_bitmap_manager,
settings,
- main_thread_compositor_task_runner);
+ base::MessageLoopProxy::current());
}
DCHECK(layer_tree_host_);
}
« no previous file with comments | « trunk/src/content/content_tests.gypi ('k') | trunk/src/content/renderer/input/input_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698