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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2146803004: Create a content::FrameOwnerProperties struct for IPC transport of WebFrameOwnerProperties (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Transport 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/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index c5c1ab9d5399cebc5dc9cc03af493b84944e3fab..0ab5088b38dee90badd0813a0c58ed5b6f485c05 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -53,6 +53,7 @@
#include "content/common/content_constants_internal.h"
#include "content/common/content_security_policy_header.h"
#include "content/common/frame_messages.h"
+#include "content/common/frame_owner_properties.h"
#include "content/common/frame_replication_state.h"
#include "content/common/gpu/client/context_provider_command_buffer.h"
#include "content/common/input_messages.h"
@@ -2135,9 +2136,10 @@ void RenderFrameImpl::OnDidUpdateSandboxFlags(blink::WebSandboxFlags flags) {
}
void RenderFrameImpl::OnSetFrameOwnerProperties(
- const blink::WebFrameOwnerProperties& frame_owner_properties) {
+ const FrameOwnerProperties& frame_owner_properties) {
DCHECK(frame_);
- frame_->setFrameOwnerProperties(frame_owner_properties);
+ frame_->setFrameOwnerProperties(
+ frame_owner_properties.ToWebFrameOwnerProperties());
}
void RenderFrameImpl::OnAdvanceFocus(blink::WebFocusType type,
@@ -2803,7 +2805,7 @@ blink::WebFrame* RenderFrameImpl::createChildFrame(
params.frame_unique_name =
base::UTF16ToUTF8(base::StringPiece16(unique_name));
params.sandbox_flags = sandbox_flags;
- params.frame_owner_properties = frame_owner_properties;
+ params.frame_owner_properties = FrameOwnerProperties(frame_owner_properties);
Send(new FrameHostMsg_CreateChildFrame(params, &child_routing_id));
// Allocation of routing id failed, so we can't create a child frame. This can
@@ -2961,8 +2963,8 @@ void RenderFrameImpl::didChangeFrameOwnerProperties(
blink::WebFrame* child_frame,
const blink::WebFrameOwnerProperties& frame_owner_properties) {
Send(new FrameHostMsg_DidChangeFrameOwnerProperties(
- routing_id_, GetRoutingIdForFrameOrProxy(child_frame),
- frame_owner_properties));
+ routing_id_, GetRoutingIdForFrameOrProxy(child_frame),
+ FrameOwnerProperties(frame_owner_properties)));
}
void RenderFrameImpl::didMatchCSS(

Powered by Google App Engine
This is Rietveld 408576698