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

Side by Side Diff: third_party/WebKit/Source/core/dom/Document.cpp

Issue 2046733003: Replicate WebInsecureRequestPolicy instead of a bool for strict mixed content checks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@securitycontext
Patch Set: alexmos@ Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 5848 matching lines...) Expand 10 before | Expand all | Expand 10 after
5859 } 5859 }
5860 5860
5861 void Document::enforceInsecureRequestPolicy(WebInsecureRequestPolicy policy) 5861 void Document::enforceInsecureRequestPolicy(WebInsecureRequestPolicy policy)
5862 { 5862 {
5863 // Combine the new policy with the existing policy, as a base policy may be 5863 // Combine the new policy with the existing policy, as a base policy may be
5864 // inherited from a remote parent before this page's policy is set. In other 5864 // inherited from a remote parent before this page's policy is set. In other
5865 // words, insecure requests should be upgraded or blocked if _either_ the 5865 // words, insecure requests should be upgraded or blocked if _either_ the
5866 // existing policy or the newly enforced policy triggers upgrades or 5866 // existing policy or the newly enforced policy triggers upgrades or
5867 // blockage. 5867 // blockage.
5868 setInsecureRequestPolicy(getInsecureRequestPolicy() | policy); 5868 setInsecureRequestPolicy(getInsecureRequestPolicy() | policy);
5869 5869 if (frame())
5870 if (frame() && policy & kBlockAllMixedContent) 5870 frame()->loader().client()->didEnforceInsecureRequestPolicy(getInsecureR equestPolicy());
5871 frame()->loader().client()->didEnforceStrictMixedContentChecking();
5872 } 5871 }
5873 5872
5874 void Document::setShadowCascadeOrder(ShadowCascadeOrder order) 5873 void Document::setShadowCascadeOrder(ShadowCascadeOrder order)
5875 { 5874 {
5876 DCHECK_NE(order, ShadowCascadeOrder::ShadowCascadeNone); 5875 DCHECK_NE(order, ShadowCascadeOrder::ShadowCascadeNone);
5877 5876
5878 if (order == m_shadowCascadeOrder) 5877 if (order == m_shadowCascadeOrder)
5879 return; 5878 return;
5880 5879
5881 if (order == ShadowCascadeOrder::ShadowCascadeV0) { 5880 if (order == ShadowCascadeOrder::ShadowCascadeV0) {
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
5987 #ifndef NDEBUG 5986 #ifndef NDEBUG
5988 using namespace blink; 5987 using namespace blink;
5989 void showLiveDocumentInstances() 5988 void showLiveDocumentInstances()
5990 { 5989 {
5991 WeakDocumentSet& set = liveDocumentSet(); 5990 WeakDocumentSet& set = liveDocumentSet();
5992 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5991 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5993 for (Document* document : set) 5992 for (Document* document : set)
5994 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get String().utf8().data()); 5993 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get String().utf8().data());
5995 } 5994 }
5996 #endif 5995 #endif
OLDNEW
« no previous file with comments | « content/test/test_render_frame_host.cc ('k') | third_party/WebKit/Source/core/loader/FrameLoaderClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698