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

Unified Diff: content/browser/frame_host/frame_tree_node.cc

Issue 1489253002: Plumb document's strict mixed content checking for RemoteFrames (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: alexmos nits Created 5 years 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
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..3cb3fffd8d4808b6d1dc3a96b19ba9de5bcc906b 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,18 @@ 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) {
+ return;
+ }
+ render_manager_.OnDidUpdateShouldEnforceStrictMixedContentChecking(
+ should_enforce);
+ replication_state_.should_enforce_strict_mixed_content_checking =
nasko 2015/12/17 17:16:32 Is there a specific reason why the update is done
estark 2015/12/17 22:19:10 Not that I know of. I was just following the examp
nasko 2015/12/18 18:27:12 Acknowledged.
+ should_enforce;
+}
+
bool FrameTreeNode::IsDescendantOf(FrameTreeNode* other) const {
if (!other || !other->child_count())
return false;

Powered by Google App Engine
This is Rietveld 408576698