| Index: Source/bindings/tests/results/V8TestCallbackInterface.cpp
|
| diff --git a/Source/bindings/tests/results/V8TestCallback.cpp b/Source/bindings/tests/results/V8TestCallbackInterface.cpp
|
| similarity index 70%
|
| rename from Source/bindings/tests/results/V8TestCallback.cpp
|
| rename to Source/bindings/tests/results/V8TestCallbackInterface.cpp
|
| index a2d6d2ecae0838d1f5dc3f7308848a7e3a84fdde..1a32fbb6b017df15fc78bcdb636eedc214f3f7df 100644
|
| --- a/Source/bindings/tests/results/V8TestCallback.cpp
|
| +++ b/Source/bindings/tests/results/V8TestCallbackInterface.cpp
|
| @@ -31,7 +31,7 @@
|
| // This file has been auto-generated by code_generator_v8.pm. DO NOT MODIFY!
|
|
|
| #include "config.h"
|
| -#include "V8TestCallback.h"
|
| +#include "V8TestCallbackInterface.h"
|
|
|
| #include "V8TestInterfaceEmpty.h"
|
| #include "bindings/v8/V8Binding.h"
|
| @@ -42,36 +42,36 @@
|
| #include "wtf/RefPtr.h"
|
| namespace WebCore {
|
|
|
| -V8TestCallback::V8TestCallback(v8::Handle<v8::Function> callback, ExecutionContext* context)
|
| +V8TestCallbackInterface::V8TestCallbackInterface(v8::Handle<v8::Function> callback, ExecutionContext* context)
|
| : ActiveDOMCallback(context)
|
| , m_callback(toIsolate(context), callback)
|
| , m_world(DOMWrapperWorld::current())
|
| {
|
| }
|
|
|
| -V8TestCallback::~V8TestCallback()
|
| +V8TestCallbackInterface::~V8TestCallbackInterface()
|
| {
|
| }
|
|
|
| -bool V8TestCallback::callbackWithNoArg()
|
| +void V8TestCallbackInterface::voidMethod()
|
| {
|
| if (!canInvokeCallback())
|
| - return true;
|
| + return;
|
|
|
| v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
| v8::HandleScope handleScope(isolate);
|
|
|
| v8::Handle<v8::Context> v8Context = toV8Context(executionContext(), m_world.get());
|
| if (v8Context.IsEmpty())
|
| - return true;
|
| + return;
|
|
|
| v8::Context::Scope scope(v8Context);
|
| v8::Handle<v8::Value> *argv = 0;
|
|
|
| - return invokeCallback(m_callback.newLocal(isolate), 0, argv, executionContext(), isolate);
|
| + invokeCallback(m_callback.newLocal(isolate), 0, argv, executionContext(), isolate);
|
| }
|
|
|
| -bool V8TestCallback::callbackWithTestInterfaceEmptyArg(TestInterfaceEmpty* class1Arg)
|
| +bool V8TestCallbackInterface::booleanMethod()
|
| {
|
| if (!canInvokeCallback())
|
| return true;
|
| @@ -84,151 +84,138 @@ bool V8TestCallback::callbackWithTestInterfaceEmptyArg(TestInterfaceEmpty* class
|
| return true;
|
|
|
| v8::Context::Scope scope(v8Context);
|
| - v8::Handle<v8::Value> class1ArgHandle = toV8(class1Arg, v8::Handle<v8::Object>(), isolate);
|
| - if (class1ArgHandle.IsEmpty()) {
|
| - if (!isScriptControllerTerminating())
|
| - CRASH();
|
| - return true;
|
| - }
|
| - v8::Handle<v8::Value> argv[] = { class1ArgHandle };
|
| + v8::Handle<v8::Value> *argv = 0;
|
|
|
| - return invokeCallback(m_callback.newLocal(isolate), 1, argv, executionContext(), isolate);
|
| + return invokeCallback(m_callback.newLocal(isolate), 0, argv, executionContext(), isolate);
|
| }
|
|
|
| -bool V8TestCallback::callbackWithTestInterfaceEmptyArg(TestInterfaceEmpty* class2Arg, const String& strArg)
|
| +void V8TestCallbackInterface::voidMethodBooleanArg(bool boolArg)
|
| {
|
| if (!canInvokeCallback())
|
| - return true;
|
| + return;
|
|
|
| v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
| v8::HandleScope handleScope(isolate);
|
|
|
| v8::Handle<v8::Context> v8Context = toV8Context(executionContext(), m_world.get());
|
| if (v8Context.IsEmpty())
|
| - return true;
|
| + return;
|
|
|
| v8::Context::Scope scope(v8Context);
|
| - v8::Handle<v8::Value> class2ArgHandle = toV8(class2Arg, v8::Handle<v8::Object>(), isolate);
|
| - if (class2ArgHandle.IsEmpty()) {
|
| - if (!isScriptControllerTerminating())
|
| - CRASH();
|
| - return true;
|
| - }
|
| - v8::Handle<v8::Value> strArgHandle = v8String(isolate, strArg);
|
| - if (strArgHandle.IsEmpty()) {
|
| + v8::Handle<v8::Value> boolArgHandle = v8Boolean(boolArg, isolate);
|
| + if (boolArgHandle.IsEmpty()) {
|
| if (!isScriptControllerTerminating())
|
| CRASH();
|
| - return true;
|
| + return;
|
| }
|
| - v8::Handle<v8::Value> argv[] = { class2ArgHandle, strArgHandle };
|
| + v8::Handle<v8::Value> argv[] = { boolArgHandle };
|
|
|
| - return invokeCallback(m_callback.newLocal(isolate), 2, argv, executionContext(), isolate);
|
| + invokeCallback(m_callback.newLocal(isolate), 1, argv, executionContext(), isolate);
|
| }
|
|
|
| -bool V8TestCallback::callbackWithBooleanArg(bool boolArg)
|
| +void V8TestCallbackInterface::voidMethodSequenceArg(const Vector<RefPtr<TestInterfaceEmpty> >& sequenceArg)
|
| {
|
| if (!canInvokeCallback())
|
| - return true;
|
| + return;
|
|
|
| v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
| v8::HandleScope handleScope(isolate);
|
|
|
| v8::Handle<v8::Context> v8Context = toV8Context(executionContext(), m_world.get());
|
| if (v8Context.IsEmpty())
|
| - return true;
|
| + return;
|
|
|
| v8::Context::Scope scope(v8Context);
|
| - v8::Handle<v8::Value> boolArgHandle = v8Boolean(boolArg, isolate);
|
| - if (boolArgHandle.IsEmpty()) {
|
| + v8::Handle<v8::Value> sequenceArgHandle = v8Array(sequenceArg, isolate);
|
| + if (sequenceArgHandle.IsEmpty()) {
|
| if (!isScriptControllerTerminating())
|
| CRASH();
|
| - return true;
|
| + return;
|
| }
|
| - v8::Handle<v8::Value> argv[] = { boolArgHandle };
|
| + v8::Handle<v8::Value> argv[] = { sequenceArgHandle };
|
|
|
| - return invokeCallback(m_callback.newLocal(isolate), 1, argv, executionContext(), isolate);
|
| + invokeCallback(m_callback.newLocal(isolate), 1, argv, executionContext(), isolate);
|
| }
|
|
|
| -bool V8TestCallback::callbackWithSequenceArg(const Vector<RefPtr<TestInterfaceEmpty> >& sequenceArg)
|
| +void V8TestCallbackInterface::voidMethodFloatArg(float floatArg)
|
| {
|
| if (!canInvokeCallback())
|
| - return true;
|
| + return;
|
|
|
| v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
| v8::HandleScope handleScope(isolate);
|
|
|
| v8::Handle<v8::Context> v8Context = toV8Context(executionContext(), m_world.get());
|
| if (v8Context.IsEmpty())
|
| - return true;
|
| + return;
|
|
|
| v8::Context::Scope scope(v8Context);
|
| - v8::Handle<v8::Value> sequenceArgHandle = v8Array(sequenceArg, isolate);
|
| - if (sequenceArgHandle.IsEmpty()) {
|
| + v8::Handle<v8::Value> floatArgHandle = v8::Number::New(isolate, floatArg);
|
| + if (floatArgHandle.IsEmpty()) {
|
| if (!isScriptControllerTerminating())
|
| CRASH();
|
| - return true;
|
| + return;
|
| }
|
| - v8::Handle<v8::Value> argv[] = { sequenceArgHandle };
|
| + v8::Handle<v8::Value> argv[] = { floatArgHandle };
|
|
|
| - return invokeCallback(m_callback.newLocal(isolate), 1, argv, executionContext(), isolate);
|
| + invokeCallback(m_callback.newLocal(isolate), 1, argv, executionContext(), isolate);
|
| }
|
|
|
| -bool V8TestCallback::callbackWithFloatArg(float floatArg)
|
| +void V8TestCallbackInterface::voidMethodTestInterfaceEmptyArg(TestInterfaceEmpty* testInterfaceEmptyArg)
|
| {
|
| if (!canInvokeCallback())
|
| - return true;
|
| + return;
|
|
|
| v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
| v8::HandleScope handleScope(isolate);
|
|
|
| v8::Handle<v8::Context> v8Context = toV8Context(executionContext(), m_world.get());
|
| if (v8Context.IsEmpty())
|
| - return true;
|
| + return;
|
|
|
| v8::Context::Scope scope(v8Context);
|
| - v8::Handle<v8::Value> floatArgHandle = v8::Number::New(isolate, floatArg);
|
| - if (floatArgHandle.IsEmpty()) {
|
| + v8::Handle<v8::Value> testInterfaceEmptyArgHandle = toV8(testInterfaceEmptyArg, v8::Handle<v8::Object>(), isolate);
|
| + if (testInterfaceEmptyArgHandle.IsEmpty()) {
|
| if (!isScriptControllerTerminating())
|
| CRASH();
|
| - return true;
|
| + return;
|
| }
|
| - v8::Handle<v8::Value> argv[] = { floatArgHandle };
|
| + v8::Handle<v8::Value> argv[] = { testInterfaceEmptyArgHandle };
|
|
|
| - return invokeCallback(m_callback.newLocal(isolate), 1, argv, executionContext(), isolate);
|
| + invokeCallback(m_callback.newLocal(isolate), 1, argv, executionContext(), isolate);
|
| }
|
|
|
| -bool V8TestCallback::callbackWithThisArg(ScriptValue thisValue, int arg)
|
| +void V8TestCallbackInterface::voidMethodTestInterfaceEmptyStringArg(TestInterfaceEmpty* testInterfaceEmptyArg, const String& stringArg)
|
| {
|
| if (!canInvokeCallback())
|
| - return true;
|
| + return;
|
|
|
| v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
| v8::HandleScope handleScope(isolate);
|
|
|
| v8::Handle<v8::Context> v8Context = toV8Context(executionContext(), m_world.get());
|
| if (v8Context.IsEmpty())
|
| - return true;
|
| + return;
|
|
|
| v8::Context::Scope scope(v8Context);
|
| - v8::Handle<v8::Value> thisHandle = thisValue.v8Value();
|
| - if (thisHandle.IsEmpty()) {
|
| + v8::Handle<v8::Value> testInterfaceEmptyArgHandle = toV8(testInterfaceEmptyArg, v8::Handle<v8::Object>(), isolate);
|
| + if (testInterfaceEmptyArgHandle.IsEmpty()) {
|
| if (!isScriptControllerTerminating())
|
| CRASH();
|
| - return true;
|
| + return;
|
| }
|
| - ASSERT(thisHandle->IsObject());
|
| - v8::Handle<v8::Value> argHandle = v8::Integer::New(isolate, arg);
|
| - if (argHandle.IsEmpty()) {
|
| + v8::Handle<v8::Value> stringArgHandle = v8String(isolate, stringArg);
|
| + if (stringArgHandle.IsEmpty()) {
|
| if (!isScriptControllerTerminating())
|
| CRASH();
|
| - return true;
|
| + return;
|
| }
|
| - v8::Handle<v8::Value> argv[] = { argHandle };
|
| + v8::Handle<v8::Value> argv[] = { testInterfaceEmptyArgHandle, stringArgHandle };
|
|
|
| - return invokeCallback(m_callback.newLocal(isolate), v8::Handle<v8::Object>::Cast(thisHandle), 1, argv, executionContext(), isolate);
|
| + invokeCallback(m_callback.newLocal(isolate), 2, argv, executionContext(), isolate);
|
| }
|
|
|
| -void V8TestCallback::callbackWithVoidReturnValue()
|
| +void V8TestCallbackInterface::callbackWithThisValueVoidMethodStringArg(ScriptValue thisValue, const String& stringArg)
|
| {
|
| if (!canInvokeCallback())
|
| return;
|
| @@ -241,9 +228,22 @@ void V8TestCallback::callbackWithVoidReturnValue()
|
| return;
|
|
|
| v8::Context::Scope scope(v8Context);
|
| - v8::Handle<v8::Value> *argv = 0;
|
| + v8::Handle<v8::Value> thisHandle = thisValue.v8Value();
|
| + if (thisHandle.IsEmpty()) {
|
| + if (!isScriptControllerTerminating())
|
| + CRASH();
|
| + return;
|
| + }
|
| + ASSERT(thisHandle->IsObject());
|
| + v8::Handle<v8::Value> stringArgHandle = v8String(isolate, stringArg);
|
| + if (stringArgHandle.IsEmpty()) {
|
| + if (!isScriptControllerTerminating())
|
| + CRASH();
|
| + return;
|
| + }
|
| + v8::Handle<v8::Value> argv[] = { stringArgHandle };
|
|
|
| - invokeCallback(m_callback.newLocal(isolate), 0, argv, executionContext(), isolate);
|
| + invokeCallback(m_callback.newLocal(isolate), v8::Handle<v8::Object>::Cast(thisHandle), 1, argv, executionContext(), isolate);
|
| }
|
|
|
| } // namespace WebCore
|
|
|