| 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 860 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 871 params.parent_window, | 871 params.parent_window, |
| 872 MSG_ROUTING_NONE, | 872 MSG_ROUTING_NONE, |
| 873 params.renderer_preferences, | 873 params.renderer_preferences, |
| 874 params.web_preferences, | 874 params.web_preferences, |
| 875 new SharedRenderViewCounter(0), | 875 new SharedRenderViewCounter(0), |
| 876 params.view_id, | 876 params.view_id, |
| 877 params.surface_id, | 877 params.surface_id, |
| 878 params.session_storage_namespace_id, | 878 params.session_storage_namespace_id, |
| 879 params.frame_name, | 879 params.frame_name, |
| 880 params.next_page_id, | 880 params.next_page_id, |
| 881 params.screen_info); | 881 params.screen_info, |
| 882 params.guest); |
| 882 } | 883 } |
| 883 | 884 |
| 884 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( | 885 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( |
| 885 content::CauseForGpuLaunch cause_for_gpu_launch) { | 886 content::CauseForGpuLaunch cause_for_gpu_launch) { |
| 886 if (gpu_channel_.get()) { | 887 if (gpu_channel_.get()) { |
| 887 // Do nothing if we already have a GPU channel or are already | 888 // Do nothing if we already have a GPU channel or are already |
| 888 // establishing one. | 889 // establishing one. |
| 889 if (gpu_channel_->state() == GpuChannelHost::kUnconnected || | 890 if (gpu_channel_->state() == GpuChannelHost::kUnconnected || |
| 890 gpu_channel_->state() == GpuChannelHost::kConnected) | 891 gpu_channel_->state() == GpuChannelHost::kConnected) |
| 891 return GetGpuChannel(); | 892 return GetGpuChannel(); |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 959 | 960 |
| 960 scoped_refptr<base::MessageLoopProxy> | 961 scoped_refptr<base::MessageLoopProxy> |
| 961 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 962 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
| 962 DCHECK(message_loop() == MessageLoop::current()); | 963 DCHECK(message_loop() == MessageLoop::current()); |
| 963 if (!file_thread_.get()) { | 964 if (!file_thread_.get()) { |
| 964 file_thread_.reset(new base::Thread("Renderer::FILE")); | 965 file_thread_.reset(new base::Thread("Renderer::FILE")); |
| 965 file_thread_->Start(); | 966 file_thread_->Start(); |
| 966 } | 967 } |
| 967 return file_thread_->message_loop_proxy(); | 968 return file_thread_->message_loop_proxy(); |
| 968 } | 969 } |
| OLD | NEW |