OLD | NEW |
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) 2000 Stefan Schimanski (1Stein@gmx.de) | 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) |
5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2012 Apple Inc. All rights reserv
ed. | 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2012 Apple Inc. All rights reserv
ed. |
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 11 matching lines...) Expand all Loading... |
22 */ | 22 */ |
23 | 23 |
24 #include "config.h" | 24 #include "config.h" |
25 #include "core/html/HTMLAppletElement.h" | 25 #include "core/html/HTMLAppletElement.h" |
26 | 26 |
27 #include "HTMLNames.h" | 27 #include "HTMLNames.h" |
28 #include "core/dom/shadow/ShadowRoot.h" | 28 #include "core/dom/shadow/ShadowRoot.h" |
29 #include "core/html/HTMLParamElement.h" | 29 #include "core/html/HTMLParamElement.h" |
30 #include "core/loader/FrameLoader.h" | 30 #include "core/loader/FrameLoader.h" |
31 #include "core/loader/FrameLoaderClient.h" | 31 #include "core/loader/FrameLoaderClient.h" |
32 #include "core/frame/ContentSecurityPolicy.h" | |
33 #include "core/frame/LocalFrame.h" | 32 #include "core/frame/LocalFrame.h" |
34 #include "core/frame/Settings.h" | 33 #include "core/frame/Settings.h" |
| 34 #include "core/frame/csp/ContentSecurityPolicy.h" |
35 #include "core/rendering/RenderApplet.h" | 35 #include "core/rendering/RenderApplet.h" |
36 #include "platform/Widget.h" | 36 #include "platform/Widget.h" |
37 #include "platform/weborigin/KURL.h" | 37 #include "platform/weborigin/KURL.h" |
38 #include "platform/weborigin/SecurityOrigin.h" | 38 #include "platform/weborigin/SecurityOrigin.h" |
39 | 39 |
40 namespace WebCore { | 40 namespace WebCore { |
41 | 41 |
42 using namespace HTMLNames; | 42 using namespace HTMLNames; |
43 | 43 |
44 HTMLAppletElement::HTMLAppletElement(Document& document, bool createdByParser) | 44 HTMLAppletElement::HTMLAppletElement(Document& document, bool createdByParser) |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 | 218 |
219 if (!document().contentSecurityPolicy()->allowObjectFromSource(url) | 219 if (!document().contentSecurityPolicy()->allowObjectFromSource(url) |
220 || !document().contentSecurityPolicy()->allowPluginType(appletMimeType,
appletMimeType, url)) { | 220 || !document().contentSecurityPolicy()->allowPluginType(appletMimeType,
appletMimeType, url)) { |
221 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje
ct::PluginBlockedByContentSecurityPolicy); | 221 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje
ct::PluginBlockedByContentSecurityPolicy); |
222 return false; | 222 return false; |
223 } | 223 } |
224 return true; | 224 return true; |
225 } | 225 } |
226 | 226 |
227 } | 227 } |
OLD | NEW |