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

Unified Diff: content/renderer/render_frame_proxy.cc

Issue 1723753002: Make Document::isSecureContext() work for OOPIFs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more rebase fixups Created 4 years, 9 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
« no previous file with comments | « content/renderer/render_frame_proxy.h ('k') | media/blink/webencryptedmediaclient_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_proxy.cc
diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
index 8a12c6bf9c43c3406ea6c393cd377fab911fb43e..37b7059f28999473331db3f1d2b5dd844966f029 100644
--- a/content/renderer/render_frame_proxy.cc
+++ b/content/renderer/render_frame_proxy.cc
@@ -222,6 +222,8 @@ void RenderFrameProxy::SetReplicatedState(const FrameReplicationState& state) {
blink::WebString::fromUTF8(state.unique_name));
web_frame_->setReplicatedShouldEnforceStrictMixedContentChecking(
state.should_enforce_strict_mixed_content_checking);
+ web_frame_->setReplicatedPotentiallyTrustworthyUniqueOrigin(
+ state.has_potentially_trustworthy_unique_origin);
}
// Update the proxy's SecurityContext and FrameOwner with new sandbox flags
@@ -341,8 +343,12 @@ void RenderFrameProxy::OnEnforceStrictMixedContentChecking(
should_enforce);
}
-void RenderFrameProxy::OnDidUpdateOrigin(const url::Origin& origin) {
+void RenderFrameProxy::OnDidUpdateOrigin(
+ const url::Origin& origin,
+ bool is_potentially_trustworthy_unique_origin) {
web_frame_->setReplicatedOrigin(origin);
+ web_frame_->setReplicatedPotentiallyTrustworthyUniqueOrigin(
+ is_potentially_trustworthy_unique_origin);
}
void RenderFrameProxy::OnSetPageFocus(bool is_focused) {
« no previous file with comments | « content/renderer/render_frame_proxy.h ('k') | media/blink/webencryptedmediaclient_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698