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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 | 63 |
64 OwnPtr<ScheduledAction> action; | 64 OwnPtr<ScheduledAction> action; |
65 v8::Handle<v8::Context> v8Context = script->context(); | 65 v8::Handle<v8::Context> v8Context = script->context(); |
66 if (function->IsString()) { | 66 if (function->IsString()) { |
67 if (ContentSecurityPolicy* policy = workerGlobalScope->contentSecurityPo
licy()) { | 67 if (ContentSecurityPolicy* policy = workerGlobalScope->contentSecurityPo
licy()) { |
68 if (!policy->allowEval()) { | 68 if (!policy->allowEval()) { |
69 v8SetReturnValue(args, 0); | 69 v8SetReturnValue(args, 0); |
70 return; | 70 return; |
71 } | 71 } |
72 } | 72 } |
73 action = adoptPtr(new ScheduledAction(v8Context, toWebCoreString(functio
n), workerGlobalScope->url(), args.GetIsolate())); | 73 action = adoptPtr(new ScheduledAction(v8Context, toWebCoreString(functio
n.As<v8::String>()), workerGlobalScope->url(), args.GetIsolate())); |
74 } else if (function->IsFunction()) { | 74 } else if (function->IsFunction()) { |
75 size_t paramCount = argumentCount >= 2 ? argumentCount - 2 : 0; | 75 size_t paramCount = argumentCount >= 2 ? argumentCount - 2 : 0; |
76 OwnArrayPtr<v8::Local<v8::Value> > params; | 76 OwnArrayPtr<v8::Local<v8::Value> > params; |
77 if (paramCount > 0) { | 77 if (paramCount > 0) { |
78 params = adoptArrayPtr(new v8::Local<v8::Value>[paramCount]); | 78 params = adoptArrayPtr(new v8::Local<v8::Value>[paramCount]); |
79 for (size_t i = 0; i < paramCount; ++i) | 79 for (size_t i = 0; i < paramCount; ++i) |
80 params[i] = args[i+2]; | 80 params[i] = args[i+2]; |
81 } | 81 } |
82 // ScheduledAction takes ownership of actual params and releases them in
its destructor. | 82 // ScheduledAction takes ownership of actual params and releases them in
its destructor. |
83 action = adoptPtr(new ScheduledAction(v8Context, v8::Handle<v8::Function
>::Cast(function), paramCount, params.get(), args.GetIsolate())); | 83 action = adoptPtr(new ScheduledAction(v8Context, v8::Handle<v8::Function
>::Cast(function), paramCount, params.get(), args.GetIsolate())); |
(...skipping 30 matching lines...) Expand all Loading... |
114 WorkerScriptController* script = impl->script(); | 114 WorkerScriptController* script = impl->script(); |
115 if (!script) | 115 if (!script) |
116 return v8NullWithCheck(isolate); | 116 return v8NullWithCheck(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 |
OLD | NEW |