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

Side by Side Diff: Source/core/workers/AbstractWorker.cpp

Issue 64643009: Remove duplicated headers from core/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 7 years 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
OLDNEW
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
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/events/ThreadLocalEventNames.h"
38 #include "core/frame/ContentSecurityPolicy.h" 37 #include "core/frame/ContentSecurityPolicy.h"
39 #include "platform/weborigin/SecurityOrigin.h" 38 #include "platform/weborigin/SecurityOrigin.h"
40 39
41 namespace WebCore { 40 namespace WebCore {
42 41
43 AbstractWorker::AbstractWorker(ExecutionContext* context) 42 AbstractWorker::AbstractWorker(ExecutionContext* context)
44 : ActiveDOMObject(context) 43 : ActiveDOMObject(context)
45 { 44 {
46 } 45 }
47 46
(...skipping 18 matching lines...) Expand all
66 65
67 if (executionContext()->contentSecurityPolicy() && !executionContext()->cont entSecurityPolicy()->allowScriptFromSource(scriptURL)) { 66 if (executionContext()->contentSecurityPolicy() && !executionContext()->cont entSecurityPolicy()->allowScriptFromSource(scriptURL)) {
68 exceptionState.throwSecurityError("Failed to create a worker: access to the script at '" + scriptURL.elidedString() + "' is denied by the document's Con tent Security Policy."); 67 exceptionState.throwSecurityError("Failed to create a worker: access to the script at '" + scriptURL.elidedString() + "' is denied by the document's Con tent Security Policy.");
69 return KURL(); 68 return KURL();
70 } 69 }
71 70
72 return scriptURL; 71 return scriptURL;
73 } 72 }
74 73
75 } // namespace WebCore 74 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/timing/PerformanceUserTiming.cpp ('k') | Source/core/workers/SharedWorkerGlobalScope.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698