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

Unified Diff: content/browser/frame_host/render_frame_host_manager.cc

Issue 2156883002: Use content::FrameOwnerProperties instead of blink::WebFrameOwnerProperties in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission-delegation-frame-owner-properties
Patch Set: Use this everywhere Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index fc1de96c5cf2ac9d1801e6d087821fad3a20077a..0af42e97b8e3676b8582dcb48a90844c17a2f6d4 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -978,11 +978,11 @@ void RenderFrameHostManager::OnEnforceInsecureRequestPolicy(
}
void RenderFrameHostManager::OnDidUpdateFrameOwnerProperties(
- const blink::WebFrameOwnerProperties& properties) {
+ const FrameOwnerProperties& properties) {
if (!SiteIsolationPolicy::AreCrossProcessFramesPossible())
return;
- // WebFrameOwnerProperties exist only for frames that have a parent.
+ // FrameOwnerProperties exist only for frames that have a parent.
CHECK(frame_tree_node_->parent());
SiteInstance* parent_instance =
frame_tree_node_->parent()->current_frame_host()->GetSiteInstance();
@@ -990,7 +990,7 @@ void RenderFrameHostManager::OnDidUpdateFrameOwnerProperties(
// Notify the RenderFrame if it lives in a different process from its parent.
if (render_frame_host_->GetSiteInstance() != parent_instance) {
render_frame_host_->Send(new FrameMsg_SetFrameOwnerProperties(
- render_frame_host_->GetRoutingID(), FrameOwnerProperties(properties)));
+ render_frame_host_->GetRoutingID(), properties));
}
// Notify this frame's proxies if they live in a different process from its
@@ -1002,7 +1002,7 @@ void RenderFrameHostManager::OnDidUpdateFrameOwnerProperties(
for (const auto& pair : proxy_hosts_) {
if (pair.second->GetSiteInstance() != parent_instance) {
pair.second->Send(new FrameMsg_SetFrameOwnerProperties(
- pair.second->GetRoutingID(), FrameOwnerProperties(properties)));
+ pair.second->GetRoutingID(), properties));
}
}
}

Powered by Google App Engine
This is Rietveld 408576698