OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 16 matching lines...) Expand all Loading... |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "core/workers/AbstractWorker.h" | 32 #include "core/workers/AbstractWorker.h" |
33 | 33 |
34 #include "bindings/v8/ExceptionState.h" | 34 #include "bindings/v8/ExceptionState.h" |
35 #include "core/dom/ExceptionCode.h" | 35 #include "core/dom/ExceptionCode.h" |
36 #include "core/dom/ExecutionContext.h" | 36 #include "core/dom/ExecutionContext.h" |
37 #include "core/frame/ContentSecurityPolicy.h" | 37 #include "core/frame/csp/ContentSecurityPolicy.h" |
38 #include "platform/weborigin/SecurityOrigin.h" | 38 #include "platform/weborigin/SecurityOrigin.h" |
39 | 39 |
40 namespace WebCore { | 40 namespace WebCore { |
41 | 41 |
42 AbstractWorker::AbstractWorker(ExecutionContext* context) | 42 AbstractWorker::AbstractWorker(ExecutionContext* context) |
43 : ActiveDOMObject(context) | 43 : ActiveDOMObject(context) |
44 { | 44 { |
45 } | 45 } |
46 | 46 |
47 AbstractWorker::~AbstractWorker() | 47 AbstractWorker::~AbstractWorker() |
(...skipping 17 matching lines...) Expand all Loading... |
65 | 65 |
66 if (executionContext()->contentSecurityPolicy() && !executionContext()->cont
entSecurityPolicy()->allowWorkerContextFromSource(scriptURL)) { | 66 if (executionContext()->contentSecurityPolicy() && !executionContext()->cont
entSecurityPolicy()->allowWorkerContextFromSource(scriptURL)) { |
67 exceptionState.throwSecurityError("Access to the script at '" + scriptUR
L.elidedString() + "' is denied by the document's Content Security Policy."); | 67 exceptionState.throwSecurityError("Access to the script at '" + scriptUR
L.elidedString() + "' is denied by the document's Content Security Policy."); |
68 return KURL(); | 68 return KURL(); |
69 } | 69 } |
70 | 70 |
71 return scriptURL; | 71 return scriptURL; |
72 } | 72 } |
73 | 73 |
74 } // namespace WebCore | 74 } // namespace WebCore |
OLD | NEW |