| 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..c53da4b0ed4608c76f2790c4f4d7d2fe15f94150 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,15 +6335,14 @@ 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());
|
| + TestInterfaceGarbageCollectedOrString result;
|
| + impl->testInterfaceGarbageCollectedOrDOMStringMethod(result);
|
| + if (result.isTestInterfaceGarbageCollected()) {
|
| + v8SetReturnValue(info, result.getAsTestInterfaceGarbageCollected());
|
| return;
|
| }
|
| - if (!result1.isNull()) {
|
| - v8SetReturnValueString(info, result1, info.GetIsolate());
|
| + if (result.isString()) {
|
| + v8SetReturnValueString(info, result.getAsString(), info.GetIsolate());
|
| return;
|
| }
|
| v8SetReturnValueNull(info);
|
| @@ -6358,14 +6358,13 @@ 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());
|
| + TestInterfaceWillBeGarbageCollectedOrTestDictionary result;
|
| + impl->testInterfaceWillBeGarbageCollectedOrTestDictionaryMethod(result);
|
| + if (result.isTestInterfaceWillBeGarbageCollected()) {
|
| + v8SetReturnValue(info, result.getAsTestInterfaceWillBeGarbageCollected());
|
| return;
|
| }
|
| - if (result1) {
|
| + if (result.isTestDictionary()) {
|
| v8SetReturnValue(info, result);
|
| return;
|
| }
|
| @@ -6382,20 +6381,18 @@ 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()));
|
| + LongSequenceOrStringArrayOrUnrestrictedDouble result;
|
| + impl->longSequenceOrDOMStringArrayOrUnrestrictedDoubleMethod(result);
|
| + if (result.isLongSequence()) {
|
| + v8SetReturnValue(info, v8Array(result.getAsLongSequence(), info.Holder(), info.GetIsolate()));
|
| return;
|
| }
|
| - if (result1) {
|
| - v8SetReturnValue(info, v8Array(result1.get(), info.Holder(), info.GetIsolate()));
|
| + if (result.isStringArray()) {
|
| + v8SetReturnValue(info, v8Array(result.getAsStringArray(), info.Holder(), info.GetIsolate()));
|
| return;
|
| }
|
| - if (result2) {
|
| - v8SetReturnValue(info, result2.get());
|
| + if (result.isUnrestrictedDouble()) {
|
| + v8SetReturnValue(info, result.getAsUnrestrictedDouble());
|
| return;
|
| }
|
| v8SetReturnValueNull(info);
|
|
|