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