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 8270ea291ebeba66061c299557f320713113dd34..8f66bea996814790b7e9c6c7aff7f5248219b6af 100644 |
--- a/content/browser/frame_host/frame_tree_node.cc |
+++ b/content/browser/frame_host/frame_tree_node.cc |
@@ -90,7 +90,11 @@ FrameTreeNode::FrameTreeNode( |
opener_(nullptr), |
opener_observer_(nullptr), |
has_committed_real_load_(false), |
- replication_state_(scope, name, sandbox_flags), |
+ replication_state_( |
+ scope, |
+ name, |
+ sandbox_flags, |
+ false /* should enforce strict mixed content checking */), |
// Effective sandbox flags also need to be set, since initial sandbox |
// flags should apply to the initial empty document in the frame. |
effective_sandbox_flags_(sandbox_flags), |
@@ -204,6 +208,17 @@ void FrameTreeNode::SetFrameName(const std::string& name) { |
replication_state_.name = name; |
} |
+void FrameTreeNode::SetShouldEnforceStrictMixedContentChecking( |
+ bool should_enforce) { |
+ if (should_enforce != |
+ replication_state_.should_enforce_strict_mixed_content_checking) { |
+ render_manager_.OnDidUpdateShouldEnforceStrictMixedContentChecking( |
+ should_enforce); |
+ } |
+ replication_state_.should_enforce_strict_mixed_content_checking = |
alexmos
2015/12/03 20:43:26
What's the lifetime of this flag in Blink? Does i
estark
2015/12/04 00:19:31
Ah, yes, it should be reset on navigation. I've no
alexmos
2015/12/04 23:41:11
Yes, that seems fine. Well, to make sure I unders
estark
2015/12/07 20:39:33
Ah, no, you're right, there's probably no guarante
alexmos
2015/12/08 01:06:36
Yes, I agree that we should send the update from B
|
+ should_enforce; |
+} |
+ |
bool FrameTreeNode::IsDescendantOf(FrameTreeNode* other) const { |
if (!other || !other->child_count()) |
return false; |