| 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 874 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 885 MSG_ROUTING_NONE, | 885 MSG_ROUTING_NONE, |
| 886 params.renderer_preferences, | 886 params.renderer_preferences, |
| 887 params.web_preferences, | 887 params.web_preferences, |
| 888 new SharedRenderViewCounter(0), | 888 new SharedRenderViewCounter(0), |
| 889 params.view_id, | 889 params.view_id, |
| 890 params.surface_id, | 890 params.surface_id, |
| 891 params.session_storage_namespace_id, | 891 params.session_storage_namespace_id, |
| 892 params.frame_name, | 892 params.frame_name, |
| 893 params.next_page_id, | 893 params.next_page_id, |
| 894 params.screen_info, | 894 params.screen_info, |
| 895 params.guest); | 895 params.guest, |
| 896 params.accessibility_mode); |
| 896 } | 897 } |
| 897 | 898 |
| 898 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( | 899 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( |
| 899 content::CauseForGpuLaunch cause_for_gpu_launch) { | 900 content::CauseForGpuLaunch cause_for_gpu_launch) { |
| 900 if (gpu_channel_.get()) { | 901 if (gpu_channel_.get()) { |
| 901 // Do nothing if we already have a GPU channel or are already | 902 // Do nothing if we already have a GPU channel or are already |
| 902 // establishing one. | 903 // establishing one. |
| 903 if (gpu_channel_->state() == GpuChannelHost::kUnconnected || | 904 if (gpu_channel_->state() == GpuChannelHost::kUnconnected || |
| 904 gpu_channel_->state() == GpuChannelHost::kConnected) | 905 gpu_channel_->state() == GpuChannelHost::kConnected) |
| 905 return GetGpuChannel(); | 906 return GetGpuChannel(); |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 986 | 987 |
| 987 scoped_refptr<base::MessageLoopProxy> | 988 scoped_refptr<base::MessageLoopProxy> |
| 988 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 989 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
| 989 DCHECK(message_loop() == MessageLoop::current()); | 990 DCHECK(message_loop() == MessageLoop::current()); |
| 990 if (!file_thread_.get()) { | 991 if (!file_thread_.get()) { |
| 991 file_thread_.reset(new base::Thread("Renderer::FILE")); | 992 file_thread_.reset(new base::Thread("Renderer::FILE")); |
| 992 file_thread_->Start(); | 993 file_thread_->Start(); |
| 993 } | 994 } |
| 994 return file_thread_->message_loop_proxy(); | 995 return file_thread_->message_loop_proxy(); |
| 995 } | 996 } |
| OLD | NEW |