| Index: Source/bindings/tests/results/V8TestDictionary.cpp
|
| diff --git a/Source/bindings/tests/results/V8TestDictionary.cpp b/Source/bindings/tests/results/V8TestDictionary.cpp
|
| index 002661dde6ab6501c41b6750be57e344ed5874a3..d65fbd9c6fddeeaf25e28e2a5009595d78b64aad 100644
|
| --- a/Source/bindings/tests/results/V8TestDictionary.cpp
|
| +++ b/Source/bindings/tests/results/V8TestDictionary.cpp
|
| @@ -9,6 +9,8 @@
|
|
|
| #include "bindings/core/v8/Dictionary.h"
|
| #include "bindings/tests/v8/V8TestInterface.h"
|
| +#include "bindings/tests/v8/V8TestInterfaceGarbageCollected.h"
|
| +#include "bindings/tests/v8/V8TestInterfaceWillBeGarbageCollected.h"
|
|
|
| namespace blink {
|
|
|
| @@ -29,6 +31,9 @@ TestDictionary* V8TestDictionary::toNative(v8::Isolate* isolate, v8::Handle<v8::
|
| impl->setLongMember(longMember);
|
| else
|
| impl->setLongMember(1);
|
| + Vector<String> stringArrayMember;
|
| + if (DictionaryHelper::get(dictionary, "stringArrayMember", stringArrayMember))
|
| + impl->setStringArrayMember(stringArrayMember);
|
| String stringMember;
|
| if (DictionaryHelper::get(dictionary, "stringMember", stringMember))
|
| impl->setStringMember(stringMember);
|
| @@ -37,12 +42,27 @@ TestDictionary* V8TestDictionary::toNative(v8::Isolate* isolate, v8::Handle<v8::
|
| impl->setStringOrNullMember(stringOrNullMember);
|
| else
|
| impl->setStringOrNullMember(String("default string value"));
|
| + Vector<String> stringSequenceMember;
|
| + if (DictionaryHelper::get(dictionary, "stringSequenceMember", stringSequenceMember))
|
| + impl->setStringSequenceMember(stringSequenceMember);
|
| + RawPtr<TestInterfaceGarbageCollected> testInterfaceGarbageCollectedMember;
|
| + if (DictionaryHelper::get(dictionary, "testInterfaceGarbageCollectedMember", testInterfaceGarbageCollectedMember))
|
| + impl->setTestInterfaceGarbageCollectedMember(testInterfaceGarbageCollectedMember);
|
| + RawPtr<TestInterfaceGarbageCollected> testInterfaceGarbageCollectedOrNullMember;
|
| + if (DictionaryHelper::get(dictionary, "testInterfaceGarbageCollectedOrNullMember", testInterfaceGarbageCollectedOrNullMember))
|
| + impl->setTestInterfaceGarbageCollectedOrNullMember(testInterfaceGarbageCollectedOrNullMember);
|
| RefPtr<TestInterfaceImplementation> testInterfaceMember;
|
| if (DictionaryHelper::get(dictionary, "testInterfaceMember", testInterfaceMember))
|
| impl->setTestInterfaceMember(testInterfaceMember);
|
| RefPtr<TestInterfaceImplementation> testInterfaceOrNullMember;
|
| if (DictionaryHelper::get(dictionary, "testInterfaceOrNullMember", testInterfaceOrNullMember))
|
| impl->setTestInterfaceOrNullMember(testInterfaceOrNullMember);
|
| + RefPtrWillBeRawPtr<TestInterfaceWillBeGarbageCollected> testInterfaceWillBeGarbageCollectedMember;
|
| + if (DictionaryHelper::get(dictionary, "testInterfaceWillBeGarbageCollectedMember", testInterfaceWillBeGarbageCollectedMember))
|
| + impl->setTestInterfaceWillBeGarbageCollectedMember(testInterfaceWillBeGarbageCollectedMember);
|
| + RefPtrWillBeRawPtr<TestInterfaceWillBeGarbageCollected> testInterfaceWillBeGarbageCollectedOrNullMember;
|
| + if (DictionaryHelper::get(dictionary, "testInterfaceWillBeGarbageCollectedOrNullMember", testInterfaceWillBeGarbageCollectedOrNullMember))
|
| + impl->setTestInterfaceWillBeGarbageCollectedOrNullMember(testInterfaceWillBeGarbageCollectedOrNullMember);
|
| return impl;
|
| }
|
|
|
| @@ -59,16 +79,28 @@ v8::Handle<v8::Value> toV8(TestDictionary* impl, v8::Handle<v8::Object> creation
|
| v8Object->Set(v8String(isolate, "longMember"), v8::Integer::New(isolate, impl->longMember()));
|
| else
|
| v8Object->Set(v8String(isolate, "longMember"), v8::Integer::New(isolate, 1));
|
| + if (impl->hasStringArrayMember())
|
| + v8Object->Set(v8String(isolate, "stringArrayMember"), v8Array(impl->stringArrayMember(), creationContext, isolate));
|
| if (impl->hasStringMember())
|
| v8Object->Set(v8String(isolate, "stringMember"), v8String(isolate, impl->stringMember()));
|
| if (impl->hasStringOrNullMember())
|
| v8Object->Set(v8String(isolate, "stringOrNullMember"), impl->stringOrNullMember().isNull() ? v8::Handle<v8::Value>(v8::Null(isolate)) : v8String(isolate, impl->stringOrNullMember()));
|
| else
|
| v8Object->Set(v8String(isolate, "stringOrNullMember"), v8String(isolate, String("default string value")));
|
| + if (impl->hasStringSequenceMember())
|
| + v8Object->Set(v8String(isolate, "stringSequenceMember"), v8Array(impl->stringSequenceMember(), creationContext, isolate));
|
| + if (impl->hasTestInterfaceGarbageCollectedMember())
|
| + v8Object->Set(v8String(isolate, "testInterfaceGarbageCollectedMember"), toV8(impl->testInterfaceGarbageCollectedMember(), creationContext, isolate));
|
| + if (impl->hasTestInterfaceGarbageCollectedOrNullMember())
|
| + v8Object->Set(v8String(isolate, "testInterfaceGarbageCollectedOrNullMember"), toV8(impl->testInterfaceGarbageCollectedOrNullMember(), creationContext, isolate));
|
| if (impl->hasTestInterfaceMember())
|
| v8Object->Set(v8String(isolate, "testInterfaceMember"), toV8(impl->testInterfaceMember(), creationContext, isolate));
|
| if (impl->hasTestInterfaceOrNullMember())
|
| v8Object->Set(v8String(isolate, "testInterfaceOrNullMember"), toV8(impl->testInterfaceOrNullMember(), creationContext, isolate));
|
| + if (impl->hasTestInterfaceWillBeGarbageCollectedMember())
|
| + v8Object->Set(v8String(isolate, "testInterfaceWillBeGarbageCollectedMember"), toV8(impl->testInterfaceWillBeGarbageCollectedMember(), creationContext, isolate));
|
| + if (impl->hasTestInterfaceWillBeGarbageCollectedOrNullMember())
|
| + v8Object->Set(v8String(isolate, "testInterfaceWillBeGarbageCollectedOrNullMember"), toV8(impl->testInterfaceWillBeGarbageCollectedOrNullMember(), creationContext, isolate));
|
| return v8Object;
|
| }
|
|
|
|
|