| OLD | NEW |
| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 if (argumentCount < 1) | 54 if (argumentCount < 1) |
| 55 return; | 55 return; |
| 56 | 56 |
| 57 v8::Handle<v8::Value> function = info[0]; | 57 v8::Handle<v8::Value> function = info[0]; |
| 58 | 58 |
| 59 WorkerScriptController* script = workerGlobalScope->script(); | 59 WorkerScriptController* script = workerGlobalScope->script(); |
| 60 if (!script) | 60 if (!script) |
| 61 return; | 61 return; |
| 62 | 62 |
| 63 ScriptState* scriptState = ScriptState::current(info.GetIsolate()); | 63 ScriptState* scriptState = ScriptState::current(info.GetIsolate()); |
| 64 OwnPtr<ScheduledAction> action; | 64 OwnPtr<ScheduledActionBase> action; |
| 65 if (function->IsString()) { | 65 if (function->IsString()) { |
| 66 if (ContentSecurityPolicy* policy = workerGlobalScope->contentSecurityPo
licy()) { | 66 if (ContentSecurityPolicy* policy = workerGlobalScope->contentSecurityPo
licy()) { |
| 67 if (!policy->allowEval()) { | 67 if (!policy->allowEval()) { |
| 68 v8SetReturnValue(info, 0); | 68 v8SetReturnValue(info, 0); |
| 69 return; | 69 return; |
| 70 } | 70 } |
| 71 } | 71 } |
| 72 action = adoptPtr(new ScheduledAction(scriptState, toCoreString(function
.As<v8::String>()), KURL(), info.GetIsolate())); | 72 action = adoptPtr(new ScheduledAction(scriptState, toCoreString(function
.As<v8::String>()), KURL(), info.GetIsolate())); |
| 73 } else if (function->IsFunction()) { | 73 } else if (function->IsFunction()) { |
| 74 size_t paramCount = argumentCount >= 2 ? argumentCount - 2 : 0; | 74 size_t paramCount = argumentCount >= 2 ? argumentCount - 2 : 0; |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 blink | 123 } // namespace blink |
| OLD | NEW |