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

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

Issue 811773002: Mixed Content: Implement strict mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Tests. Created 6 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 unified diff | Download patch
« no previous file with comments | « Source/core/dom/DocumentInit.h ('k') | Source/core/dom/ExecutionContext.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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 return m_importsController->master()->frame(); 110 return m_importsController->master()->frame();
111 return 0; 111 return 0;
112 } 112 }
113 113
114 SandboxFlags DocumentInit::sandboxFlags() const 114 SandboxFlags DocumentInit::sandboxFlags() const
115 { 115 {
116 ASSERT(frameForSecurityContext()); 116 ASSERT(frameForSecurityContext());
117 return frameForSecurityContext()->loader().effectiveSandboxFlags(); 117 return frameForSecurityContext()->loader().effectiveSandboxFlags();
118 } 118 }
119 119
120 bool DocumentInit::shouldEnforceStrictMixedContentChecking() const
121 {
122 ASSERT(frameForSecurityContext());
123 return frameForSecurityContext()->loader().shouldEnforceStrictMixedContentCh ecking();
124 }
125
120 Settings* DocumentInit::settings() const 126 Settings* DocumentInit::settings() const
121 { 127 {
122 ASSERT(frameForSecurityContext()); 128 ASSERT(frameForSecurityContext());
123 return frameForSecurityContext()->settings(); 129 return frameForSecurityContext()->settings();
124 } 130 }
125 131
126 KURL DocumentInit::parentBaseURL() const 132 KURL DocumentInit::parentBaseURL() const
127 { 133 {
128 return m_parent->baseURL(); 134 return m_parent->baseURL();
129 } 135 }
(...skipping 28 matching lines...) Expand all
158 return m_contextDocument; 164 return m_contextDocument;
159 } 165 }
160 166
161 DocumentInit DocumentInit::fromContext(WeakPtrWillBeRawPtr<Document> contextDocu ment, const KURL& url) 167 DocumentInit DocumentInit::fromContext(WeakPtrWillBeRawPtr<Document> contextDocu ment, const KURL& url)
162 { 168 {
163 return DocumentInit(url, 0, contextDocument, 0); 169 return DocumentInit(url, 0, contextDocument, 0);
164 } 170 }
165 171
166 } // namespace blink 172 } // namespace blink
167 173
OLDNEW
« no previous file with comments | « Source/core/dom/DocumentInit.h ('k') | Source/core/dom/ExecutionContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698