Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2169)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 1312643002: Plumb opener information when creating RenderFrames and RenderFrameProxies for subframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@opener-CreateOpenerProxiesIfNeeded
Patch Set: Add NewFrameProxy plumbing and test Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 694 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 CHECK(params.swapped_out); 705 CHECK(params.swapped_out);
706 if (main_render_frame_) { 706 if (main_render_frame_) {
707 proxy = RenderFrameProxy::CreateProxyToReplaceFrame( 707 proxy = RenderFrameProxy::CreateProxyToReplaceFrame(
708 main_render_frame_, params.proxy_routing_id, 708 main_render_frame_, params.proxy_routing_id,
709 blink::WebTreeScopeType::Document); 709 blink::WebTreeScopeType::Document);
710 main_render_frame_->set_render_frame_proxy(proxy); 710 main_render_frame_->set_render_frame_proxy(proxy);
711 } else { 711 } else {
712 proxy = RenderFrameProxy::CreateFrameProxy( 712 proxy = RenderFrameProxy::CreateFrameProxy(
713 params.proxy_routing_id, 713 params.proxy_routing_id,
714 MSG_ROUTING_NONE, 714 MSG_ROUTING_NONE,
715 // Opener (if any) will be set separately below.
716 MSG_ROUTING_NONE,
715 routing_id_, 717 routing_id_,
716 params.replicated_frame_state); 718 params.replicated_frame_state);
717 } 719 }
718 } 720 }
719 721
720 // When not using swapped out state, just use the WebRemoteFrame as the main 722 // When not using swapped out state, just use the WebRemoteFrame as the main
721 // frame. 723 // frame.
722 if (proxy && SiteIsolationPolicy::IsSwappedOutStateForbidden()) { 724 if (proxy && SiteIsolationPolicy::IsSwappedOutStateForbidden()) {
723 webview()->setMainFrame(proxy->web_frame()); 725 webview()->setMainFrame(proxy->web_frame());
724 // Initialize the WebRemoteFrame with information replicated from the 726 // Initialize the WebRemoteFrame with information replicated from the
(...skipping 3073 matching lines...) Expand 10 before | Expand all | Expand 10 after
3798 std::vector<gfx::Size> sizes; 3800 std::vector<gfx::Size> sizes;
3799 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 3801 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
3800 if (!url.isEmpty()) 3802 if (!url.isEmpty())
3801 urls.push_back( 3803 urls.push_back(
3802 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 3804 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
3803 } 3805 }
3804 SendUpdateFaviconURL(urls); 3806 SendUpdateFaviconURL(urls);
3805 } 3807 }
3806 3808
3807 } // namespace content 3809 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698