OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 738 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
749 web_colors[i] = it->second; | 749 web_colors[i] = it->second; |
750 } | 750 } |
751 WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors); | 751 WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors); |
752 } | 752 } |
753 | 753 |
754 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { | 754 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { |
755 EnsureWebKitInitialized(); | 755 EnsureWebKitInitialized(); |
756 // When bringing in render_view, also bring in webkit's glue and jsbindings. | 756 // When bringing in render_view, also bring in webkit's glue and jsbindings. |
757 RenderViewImpl::Create( | 757 RenderViewImpl::Create( |
758 params.parent_window, | 758 params.parent_window, |
759 MSG_ROUTING_NONE, | 759 params.opener_route_id, |
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.session_storage_namespace_id, | 764 params.session_storage_namespace_id, |
765 params.frame_name, | 765 params.frame_name, |
| 766 false, |
766 params.next_page_id); | 767 params.next_page_id); |
767 } | 768 } |
768 | 769 |
769 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( | 770 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( |
770 content::CauseForGpuLaunch cause_for_gpu_launch) { | 771 content::CauseForGpuLaunch cause_for_gpu_launch) { |
771 if (gpu_channel_.get()) { | 772 if (gpu_channel_.get()) { |
772 // Do nothing if we already have a GPU channel or are already | 773 // Do nothing if we already have a GPU channel or are already |
773 // establishing one. | 774 // establishing one. |
774 if (gpu_channel_->state() == GpuChannelHost::kUnconnected || | 775 if (gpu_channel_->state() == GpuChannelHost::kUnconnected || |
775 gpu_channel_->state() == GpuChannelHost::kConnected) | 776 gpu_channel_->state() == GpuChannelHost::kConnected) |
(...skipping 70 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 |