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 887 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
898 web_colors[i] = it->second; | 898 web_colors[i] = it->second; |
899 } | 899 } |
900 WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors); | 900 WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors); |
901 } | 901 } |
902 | 902 |
903 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { | 903 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { |
904 EnsureWebKitInitialized(); | 904 EnsureWebKitInitialized(); |
905 // When bringing in render_view, also bring in webkit's glue and jsbindings. | 905 // When bringing in render_view, also bring in webkit's glue and jsbindings. |
906 RenderViewImpl::Create( | 906 RenderViewImpl::Create( |
907 params.parent_window, | 907 params.parent_window, |
908 MSG_ROUTING_NONE, | 908 params.opener_route_id, |
909 params.renderer_preferences, | 909 params.renderer_preferences, |
910 params.web_preferences, | 910 params.web_preferences, |
911 new SharedRenderViewCounter(0), | 911 new SharedRenderViewCounter(0), |
912 params.view_id, | 912 params.view_id, |
913 params.surface_id, | 913 params.surface_id, |
914 params.session_storage_namespace_id, | 914 params.session_storage_namespace_id, |
915 params.frame_name, | 915 params.frame_name, |
| 916 false, |
| 917 params.swapped_out, |
916 params.next_page_id, | 918 params.next_page_id, |
917 params.screen_info, | 919 params.screen_info, |
918 params.guest, | 920 params.guest, |
919 params.accessibility_mode); | 921 params.accessibility_mode); |
920 } | 922 } |
921 | 923 |
922 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( | 924 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( |
923 content::CauseForGpuLaunch cause_for_gpu_launch) { | 925 content::CauseForGpuLaunch cause_for_gpu_launch) { |
924 if (gpu_channel_.get()) { | 926 if (gpu_channel_.get()) { |
925 // Do nothing if we already have a GPU channel or are already | 927 // Do nothing if we already have a GPU channel or are already |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1007 | 1009 |
1008 scoped_refptr<base::MessageLoopProxy> | 1010 scoped_refptr<base::MessageLoopProxy> |
1009 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 1011 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
1010 DCHECK(message_loop() == MessageLoop::current()); | 1012 DCHECK(message_loop() == MessageLoop::current()); |
1011 if (!file_thread_.get()) { | 1013 if (!file_thread_.get()) { |
1012 file_thread_.reset(new base::Thread("Renderer::FILE")); | 1014 file_thread_.reset(new base::Thread("Renderer::FILE")); |
1013 file_thread_->Start(); | 1015 file_thread_->Start(); |
1014 } | 1016 } |
1015 return file_thread_->message_loop_proxy(); | 1017 return file_thread_->message_loop_proxy(); |
1016 } | 1018 } |
OLD | NEW |