| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "bindings/core/v8/ScriptFunction.h" | 6 #include "bindings/core/v8/ScriptFunction.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/V8Binding.h" | 8 #include "bindings/core/v8/V8Binding.h" |
| 9 | 9 |
| 10 namespace blink { | 10 namespace blink { |
| 11 | 11 |
| 12 v8::Handle<v8::Function> ScriptFunction::bindToV8Function() | 12 v8::Local<v8::Function> ScriptFunction::bindToV8Function() |
| 13 { | 13 { |
| 14 v8::Isolate* isolate = m_scriptState->isolate(); | 14 v8::Isolate* isolate = m_scriptState->isolate(); |
| 15 v8::Handle<v8::External> wrapper = v8::External::New(isolate, this); | 15 v8::Local<v8::External> wrapper = v8::External::New(isolate, this); |
| 16 m_scriptState->world().registerDOMObjectHolder(isolate, this, wrapper); | 16 m_scriptState->world().registerDOMObjectHolder(isolate, this, wrapper); |
| 17 return createClosure(&ScriptFunction::callCallback, wrapper, isolate); | 17 return createClosure(&ScriptFunction::callCallback, wrapper, isolate); |
| 18 } | 18 } |
| 19 | 19 |
| 20 void ScriptFunction::callCallback(const v8::FunctionCallbackInfo<v8::Value>& arg
s) | 20 void ScriptFunction::callCallback(const v8::FunctionCallbackInfo<v8::Value>& arg
s) |
| 21 { | 21 { |
| 22 ASSERT(args.Data()->IsExternal()); | 22 ASSERT(args.Data()->IsExternal()); |
| 23 ScriptFunction* scriptFunction = static_cast<ScriptFunction*>(v8::Handle<v8:
:External>::Cast(args.Data())->Value()); | 23 ScriptFunction* scriptFunction = static_cast<ScriptFunction*>(v8::Local<v8::
External>::Cast(args.Data())->Value()); |
| 24 ScriptValue result = scriptFunction->call(ScriptValue(scriptFunction->script
State(), args[0])); | 24 ScriptValue result = scriptFunction->call(ScriptValue(scriptFunction->script
State(), args[0])); |
| 25 v8SetReturnValue(args, result.v8Value()); | 25 v8SetReturnValue(args, result.v8Value()); |
| 26 } | 26 } |
| 27 | 27 |
| 28 } // namespace blink | 28 } // namespace blink |
| OLD | NEW |