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

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

Issue 14519003: Absolutify paths to dom/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix testrunner Created 7 years, 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All Rights Reserved. 2 * Copyright (C) 2011 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 26
27 #include "config.h" 27 #include "config.h"
28 #include "SecurityContext.h" 28 #include "core/dom/SecurityContext.h"
29 29
30 #include "HTMLParserIdioms.h" 30 #include "HTMLParserIdioms.h"
31 #include "WebCoreMemoryInstrumentation.h" 31 #include "core/dom/WebCoreMemoryInstrumentation.h"
32 #include "core/page/ContentSecurityPolicy.h" 32 #include "core/page/ContentSecurityPolicy.h"
33 #include "core/page/SecurityOrigin.h" 33 #include "core/page/SecurityOrigin.h"
34 #include <wtf/text/StringBuilder.h> 34 #include <wtf/text/StringBuilder.h>
35 35
36 namespace WebCore { 36 namespace WebCore {
37 37
38 SecurityContext::SecurityContext() 38 SecurityContext::SecurityContext()
39 : m_mayDisplaySeamlesslyWithParent(false) 39 : m_mayDisplaySeamlesslyWithParent(false)
40 , m_haveInitializedSecurityOrigin(false) 40 , m_haveInitializedSecurityOrigin(false)
41 , m_sandboxFlags(SandboxNone) 41 , m_sandboxFlags(SandboxNone)
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 } 144 }
145 145
146 void SecurityContext::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) cons t 146 void SecurityContext::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) cons t
147 { 147 {
148 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM); 148 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
149 info.addMember(m_securityOrigin, "securityOrigin"); 149 info.addMember(m_securityOrigin, "securityOrigin");
150 info.addMember(m_contentSecurityPolicy, "contentSecurityPolicy"); 150 info.addMember(m_contentSecurityPolicy, "contentSecurityPolicy");
151 } 151 }
152 152
153 } 153 }
OLDNEW
« no previous file with comments | « Source/core/dom/ScriptedAnimationController.cpp ('k') | Source/core/dom/SecurityPolicyViolationEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698