| 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 18 matching lines...) Expand all Loading... |
| 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/events/ThreadLocalEventNames.h" | 37 #include "core/events/ThreadLocalEventNames.h" |
| 38 #include "core/frame/ContentSecurityPolicy.h" | 38 #include "core/frame/ContentSecurityPolicy.h" |
| 39 #include "weborigin/SecurityOrigin.h" | 39 #include "platform/weborigin/SecurityOrigin.h" |
| 40 | 40 |
| 41 namespace WebCore { | 41 namespace WebCore { |
| 42 | 42 |
| 43 AbstractWorker::AbstractWorker(ExecutionContext* context) | 43 AbstractWorker::AbstractWorker(ExecutionContext* context) |
| 44 : ActiveDOMObject(context) | 44 : ActiveDOMObject(context) |
| 45 { | 45 { |
| 46 } | 46 } |
| 47 | 47 |
| 48 AbstractWorker::~AbstractWorker() | 48 AbstractWorker::~AbstractWorker() |
| 49 { | 49 { |
| (...skipping 26 matching lines...) Expand all Loading... |
| 76 | 76 |
| 77 if (executionContext()->contentSecurityPolicy() && !executionContext()->cont
entSecurityPolicy()->allowScriptFromSource(scriptURL)) { | 77 if (executionContext()->contentSecurityPolicy() && !executionContext()->cont
entSecurityPolicy()->allowScriptFromSource(scriptURL)) { |
| 78 es.throwSecurityError("Failed to create a worker: access to the script a
t '" + scriptURL.elidedString() + "' is denied by the document's Content Securit
y Policy."); | 78 es.throwSecurityError("Failed to create a worker: access to the script a
t '" + scriptURL.elidedString() + "' is denied by the document's Content Securit
y Policy."); |
| 79 return KURL(); | 79 return KURL(); |
| 80 } | 80 } |
| 81 | 81 |
| 82 return scriptURL; | 82 return scriptURL; |
| 83 } | 83 } |
| 84 | 84 |
| 85 } // namespace WebCore | 85 } // namespace WebCore |
| OLD | NEW |