| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 30 matching lines...) Expand all Loading... |
| 41 return invokeCallback(callback, v8::Context::GetCurrent()->Global(), argc, a
rgv, callbackReturnValue, scriptExecutionContext, isolate); | 41 return invokeCallback(callback, v8::Context::GetCurrent()->Global(), argc, a
rgv, callbackReturnValue, scriptExecutionContext, isolate); |
| 42 } | 42 } |
| 43 | 43 |
| 44 bool invokeCallback(v8::Handle<v8::Object> callback, v8::Handle<v8::Object> this
Object, int argc, v8::Handle<v8::Value> argv[], bool& callbackReturnValue, Scrip
tExecutionContext* scriptExecutionContext, v8::Isolate* isolate) | 44 bool invokeCallback(v8::Handle<v8::Object> callback, v8::Handle<v8::Object> this
Object, int argc, v8::Handle<v8::Value> argv[], bool& callbackReturnValue, Scrip
tExecutionContext* scriptExecutionContext, v8::Isolate* isolate) |
| 45 { | 45 { |
| 46 v8::TryCatch exceptionCatcher; | 46 v8::TryCatch exceptionCatcher; |
| 47 exceptionCatcher.SetVerbose(true); | 47 exceptionCatcher.SetVerbose(true); |
| 48 | 48 |
| 49 v8::Local<v8::Function> callbackFunction; | 49 v8::Local<v8::Function> callbackFunction; |
| 50 if (callback->IsFunction()) { | 50 if (callback->IsFunction()) { |
| 51 callbackFunction = v8::Local<v8::Function>::New(v8::Handle<v8::Function>
::Cast(callback)); | 51 callbackFunction = v8::Local<v8::Function>::New(isolate, v8::Handle<v8::
Function>::Cast(callback)); |
| 52 } else if (callback->IsObject()) { | 52 } else if (callback->IsObject()) { |
| 53 v8::Local<v8::Value> handleEventFunction = callback->Get(v8::String::New
Symbol("handleEvent")); | 53 v8::Local<v8::Value> handleEventFunction = callback->Get(v8::String::New
Symbol("handleEvent")); |
| 54 if (handleEventFunction->IsFunction()) | 54 if (handleEventFunction->IsFunction()) |
| 55 callbackFunction = v8::Local<v8::Function>::Cast(handleEventFunction
); | 55 callbackFunction = v8::Local<v8::Function>::Cast(handleEventFunction
); |
| 56 } else | 56 } else |
| 57 return false; | 57 return false; |
| 58 | 58 |
| 59 if (callbackFunction.IsEmpty()) | 59 if (callbackFunction.IsEmpty()) |
| 60 return false; | 60 return false; |
| 61 | 61 |
| 62 v8::Handle<v8::Value> result = ScriptController::callFunctionWithInstrumenta
tion(scriptExecutionContext, callbackFunction, thisObject, argc, argv, isolate); | 62 v8::Handle<v8::Value> result = ScriptController::callFunctionWithInstrumenta
tion(scriptExecutionContext, callbackFunction, thisObject, argc, argv, isolate); |
| 63 | 63 |
| 64 callbackReturnValue = !result.IsEmpty() && result->BooleanValue(); | 64 callbackReturnValue = !result.IsEmpty() && result->BooleanValue(); |
| 65 return exceptionCatcher.HasCaught(); | 65 return exceptionCatcher.HasCaught(); |
| 66 } | 66 } |
| 67 | 67 |
| 68 } // namespace WebCore | 68 } // namespace WebCore |
| OLD | NEW |