| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 973 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 984 isolate->SetCreateHistogramFunction(CreateHistogram); | 984 isolate->SetCreateHistogramFunction(CreateHistogram); |
| 985 isolate->SetAddHistogramSampleFunction(AddHistogramSample); | 985 isolate->SetAddHistogramSampleFunction(AddHistogramSample); |
| 986 | 986 |
| 987 main_thread_compositor_task_runner_ = | 987 main_thread_compositor_task_runner_ = |
| 988 renderer_scheduler_->CompositorTaskRunner(); | 988 renderer_scheduler_->CompositorTaskRunner(); |
| 989 | 989 |
| 990 main_input_callback_.Reset( | 990 main_input_callback_.Reset( |
| 991 base::Bind(base::IgnoreResult(&RenderThreadImpl::OnMessageReceived), | 991 base::Bind(base::IgnoreResult(&RenderThreadImpl::OnMessageReceived), |
| 992 base::Unretained(this))); | 992 base::Unretained(this))); |
| 993 | 993 |
| 994 // TODO(alexclarke): Add a dedicated loading task queue | 994 SetResourceDispatchTaskQueue(renderer_scheduler_->LoadingTaskRunner()); |
| 995 SetResourceDispatchTaskQueue(renderer_scheduler_->DefaultTaskRunner()); | |
| 996 | 995 |
| 997 bool enable = !command_line.HasSwitch(switches::kDisableThreadedCompositing); | 996 bool enable = !command_line.HasSwitch(switches::kDisableThreadedCompositing); |
| 998 if (enable) { | 997 if (enable) { |
| 999 #if defined(OS_ANDROID) | 998 #if defined(OS_ANDROID) |
| 1000 if (SynchronousCompositorFactory* factory = | 999 if (SynchronousCompositorFactory* factory = |
| 1001 SynchronousCompositorFactory::GetInstance()) | 1000 SynchronousCompositorFactory::GetInstance()) |
| 1002 compositor_message_loop_proxy_ = | 1001 compositor_message_loop_proxy_ = |
| 1003 factory->GetCompositorMessageLoop(); | 1002 factory->GetCompositorMessageLoop(); |
| 1004 #endif | 1003 #endif |
| 1005 if (!compositor_message_loop_proxy_.get()) { | 1004 if (!compositor_message_loop_proxy_.get()) { |
| (...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1810 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 1809 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
| 1811 mojo::ServiceProviderPtr exposed_services) | 1810 mojo::ServiceProviderPtr exposed_services) |
| 1812 : services(services.Pass()), | 1811 : services(services.Pass()), |
| 1813 exposed_services(exposed_services.Pass()) { | 1812 exposed_services(exposed_services.Pass()) { |
| 1814 } | 1813 } |
| 1815 | 1814 |
| 1816 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() { | 1815 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() { |
| 1817 } | 1816 } |
| 1818 | 1817 |
| 1819 } // namespace content | 1818 } // namespace content |
| OLD | NEW |