| 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 852 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 863 params.parent_window, | 863 params.parent_window, |
| 864 MSG_ROUTING_NONE, | 864 MSG_ROUTING_NONE, |
| 865 params.renderer_preferences, | 865 params.renderer_preferences, |
| 866 params.web_preferences, | 866 params.web_preferences, |
| 867 new SharedRenderViewCounter(0), | 867 new SharedRenderViewCounter(0), |
| 868 params.view_id, | 868 params.view_id, |
| 869 params.surface_id, | 869 params.surface_id, |
| 870 params.session_storage_namespace_id, | 870 params.session_storage_namespace_id, |
| 871 params.frame_name, | 871 params.frame_name, |
| 872 params.next_page_id, | 872 params.next_page_id, |
| 873 params.screen_info); | 873 params.screen_info, |
| 874 params.guest); |
| 874 } | 875 } |
| 875 | 876 |
| 876 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( | 877 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( |
| 877 content::CauseForGpuLaunch cause_for_gpu_launch) { | 878 content::CauseForGpuLaunch cause_for_gpu_launch) { |
| 878 if (gpu_channel_.get()) { | 879 if (gpu_channel_.get()) { |
| 879 // Do nothing if we already have a GPU channel or are already | 880 // Do nothing if we already have a GPU channel or are already |
| 880 // establishing one. | 881 // establishing one. |
| 881 if (gpu_channel_->state() == GpuChannelHost::kUnconnected || | 882 if (gpu_channel_->state() == GpuChannelHost::kUnconnected || |
| 882 gpu_channel_->state() == GpuChannelHost::kConnected) | 883 gpu_channel_->state() == GpuChannelHost::kConnected) |
| 883 return GetGpuChannel(); | 884 return GetGpuChannel(); |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 964 | 965 |
| 965 scoped_refptr<base::MessageLoopProxy> | 966 scoped_refptr<base::MessageLoopProxy> |
| 966 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 967 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
| 967 DCHECK(message_loop() == MessageLoop::current()); | 968 DCHECK(message_loop() == MessageLoop::current()); |
| 968 if (!file_thread_.get()) { | 969 if (!file_thread_.get()) { |
| 969 file_thread_.reset(new base::Thread("Renderer::FILE")); | 970 file_thread_.reset(new base::Thread("Renderer::FILE")); |
| 970 file_thread_->Start(); | 971 file_thread_->Start(); |
| 971 } | 972 } |
| 972 return file_thread_->message_loop_proxy(); | 973 return file_thread_->message_loop_proxy(); |
| 973 } | 974 } |
| OLD | NEW |