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

Side by Side Diff: Source/core/frame/DOMSecurityPolicy.cpp

Issue 64643009: Remove duplicated headers from core/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google, Inc. All rights reserved. 2 * Copyright (C) 2012 Google, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/frame/DOMSecurityPolicy.h" 27 #include "core/frame/DOMSecurityPolicy.h"
28 28
29 #include "core/dom/ContextLifecycleObserver.h"
30 #include "core/dom/DOMStringList.h" 29 #include "core/dom/DOMStringList.h"
31 #include "core/dom/ExecutionContext.h" 30 #include "core/dom/ExecutionContext.h"
32 #include "core/frame/ContentSecurityPolicy.h" 31 #include "core/frame/ContentSecurityPolicy.h"
33 #include "wtf/text/TextPosition.h" 32 #include "wtf/text/TextPosition.h"
34 #include "wtf/text/WTFString.h"
35 33
36 namespace WebCore { 34 namespace WebCore {
37 35
38 namespace { 36 namespace {
39 37
40 bool isPolicyActiveInContext(ExecutionContext* context) 38 bool isPolicyActiveInContext(ExecutionContext* context)
41 { 39 {
42 // If the ExecutionContext has been destroyed, there's no active policy. 40 // If the ExecutionContext has been destroyed, there's no active policy.
43 if (!context) 41 if (!context)
44 return false; 42 return false;
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 { 165 {
168 return isAllowedWithURL<&ContentSecurityPolicy::allowScriptFromSource>(execu tionContext(), url); 166 return isAllowedWithURL<&ContentSecurityPolicy::allowScriptFromSource>(execu tionContext(), url);
169 } 167 }
170 168
171 bool DOMSecurityPolicy::allowsStyleFrom(const String& url) const 169 bool DOMSecurityPolicy::allowsStyleFrom(const String& url) const
172 { 170 {
173 return isAllowedWithURL<&ContentSecurityPolicy::allowStyleFromSource>(execut ionContext(), url); 171 return isAllowedWithURL<&ContentSecurityPolicy::allowStyleFromSource>(execut ionContext(), url);
174 } 172 }
175 173
176 } // namespace WebCore 174 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/ContentSecurityPolicyResponseHeaders.cpp ('k') | Source/core/frame/DOMTimer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698