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

Unified Diff: content/browser/frame_host/frame_tree_node.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/browser/frame_host/frame_tree_node.h ('k') | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/frame_tree_node.cc
diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc
index 3a2f122cc7b4e40aaca88404df63d924897f15d2..c55212c9bce8b489ba3b5ba8e76e4722794babc1 100644
--- a/content/browser/frame_host/frame_tree_node.cc
+++ b/content/browser/frame_host/frame_tree_node.cc
@@ -98,7 +98,8 @@ FrameTreeNode::FrameTreeNode(
name,
unique_name,
blink::WebSandboxFlags::None,
- false /* should enforce strict mixed content checking */),
+ false /* should enforce strict mixed content checking */,
+ false /* is a potentially trustworthy unique origin */),
pending_sandbox_flags_(blink::WebSandboxFlags::None),
frame_owner_properties_(frame_owner_properties),
loading_progress_(kLoadingProgressNotStarted) {
@@ -212,10 +213,18 @@ void FrameTreeNode::SetCurrentURL(const GURL& url) {
TraceSnapshot();
}
-void FrameTreeNode::SetCurrentOrigin(const url::Origin& origin) {
- if (!origin.IsSameOriginWith(replication_state_.origin))
- render_manager_.OnDidUpdateOrigin(origin);
+void FrameTreeNode::SetCurrentOrigin(
+ const url::Origin& origin,
+ bool is_potentially_trustworthy_unique_origin) {
+ if (!origin.IsSameOriginWith(replication_state_.origin) ||
+ replication_state_.has_potentially_trustworthy_unique_origin !=
+ is_potentially_trustworthy_unique_origin) {
+ render_manager_.OnDidUpdateOrigin(origin,
+ is_potentially_trustworthy_unique_origin);
+ }
replication_state_.origin = origin;
+ replication_state_.has_potentially_trustworthy_unique_origin =
+ is_potentially_trustworthy_unique_origin;
}
void FrameTreeNode::SetFrameName(const std::string& name,
« no previous file with comments | « content/browser/frame_host/frame_tree_node.h ('k') | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698