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_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
732 | 732 |
733 RenderFrameProxy* proxy = NULL; | 733 RenderFrameProxy* proxy = NULL; |
734 if (params.proxy_routing_id != MSG_ROUTING_NONE) { | 734 if (params.proxy_routing_id != MSG_ROUTING_NONE) { |
735 CHECK(params.swapped_out); | 735 CHECK(params.swapped_out); |
736 proxy = RenderFrameProxy::CreateProxyToReplaceFrame( | 736 proxy = RenderFrameProxy::CreateProxyToReplaceFrame( |
737 main_render_frame_.get(), params.proxy_routing_id); | 737 main_render_frame_.get(), params.proxy_routing_id); |
738 main_render_frame_->set_render_frame_proxy(proxy); | 738 main_render_frame_->set_render_frame_proxy(proxy); |
739 } | 739 } |
740 | 740 |
741 // In --site-per-process, just use the WebRemoteFrame as the main frame. | 741 // In --site-per-process, just use the WebRemoteFrame as the main frame. |
742 if (command_line.HasSwitch(switches::kSitePerProcess) && proxy) { | 742 // Note that we don't do that for guests because postMessage to guest will |
743 // break; | |
Charlie Reis
2015/04/30 23:06:47
nit: Period, not semicolon. :)
But it also sound
lazyboy
2015/05/05 07:28:15
This is reverted as I'm not creating the proxy on
| |
744 if (command_line.HasSwitch(switches::kSitePerProcess) && | |
745 !params.is_guest && proxy) { | |
743 webview()->setMainFrame(proxy->web_frame()); | 746 webview()->setMainFrame(proxy->web_frame()); |
744 // Initialize the WebRemoteFrame with information replicated from the | 747 // Initialize the WebRemoteFrame with information replicated from the |
745 // browser process. | 748 // browser process. |
746 proxy->SetReplicatedState(params.replicated_frame_state); | 749 proxy->SetReplicatedState(params.replicated_frame_state); |
747 } else { | 750 } else { |
748 webview()->setMainFrame(main_render_frame_->GetWebFrame()); | 751 webview()->setMainFrame(main_render_frame_->GetWebFrame()); |
749 } | 752 } |
750 main_render_frame_->Initialize(); | 753 main_render_frame_->Initialize(); |
751 | 754 |
752 if (switches::IsTouchDragDropEnabled()) | 755 if (switches::IsTouchDragDropEnabled()) |
(...skipping 3016 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3769 std::vector<gfx::Size> sizes; | 3772 std::vector<gfx::Size> sizes; |
3770 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3773 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
3771 if (!url.isEmpty()) | 3774 if (!url.isEmpty()) |
3772 urls.push_back( | 3775 urls.push_back( |
3773 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3776 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
3774 } | 3777 } |
3775 SendUpdateFaviconURL(urls); | 3778 SendUpdateFaviconURL(urls); |
3776 } | 3779 } |
3777 | 3780 |
3778 } // namespace content | 3781 } // namespace content |
OLD | NEW |