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 826 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
837 RenderViewImpl::Create( | 837 RenderViewImpl::Create( |
838 params.parent_window, | 838 params.parent_window, |
839 MSG_ROUTING_NONE, | 839 MSG_ROUTING_NONE, |
840 params.renderer_preferences, | 840 params.renderer_preferences, |
841 params.web_preferences, | 841 params.web_preferences, |
842 new SharedRenderViewCounter(0), | 842 new SharedRenderViewCounter(0), |
843 params.view_id, | 843 params.view_id, |
844 params.surface_id, | 844 params.surface_id, |
845 params.session_storage_namespace_id, | 845 params.session_storage_namespace_id, |
846 params.frame_name, | 846 params.frame_name, |
847 params.next_page_id); | 847 params.next_page_id, |
| 848 params.screen_info); |
848 } | 849 } |
849 | 850 |
850 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( | 851 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( |
851 content::CauseForGpuLaunch cause_for_gpu_launch) { | 852 content::CauseForGpuLaunch cause_for_gpu_launch) { |
852 if (gpu_channel_.get()) { | 853 if (gpu_channel_.get()) { |
853 // Do nothing if we already have a GPU channel or are already | 854 // Do nothing if we already have a GPU channel or are already |
854 // establishing one. | 855 // establishing one. |
855 if (gpu_channel_->state() == GpuChannelHost::kUnconnected || | 856 if (gpu_channel_->state() == GpuChannelHost::kUnconnected || |
856 gpu_channel_->state() == GpuChannelHost::kConnected) | 857 gpu_channel_->state() == GpuChannelHost::kConnected) |
857 return GetGpuChannel(); | 858 return GetGpuChannel(); |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
925 | 926 |
926 scoped_refptr<base::MessageLoopProxy> | 927 scoped_refptr<base::MessageLoopProxy> |
927 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 928 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
928 DCHECK(message_loop() == MessageLoop::current()); | 929 DCHECK(message_loop() == MessageLoop::current()); |
929 if (!file_thread_.get()) { | 930 if (!file_thread_.get()) { |
930 file_thread_.reset(new base::Thread("Renderer::FILE")); | 931 file_thread_.reset(new base::Thread("Renderer::FILE")); |
931 file_thread_->Start(); | 932 file_thread_->Start(); |
932 } | 933 } |
933 return file_thread_->message_loop_proxy(); | 934 return file_thread_->message_loop_proxy(); |
934 } | 935 } |
OLD | NEW |