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

Side by Side Diff: Source/core/dom/DocumentInit.cpp

Issue 901903003: CSP: Adding the 'upgrade-insecure-requests' directive. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: WebSockets + Tests. Created 5 years, 10 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
« no previous file with comments | « Source/core/dom/DocumentInit.h ('k') | Source/core/dom/SecurityContext.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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, 2010, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 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) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2013 Google Inc. All rights reserved. 9 * Copyright (C) 2013 Google Inc. All rights reserved.
10 * 10 *
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 ASSERT(frameForSecurityContext()); 118 ASSERT(frameForSecurityContext());
119 return frameForSecurityContext()->loader().effectiveSandboxFlags(); 119 return frameForSecurityContext()->loader().effectiveSandboxFlags();
120 } 120 }
121 121
122 bool DocumentInit::shouldEnforceStrictMixedContentChecking() const 122 bool DocumentInit::shouldEnforceStrictMixedContentChecking() const
123 { 123 {
124 ASSERT(frameForSecurityContext()); 124 ASSERT(frameForSecurityContext());
125 return frameForSecurityContext()->loader().shouldEnforceStrictMixedContentCh ecking(); 125 return frameForSecurityContext()->loader().shouldEnforceStrictMixedContentCh ecking();
126 } 126 }
127 127
128 SecurityContext::InsecureContentPolicy DocumentInit::insecureContentPolicy() con st
129 {
130 ASSERT(frameForSecurityContext());
131 return frameForSecurityContext()->loader().insecureContentPolicy();
132 }
133
128 bool DocumentInit::isHostedInReservedIPRange() const 134 bool DocumentInit::isHostedInReservedIPRange() const
129 { 135 {
130 if (LocalFrame* frame = frameForSecurityContext()) { 136 if (LocalFrame* frame = frameForSecurityContext()) {
131 if (DocumentLoader* loader = frame->loader().provisionalDocumentLoader() ? frame->loader().provisionalDocumentLoader() : frame->loader().documentLoader( )) { 137 if (DocumentLoader* loader = frame->loader().provisionalDocumentLoader() ? frame->loader().provisionalDocumentLoader() : frame->loader().documentLoader( )) {
132 if (!loader->response().remoteIPAddress().isEmpty()) 138 if (!loader->response().remoteIPAddress().isEmpty())
133 return Platform::current()->isReservedIPAddress(loader->response ().remoteIPAddress()); 139 return Platform::current()->isReservedIPAddress(loader->response ().remoteIPAddress());
134 } 140 }
135 } 141 }
136 return false; 142 return false;
137 } 143 }
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 return m_contextDocument; 183 return m_contextDocument;
178 } 184 }
179 185
180 DocumentInit DocumentInit::fromContext(WeakPtrWillBeRawPtr<Document> contextDocu ment, const KURL& url) 186 DocumentInit DocumentInit::fromContext(WeakPtrWillBeRawPtr<Document> contextDocu ment, const KURL& url)
181 { 187 {
182 return DocumentInit(url, 0, contextDocument, 0); 188 return DocumentInit(url, 0, contextDocument, 0);
183 } 189 }
184 190
185 } // namespace blink 191 } // namespace blink
186 192
OLDNEW
« no previous file with comments | « Source/core/dom/DocumentInit.h ('k') | Source/core/dom/SecurityContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698