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 746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
757 RenderViewImpl::Create( | 757 RenderViewImpl::Create( |
758 params.parent_window, | 758 params.parent_window, |
759 MSG_ROUTING_NONE, | 759 MSG_ROUTING_NONE, |
760 params.renderer_preferences, | 760 params.renderer_preferences, |
761 params.web_preferences, | 761 params.web_preferences, |
762 new SharedRenderViewCounter(0), | 762 new SharedRenderViewCounter(0), |
763 params.view_id, | 763 params.view_id, |
764 params.surface_id, | 764 params.surface_id, |
765 params.session_storage_namespace_id, | 765 params.session_storage_namespace_id, |
766 params.frame_name, | 766 params.frame_name, |
767 params.next_page_id); | 767 params.next_page_id, |
| 768 params.screen_info); |
768 } | 769 } |
769 | 770 |
770 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( | 771 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( |
771 content::CauseForGpuLaunch cause_for_gpu_launch) { | 772 content::CauseForGpuLaunch cause_for_gpu_launch) { |
772 if (gpu_channel_.get()) { | 773 if (gpu_channel_.get()) { |
773 // Do nothing if we already have a GPU channel or are already | 774 // Do nothing if we already have a GPU channel or are already |
774 // establishing one. | 775 // establishing one. |
775 if (gpu_channel_->state() == GpuChannelHost::kUnconnected || | 776 if (gpu_channel_->state() == GpuChannelHost::kUnconnected || |
776 gpu_channel_->state() == GpuChannelHost::kConnected) | 777 gpu_channel_->state() == GpuChannelHost::kConnected) |
777 return GetGpuChannel(); | 778 return GetGpuChannel(); |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
849 | 850 |
850 scoped_refptr<base::MessageLoopProxy> | 851 scoped_refptr<base::MessageLoopProxy> |
851 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 852 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
852 DCHECK(message_loop() == MessageLoop::current()); | 853 DCHECK(message_loop() == MessageLoop::current()); |
853 if (!file_thread_.get()) { | 854 if (!file_thread_.get()) { |
854 file_thread_.reset(new base::Thread("Renderer::FILE")); | 855 file_thread_.reset(new base::Thread("Renderer::FILE")); |
855 file_thread_->Start(); | 856 file_thread_->Start(); |
856 } | 857 } |
857 return file_thread_->message_loop_proxy(); | 858 return file_thread_->message_loop_proxy(); |
858 } | 859 } |
OLD | NEW |