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

Side by Side Diff: Source/bindings/v8/V8Callback.cpp

Issue 111603006: Simplify invokeCallback() and support void return values for IDL callbacks (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years 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
OLDNEW
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 18 matching lines...) Expand all
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "bindings/v8/V8Callback.h" 32 #include "bindings/v8/V8Callback.h"
33 33
34 #include "bindings/v8/ScriptController.h" 34 #include "bindings/v8/ScriptController.h"
35 #include "core/dom/Document.h" 35 #include "core/dom/Document.h"
36 36
37 namespace WebCore { 37 namespace WebCore {
38 38
39 bool invokeCallback(v8::Handle<v8::Object> callback, int argc, v8::Handle<v8::Va lue> argv[], bool& callbackReturnValue, ExecutionContext* executionContext, v8:: Isolate* isolate) 39 bool invokeCallback(v8::Local<v8::Function> callback, int argc, v8::Handle<v8::V alue> argv[], ExecutionContext* executionContext, v8::Isolate* isolate)
40 { 40 {
41 return invokeCallback(callback, isolate->GetCurrentContext()->Global(), argc , argv, callbackReturnValue, executionContext, isolate); 41 return invokeCallback(callback, isolate->GetCurrentContext()->Global(), argc , argv, executionContext, 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, Execu tionContext* executionContext, v8::Isolate* isolate) 44 bool invokeCallback(v8::Local<v8::Function> callback, v8::Handle<v8::Object> thi sObject, int argc, v8::Handle<v8::Value> argv[], ExecutionContext* executionCont ext, v8::Isolate* isolate)
45 { 45 {
46 v8::TryCatch exceptionCatcher; 46 v8::TryCatch exceptionCatcher;
47 exceptionCatcher.SetVerbose(true); 47 exceptionCatcher.SetVerbose(true);
48 48 ScriptController::callFunction(executionContext, callback, thisObject, argc, argv, isolate);
49 v8::Local<v8::Function> callbackFunction; 49 return !exceptionCatcher.HasCaught();
50 if (callback->IsFunction()) {
51 callbackFunction = v8::Local<v8::Function>::New(isolate, v8::Handle<v8:: Function>::Cast(callback));
52 } else if (callback->IsObject()) {
53 v8::Local<v8::Value> handleEventFunction = callback->Get(v8AtomicString( isolate, "handleEvent"));
54 if (handleEventFunction->IsFunction())
55 callbackFunction = v8::Local<v8::Function>::Cast(handleEventFunction );
56 } else
57 return false;
58
59 if (callbackFunction.IsEmpty())
60 return false;
61
62 v8::Handle<v8::Value> result = ScriptController::callFunction(executionConte xt, callbackFunction, thisObject, argc, argv, isolate);
63
64 callbackReturnValue = !result.IsEmpty() && result->BooleanValue();
65 return exceptionCatcher.HasCaught();
66 } 50 }
67 51
68 } // namespace WebCore 52 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698