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 7ef7ca46df61e4cd3d93f61cad43c963a2c4f462..04478998626b4ed8cf286cd892595e2f23219968 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) { |
@@ -213,10 +214,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, |