| Index: Source/bindings/tests/results/core/V8TestObject.cpp
|
| diff --git a/Source/bindings/tests/results/core/V8TestObject.cpp b/Source/bindings/tests/results/core/V8TestObject.cpp
|
| index 9c28c961919c4939c76e0ec0b0ff2eaadeaa4238..e5b722d1855d3730ebfb110831b479a59045304d 100644
|
| --- a/Source/bindings/tests/results/core/V8TestObject.cpp
|
| +++ b/Source/bindings/tests/results/core/V8TestObject.cpp
|
| @@ -16,6 +16,7 @@
|
| #include "bindings/core/v8/ScriptState.h"
|
| #include "bindings/core/v8/ScriptValue.h"
|
| #include "bindings/core/v8/SerializedScriptValue.h"
|
| +#include "bindings/core/v8/UnionTypesCore.h"
|
| #include "bindings/core/v8/V8AbstractEventListener.h"
|
| #include "bindings/core/v8/V8ArrayBuffer.h"
|
| #include "bindings/core/v8/V8ArrayBufferView.h"
|
| @@ -6334,18 +6335,9 @@ static void nullableLongSequenceMethodMethodCallback(const v8::FunctionCallbackI
|
| static void testInterfaceGarbageCollectedOrDOMStringMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| TestObject* impl = V8TestObject::toImpl(info.Holder());
|
| - RawPtr<TestInterfaceGarbageCollected> result0 = nullptr;
|
| - String result1;
|
| - impl->testInterfaceGarbageCollectedOrDOMStringMethod(result0, result1);
|
| - if (result0) {
|
| - v8SetReturnValue(info, result0.release());
|
| - return;
|
| - }
|
| - if (!result1.isNull()) {
|
| - v8SetReturnValueString(info, result1, info.GetIsolate());
|
| - return;
|
| - }
|
| - v8SetReturnValueNull(info);
|
| + TestInterfaceGarbageCollectedOrString result;
|
| + impl->testInterfaceGarbageCollectedOrDOMStringMethod(result);
|
| + v8SetReturnValue(info, result);
|
| }
|
|
|
| static void testInterfaceGarbageCollectedOrDOMStringMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| @@ -6358,18 +6350,9 @@ static void testInterfaceGarbageCollectedOrDOMStringMethodMethodCallback(const v
|
| static void testInterfaceWillBeGarbageCollectedOrTestDictionaryMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| TestObject* impl = V8TestObject::toImpl(info.Holder());
|
| - RefPtrWillBeRawPtr<TestInterfaceWillBeGarbageCollected> result0 = nullptr;
|
| - Nullable<TestDictionary> result1;
|
| - impl->testInterfaceWillBeGarbageCollectedOrTestDictionaryMethod(result0, result1);
|
| - if (result0) {
|
| - v8SetReturnValue(info, result0.release());
|
| - return;
|
| - }
|
| - if (result1) {
|
| - v8SetReturnValue(info, result);
|
| - return;
|
| - }
|
| - v8SetReturnValueNull(info);
|
| + TestInterfaceWillBeGarbageCollectedOrTestDictionary result;
|
| + impl->testInterfaceWillBeGarbageCollectedOrTestDictionaryMethod(result);
|
| + v8SetReturnValue(info, result);
|
| }
|
|
|
| static void testInterfaceWillBeGarbageCollectedOrTestDictionaryMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| @@ -6382,23 +6365,9 @@ static void testInterfaceWillBeGarbageCollectedOrTestDictionaryMethodMethodCallb
|
| static void longSequenceOrDOMStringArrayOrUnrestrictedDoubleMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| TestObject* impl = V8TestObject::toImpl(info.Holder());
|
| - Nullable<Vector<int> > result0;
|
| - Nullable<Vector<String> > result1;
|
| - Nullable<double> result2;
|
| - impl->longSequenceOrDOMStringArrayOrUnrestrictedDoubleMethod(result0, result1, result2);
|
| - if (result0) {
|
| - v8SetReturnValue(info, v8Array(result0.get(), info.Holder(), info.GetIsolate()));
|
| - return;
|
| - }
|
| - if (result1) {
|
| - v8SetReturnValue(info, v8Array(result1.get(), info.Holder(), info.GetIsolate()));
|
| - return;
|
| - }
|
| - if (result2) {
|
| - v8SetReturnValue(info, result2.get());
|
| - return;
|
| - }
|
| - v8SetReturnValueNull(info);
|
| + LongSequenceOrStringArrayOrUnrestrictedDouble result;
|
| + impl->longSequenceOrDOMStringArrayOrUnrestrictedDoubleMethod(result);
|
| + v8SetReturnValue(info, result);
|
| }
|
|
|
| static void longSequenceOrDOMStringArrayOrUnrestrictedDoubleMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
|
|