OLD | NEW |
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 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
518 RenderThreadImpl* render_thread = RenderThreadImpl::current(); | 518 RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
519 cc::SharedBitmapManager* shared_bitmap_manager = NULL; | 519 cc::SharedBitmapManager* shared_bitmap_manager = NULL; |
520 // render_thread may be NULL in tests. | 520 // render_thread may be NULL in tests. |
521 if (render_thread) { | 521 if (render_thread) { |
522 compositor_message_loop_proxy = | 522 compositor_message_loop_proxy = |
523 render_thread->compositor_message_loop_proxy(); | 523 render_thread->compositor_message_loop_proxy(); |
524 shared_bitmap_manager = render_thread->shared_bitmap_manager(); | 524 shared_bitmap_manager = render_thread->shared_bitmap_manager(); |
525 } | 525 } |
526 if (compositor_message_loop_proxy.get()) { | 526 if (compositor_message_loop_proxy.get()) { |
527 layer_tree_host_ = cc::LayerTreeHost::CreateThreaded( | 527 layer_tree_host_ = cc::LayerTreeHost::CreateThreaded( |
528 this, shared_bitmap_manager, settings, compositor_message_loop_proxy); | 528 this, |
| 529 shared_bitmap_manager, |
| 530 settings, |
| 531 base::MessageLoopProxy::current(), |
| 532 compositor_message_loop_proxy); |
529 } else { | 533 } else { |
530 layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded( | 534 layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded( |
531 this, this, shared_bitmap_manager, settings); | 535 this, |
| 536 this, |
| 537 shared_bitmap_manager, |
| 538 settings, |
| 539 base::MessageLoopProxy::current()); |
532 } | 540 } |
533 DCHECK(layer_tree_host_); | 541 DCHECK(layer_tree_host_); |
534 } | 542 } |
535 | 543 |
536 void RenderWidgetCompositor::setSurfaceReady() { | 544 void RenderWidgetCompositor::setSurfaceReady() { |
537 layer_tree_host_->SetLayerTreeHostClientReady(); | 545 layer_tree_host_->SetLayerTreeHostClientReady(); |
538 } | 546 } |
539 | 547 |
540 void RenderWidgetCompositor::setRootLayer(const blink::WebLayer& layer) { | 548 void RenderWidgetCompositor::setRootLayer(const blink::WebLayer& layer) { |
541 layer_tree_host_->SetRootLayer( | 549 layer_tree_host_->SetRootLayer( |
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
802 widget_->OnSwapBuffersAborted(); | 810 widget_->OnSwapBuffersAborted(); |
803 } | 811 } |
804 | 812 |
805 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() { | 813 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() { |
806 cc::ContextProvider* provider = | 814 cc::ContextProvider* provider = |
807 RenderThreadImpl::current()->SharedMainThreadContextProvider().get(); | 815 RenderThreadImpl::current()->SharedMainThreadContextProvider().get(); |
808 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM(); | 816 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM(); |
809 } | 817 } |
810 | 818 |
811 } // namespace content | 819 } // namespace content |
OLD | NEW |