Chromium Code Reviews| 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..f429c6c66383c38e657715e05276d75ec9740ce1 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,14 @@ void FrameTreeNode::SetFrameName(const std::string& name) { |
| replication_state_.name = name; |
| } |
| +void FrameTreeNode::SetShouldEnforceStrictMixedContentChecking( |
| + bool should_enforce) { |
| + render_manager_.OnDidUpdateShouldEnforceStrictMixedContentChecking( |
|
alexmos
2015/12/04 23:41:11
What was the reason for removing the check and alw
estark
2015/12/07 20:39:33
Oops, just a mistake. Fixed.
|
| + should_enforce); |
| + replication_state_.should_enforce_strict_mixed_content_checking = |
| + should_enforce; |
| +} |
| + |
| bool FrameTreeNode::IsDescendantOf(FrameTreeNode* other) const { |
| if (!other || !other->child_count()) |
| return false; |