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

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

Issue 17351003: Rename ContextDestructionObserver to ContextLifecycleObserver (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reapplied Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/page/DOMSecurityPolicy.h ('k') | Source/core/testing/Internals.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) 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/page/DOMSecurityPolicy.h" 27 #include "core/page/DOMSecurityPolicy.h"
28 28
29 #include "core/dom/ContextDestructionObserver.h" 29 #include "core/dom/ContextLifecycleObserver.h"
30 #include "core/dom/DOMStringList.h" 30 #include "core/dom/DOMStringList.h"
31 #include "core/dom/ScriptExecutionContext.h" 31 #include "core/dom/ScriptExecutionContext.h"
32 #include "core/page/ContentSecurityPolicy.h" 32 #include "core/page/ContentSecurityPolicy.h"
33 #include <wtf/text/TextPosition.h> 33 #include <wtf/text/TextPosition.h>
34 #include <wtf/text/WTFString.h> 34 #include <wtf/text/WTFString.h>
35 35
36 namespace WebCore { 36 namespace WebCore {
37 37
38 namespace { 38 namespace {
39 39
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 { 73 {
74 if (!isPolicyActiveInContext(context)) 74 if (!isPolicyActiveInContext(context))
75 return true; 75 return true;
76 76
77 return (context->contentSecurityPolicy()->*allowWithContext)(String(), WTF:: OrdinalNumber::beforeFirst(), ContentSecurityPolicy::SuppressReport); 77 return (context->contentSecurityPolicy()->*allowWithContext)(String(), WTF:: OrdinalNumber::beforeFirst(), ContentSecurityPolicy::SuppressReport);
78 } 78 }
79 79
80 } // namespace 80 } // namespace
81 81
82 DOMSecurityPolicy::DOMSecurityPolicy(ScriptExecutionContext* context) 82 DOMSecurityPolicy::DOMSecurityPolicy(ScriptExecutionContext* context)
83 : ContextDestructionObserver(context) 83 : ContextLifecycleObserver(context)
84 { 84 {
85 ScriptWrappable::init(this); 85 ScriptWrappable::init(this);
86 } 86 }
87 87
88 DOMSecurityPolicy::~DOMSecurityPolicy() 88 DOMSecurityPolicy::~DOMSecurityPolicy()
89 { 89 {
90 } 90 }
91 91
92 bool DOMSecurityPolicy::isActive() const 92 bool DOMSecurityPolicy::isActive() const
93 { 93 {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 { 167 {
168 return isAllowedWithURL<&ContentSecurityPolicy::allowScriptFromSource>(scrip tExecutionContext(), url); 168 return isAllowedWithURL<&ContentSecurityPolicy::allowScriptFromSource>(scrip tExecutionContext(), url);
169 } 169 }
170 170
171 bool DOMSecurityPolicy::allowsStyleFrom(const String& url) const 171 bool DOMSecurityPolicy::allowsStyleFrom(const String& url) const
172 { 172 {
173 return isAllowedWithURL<&ContentSecurityPolicy::allowStyleFromSource>(script ExecutionContext(), url); 173 return isAllowedWithURL<&ContentSecurityPolicy::allowStyleFromSource>(script ExecutionContext(), url);
174 } 174 }
175 175
176 } // namespace WebCore 176 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/DOMSecurityPolicy.h ('k') | Source/core/testing/Internals.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698