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 741 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
752 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { | 752 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { |
753 EnsureWebKitInitialized(); | 753 EnsureWebKitInitialized(); |
754 // When bringing in render_view, also bring in webkit's glue and jsbindings. | 754 // When bringing in render_view, also bring in webkit's glue and jsbindings. |
755 RenderViewImpl::Create( | 755 RenderViewImpl::Create( |
756 params.parent_window, | 756 params.parent_window, |
757 MSG_ROUTING_NONE, | 757 MSG_ROUTING_NONE, |
758 params.renderer_preferences, | 758 params.renderer_preferences, |
759 params.web_preferences, | 759 params.web_preferences, |
760 new SharedRenderViewCounter(0), | 760 new SharedRenderViewCounter(0), |
761 params.view_id, | 761 params.view_id, |
| 762 params.surface_id, |
762 params.session_storage_namespace_id, | 763 params.session_storage_namespace_id, |
763 params.frame_name, | 764 params.frame_name, |
764 params.next_page_id); | 765 params.next_page_id); |
765 } | 766 } |
766 | 767 |
767 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( | 768 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( |
768 content::CauseForGpuLaunch cause_for_gpu_launch) { | 769 content::CauseForGpuLaunch cause_for_gpu_launch) { |
769 if (gpu_channel_.get()) { | 770 if (gpu_channel_.get()) { |
770 // Do nothing if we already have a GPU channel or are already | 771 // Do nothing if we already have a GPU channel or are already |
771 // establishing one. | 772 // establishing one. |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
846 | 847 |
847 scoped_refptr<base::MessageLoopProxy> | 848 scoped_refptr<base::MessageLoopProxy> |
848 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 849 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
849 DCHECK(message_loop() == MessageLoop::current()); | 850 DCHECK(message_loop() == MessageLoop::current()); |
850 if (!file_thread_.get()) { | 851 if (!file_thread_.get()) { |
851 file_thread_.reset(new base::Thread("Renderer::FILE")); | 852 file_thread_.reset(new base::Thread("Renderer::FILE")); |
852 file_thread_->Start(); | 853 file_thread_->Start(); |
853 } | 854 } |
854 return file_thread_->message_loop_proxy(); | 855 return file_thread_->message_loop_proxy(); |
855 } | 856 } |
OLD | NEW |