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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/gpu/render_widget_compositor.h" 5 #include "content/renderer/gpu/render_widget_compositor.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 } 513 }
514 514
515 bool RenderWidgetCompositor::SendMessageToMicroBenchmark( 515 bool RenderWidgetCompositor::SendMessageToMicroBenchmark(
516 int id, 516 int id,
517 scoped_ptr<base::Value> value) { 517 scoped_ptr<base::Value> value) {
518 return layer_tree_host_->SendMessageToMicroBenchmark(id, value.Pass()); 518 return layer_tree_host_->SendMessageToMicroBenchmark(id, value.Pass());
519 } 519 }
520 520
521 void RenderWidgetCompositor::Initialize(cc::LayerTreeSettings settings) { 521 void RenderWidgetCompositor::Initialize(cc::LayerTreeSettings settings) {
522 scoped_refptr<base::MessageLoopProxy> compositor_message_loop_proxy; 522 scoped_refptr<base::MessageLoopProxy> compositor_message_loop_proxy;
523 scoped_refptr<base::SingleThreadTaskRunner>
524 main_thread_compositor_task_runner(base::MessageLoopProxy::current());
525 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 523 RenderThreadImpl* render_thread = RenderThreadImpl::current();
526 cc::SharedBitmapManager* shared_bitmap_manager = NULL; 524 cc::SharedBitmapManager* shared_bitmap_manager = NULL;
527 // render_thread may be NULL in tests. 525 // render_thread may be NULL in tests.
528 if (render_thread) { 526 if (render_thread) {
529 compositor_message_loop_proxy = 527 compositor_message_loop_proxy =
530 render_thread->compositor_message_loop_proxy(); 528 render_thread->compositor_message_loop_proxy();
531 shared_bitmap_manager = render_thread->shared_bitmap_manager(); 529 shared_bitmap_manager = render_thread->shared_bitmap_manager();
532 main_thread_compositor_task_runner =
533 render_thread->main_thread_compositor_task_runner();
534 } 530 }
535 if (compositor_message_loop_proxy.get()) { 531 if (compositor_message_loop_proxy.get()) {
536 layer_tree_host_ = 532 layer_tree_host_ = cc::LayerTreeHost::CreateThreaded(
537 cc::LayerTreeHost::CreateThreaded(this, 533 this,
538 shared_bitmap_manager, 534 shared_bitmap_manager,
539 settings, 535 settings,
540 main_thread_compositor_task_runner, 536 base::MessageLoopProxy::current(),
541 compositor_message_loop_proxy); 537 compositor_message_loop_proxy);
542 } else { 538 } else {
543 layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded( 539 layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded(
544 this, 540 this,
545 this, 541 this,
546 shared_bitmap_manager, 542 shared_bitmap_manager,
547 settings, 543 settings,
548 main_thread_compositor_task_runner); 544 base::MessageLoopProxy::current());
549 } 545 }
550 DCHECK(layer_tree_host_); 546 DCHECK(layer_tree_host_);
551 } 547 }
552 548
553 void RenderWidgetCompositor::setSurfaceReady() { 549 void RenderWidgetCompositor::setSurfaceReady() {
554 layer_tree_host_->SetLayerTreeHostClientReady(); 550 layer_tree_host_->SetLayerTreeHostClientReady();
555 } 551 }
556 552
557 void RenderWidgetCompositor::setRootLayer(const blink::WebLayer& layer) { 553 void RenderWidgetCompositor::setRootLayer(const blink::WebLayer& layer) {
558 layer_tree_host_->SetRootLayer( 554 layer_tree_host_->SetRootLayer(
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
821 widget_->OnSwapBuffersAborted(); 817 widget_->OnSwapBuffersAborted();
822 } 818 }
823 819
824 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() { 820 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() {
825 cc::ContextProvider* provider = 821 cc::ContextProvider* provider =
826 RenderThreadImpl::current()->SharedMainThreadContextProvider().get(); 822 RenderThreadImpl::current()->SharedMainThreadContextProvider().get();
827 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM(); 823 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM();
828 } 824 }
829 825
830 } // namespace content 826 } // namespace content
OLDNEW
« 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