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

Side by Side Diff: Source/bindings/v8/custom/V8WorkerGlobalScopeCustom.cpp

Issue 180523003: Move ContentSecurityPolicy to core/frame/csp (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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
« no previous file with comments | « Source/bindings/v8/custom/V8WindowCustom.cpp ('k') | Source/core/core.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 19 matching lines...) Expand all
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "V8WorkerGlobalScope.h" 32 #include "V8WorkerGlobalScope.h"
33 33
34 #include "bindings/v8/ExceptionState.h" 34 #include "bindings/v8/ExceptionState.h"
35 #include "bindings/v8/ScheduledAction.h" 35 #include "bindings/v8/ScheduledAction.h"
36 #include "bindings/v8/V8Binding.h" 36 #include "bindings/v8/V8Binding.h"
37 #include "bindings/v8/V8WorkerGlobalScopeEventListener.h" 37 #include "bindings/v8/V8WorkerGlobalScopeEventListener.h"
38 #include "bindings/v8/WorkerScriptController.h" 38 #include "bindings/v8/WorkerScriptController.h"
39 #include "core/inspector/ScriptCallStack.h" 39 #include "core/inspector/ScriptCallStack.h"
40 #include "core/frame/ContentSecurityPolicy.h"
41 #include "core/frame/DOMTimer.h" 40 #include "core/frame/DOMTimer.h"
42 #include "core/frame/DOMWindowTimers.h" 41 #include "core/frame/DOMWindowTimers.h"
42 #include "core/frame/csp/ContentSecurityPolicy.h"
43 #include "core/workers/WorkerGlobalScope.h" 43 #include "core/workers/WorkerGlobalScope.h"
44 #include "modules/websockets/WebSocket.h" 44 #include "modules/websockets/WebSocket.h"
45 #include "wtf/OwnPtr.h" 45 #include "wtf/OwnPtr.h"
46 46
47 namespace WebCore { 47 namespace WebCore {
48 48
49 void SetTimeoutOrInterval(const v8::FunctionCallbackInfo<v8::Value>& info, bool singleShot) 49 void SetTimeoutOrInterval(const v8::FunctionCallbackInfo<v8::Value>& info, bool singleShot)
50 { 50 {
51 WorkerGlobalScope* workerGlobalScope = V8WorkerGlobalScope::toNative(info.Ho lder()); 51 WorkerGlobalScope* workerGlobalScope = V8WorkerGlobalScope::toNative(info.Ho lder());
52 ASSERT(workerGlobalScope); 52 ASSERT(workerGlobalScope);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 WorkerScriptController* script = impl->script(); 114 WorkerScriptController* script = impl->script();
115 if (!script) 115 if (!script)
116 return v8::Null(isolate); 116 return v8::Null(isolate);
117 117
118 v8::Handle<v8::Object> global = script->context()->Global(); 118 v8::Handle<v8::Object> global = script->context()->Global();
119 ASSERT(!global.IsEmpty()); 119 ASSERT(!global.IsEmpty());
120 return global; 120 return global;
121 } 121 }
122 122
123 } // namespace WebCore 123 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/custom/V8WindowCustom.cpp ('k') | Source/core/core.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698