| Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestDictionary.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestDictionary.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestDictionary.cpp
|
| index 6f5cc7f429e1f884f3e343c0ad4a230d11c9964c..697c15366394a082574f170cece34ee823dcc4d2 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestDictionary.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestDictionary.cpp
|
| @@ -17,7 +17,7 @@
|
| #include "bindings/core/v8/V8TestInterface.h"
|
| #include "bindings/core/v8/V8TestInterface2.h"
|
| #include "bindings/core/v8/V8TestInterfaceGarbageCollected.h"
|
| -#include "bindings/core/v8/V8TestInterfaceWillBeGarbageCollected.h"
|
| +#include "bindings/core/v8/V8TestInterfaceGarbageCollected.h"
|
| #include "bindings/core/v8/V8Uint8Array.h"
|
| #include "core/dom/FlexibleArrayBufferView.h"
|
| #include "core/frame/UseCounter.h"
|
| @@ -571,56 +571,56 @@ void V8TestDictionary::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value
|
| }
|
|
|
| {
|
| - v8::Local<v8::Value> testInterfaceWillBeGarbageCollectedMemberValue;
|
| - if (!v8Object->Get(isolate->GetCurrentContext(), v8String(isolate, "testInterfaceWillBeGarbageCollectedMember")).ToLocal(&testInterfaceWillBeGarbageCollectedMemberValue)) {
|
| + v8::Local<v8::Value> testInterfaceGarbageCollectedMemberValue;
|
| + if (!v8Object->Get(isolate->GetCurrentContext(), v8String(isolate, "testInterfaceGarbageCollectedMember")).ToLocal(&testInterfaceGarbageCollectedMemberValue)) {
|
| exceptionState.rethrowV8Exception(block.Exception());
|
| return;
|
| }
|
| - if (testInterfaceWillBeGarbageCollectedMemberValue.IsEmpty() || testInterfaceWillBeGarbageCollectedMemberValue->IsUndefined()) {
|
| + if (testInterfaceGarbageCollectedMemberValue.IsEmpty() || testInterfaceGarbageCollectedMemberValue->IsUndefined()) {
|
| // Do nothing.
|
| } else {
|
| - TestInterfaceWillBeGarbageCollected* testInterfaceWillBeGarbageCollectedMember = V8TestInterfaceWillBeGarbageCollected::toImplWithTypeCheck(isolate, testInterfaceWillBeGarbageCollectedMemberValue);
|
| - if (!testInterfaceWillBeGarbageCollectedMember && !testInterfaceWillBeGarbageCollectedMemberValue->IsNull()) {
|
| - exceptionState.throwTypeError("member testInterfaceWillBeGarbageCollectedMember is not of type TestInterfaceWillBeGarbageCollected.");
|
| + TestInterfaceGarbageCollected* testInterfaceGarbageCollectedMember = V8TestInterfaceGarbageCollected::toImplWithTypeCheck(isolate, testInterfaceGarbageCollectedMemberValue);
|
| + if (!testInterfaceGarbageCollectedMember && !testInterfaceGarbageCollectedMemberValue->IsNull()) {
|
| + exceptionState.throwTypeError("member testInterfaceGarbageCollectedMember is not of type TestInterfaceGarbageCollected.");
|
| return;
|
| }
|
| - impl.setTestInterfaceWillBeGarbageCollectedMember(testInterfaceWillBeGarbageCollectedMember);
|
| + impl.setTestInterfaceGarbageCollectedMember(testInterfaceGarbageCollectedMember);
|
| }
|
| }
|
|
|
| {
|
| - v8::Local<v8::Value> testInterfaceWillBeGarbageCollectedOrNullMemberValue;
|
| - if (!v8Object->Get(isolate->GetCurrentContext(), v8String(isolate, "testInterfaceWillBeGarbageCollectedOrNullMember")).ToLocal(&testInterfaceWillBeGarbageCollectedOrNullMemberValue)) {
|
| + v8::Local<v8::Value> testInterfaceGarbageCollectedOrNullMemberValue;
|
| + if (!v8Object->Get(isolate->GetCurrentContext(), v8String(isolate, "testInterfaceGarbageCollectedOrNullMember")).ToLocal(&testInterfaceGarbageCollectedOrNullMemberValue)) {
|
| exceptionState.rethrowV8Exception(block.Exception());
|
| return;
|
| }
|
| - if (testInterfaceWillBeGarbageCollectedOrNullMemberValue.IsEmpty() || testInterfaceWillBeGarbageCollectedOrNullMemberValue->IsUndefined()) {
|
| + if (testInterfaceGarbageCollectedOrNullMemberValue.IsEmpty() || testInterfaceGarbageCollectedOrNullMemberValue->IsUndefined()) {
|
| // Do nothing.
|
| - } else if (testInterfaceWillBeGarbageCollectedOrNullMemberValue->IsNull()) {
|
| - impl.setTestInterfaceWillBeGarbageCollectedOrNullMemberToNull();
|
| + } else if (testInterfaceGarbageCollectedOrNullMemberValue->IsNull()) {
|
| + impl.setTestInterfaceGarbageCollectedOrNullMemberToNull();
|
| } else {
|
| - TestInterfaceWillBeGarbageCollected* testInterfaceWillBeGarbageCollectedOrNullMember = V8TestInterfaceWillBeGarbageCollected::toImplWithTypeCheck(isolate, testInterfaceWillBeGarbageCollectedOrNullMemberValue);
|
| - if (!testInterfaceWillBeGarbageCollectedOrNullMember && !testInterfaceWillBeGarbageCollectedOrNullMemberValue->IsNull()) {
|
| - exceptionState.throwTypeError("member testInterfaceWillBeGarbageCollectedOrNullMember is not of type TestInterfaceWillBeGarbageCollected.");
|
| + TestInterfaceGarbageCollected* testInterfaceGarbageCollectedOrNullMember = V8TestInterfaceGarbageCollected::toImplWithTypeCheck(isolate, testInterfaceGarbageCollectedOrNullMemberValue);
|
| + if (!testInterfaceGarbageCollectedOrNullMember && !testInterfaceGarbageCollectedOrNullMemberValue->IsNull()) {
|
| + exceptionState.throwTypeError("member testInterfaceGarbageCollectedOrNullMember is not of type TestInterfaceGarbageCollected.");
|
| return;
|
| }
|
| - impl.setTestInterfaceWillBeGarbageCollectedOrNullMember(testInterfaceWillBeGarbageCollectedOrNullMember);
|
| + impl.setTestInterfaceGarbageCollectedOrNullMember(testInterfaceGarbageCollectedOrNullMember);
|
| }
|
| }
|
|
|
| {
|
| - v8::Local<v8::Value> testInterfaceWillBeGarbageCollectedSequenceMemberValue;
|
| - if (!v8Object->Get(isolate->GetCurrentContext(), v8String(isolate, "testInterfaceWillBeGarbageCollectedSequenceMember")).ToLocal(&testInterfaceWillBeGarbageCollectedSequenceMemberValue)) {
|
| + v8::Local<v8::Value> testInterfaceGarbageCollectedSequenceMemberValue;
|
| + if (!v8Object->Get(isolate->GetCurrentContext(), v8String(isolate, "testInterfaceGarbageCollectedSequenceMember")).ToLocal(&testInterfaceGarbageCollectedSequenceMemberValue)) {
|
| exceptionState.rethrowV8Exception(block.Exception());
|
| return;
|
| }
|
| - if (testInterfaceWillBeGarbageCollectedSequenceMemberValue.IsEmpty() || testInterfaceWillBeGarbageCollectedSequenceMemberValue->IsUndefined()) {
|
| + if (testInterfaceGarbageCollectedSequenceMemberValue.IsEmpty() || testInterfaceGarbageCollectedSequenceMemberValue->IsUndefined()) {
|
| // Do nothing.
|
| } else {
|
| - WillBeHeapVector<RefPtrWillBeMember<TestInterfaceWillBeGarbageCollected>> testInterfaceWillBeGarbageCollectedSequenceMember = (toRefPtrWillBeMemberNativeArray<TestInterfaceWillBeGarbageCollected, V8TestInterfaceWillBeGarbageCollected>(testInterfaceWillBeGarbageCollectedSequenceMemberValue, 0, isolate, exceptionState));
|
| + HeapVector<Member<TestInterfaceGarbageCollected>> testInterfaceGarbageCollectedSequenceMember = (toMemberNativeArray<TestInterfaceGarbageCollected, V8TestInterfaceGarbageCollected>(testInterfaceGarbageCollectedSequenceMemberValue, 0, isolate, exceptionState));
|
| if (exceptionState.hadException())
|
| return;
|
| - impl.setTestInterfaceWillBeGarbageCollectedSequenceMember(testInterfaceWillBeGarbageCollectedSequenceMember);
|
| + impl.setTestInterfaceGarbageCollectedSequenceMember(testInterfaceGarbageCollectedSequenceMember);
|
| }
|
| }
|
|
|
| @@ -856,21 +856,21 @@ bool toV8TestDictionary(const TestDictionary& impl, v8::Local<v8::Object> dictio
|
| return false;
|
| }
|
|
|
| - if (impl.hasTestInterfaceWillBeGarbageCollectedMember()) {
|
| - if (!v8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext(), v8String(isolate, "testInterfaceWillBeGarbageCollectedMember"), toV8(impl.testInterfaceWillBeGarbageCollectedMember(), creationContext, isolate))))
|
| + if (impl.hasTestInterfaceGarbageCollectedMember()) {
|
| + if (!v8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext(), v8String(isolate, "testInterfaceGarbageCollectedMember"), toV8(impl.testInterfaceGarbageCollectedMember(), creationContext, isolate))))
|
| return false;
|
| }
|
|
|
| - if (impl.hasTestInterfaceWillBeGarbageCollectedOrNullMember()) {
|
| - if (!v8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext(), v8String(isolate, "testInterfaceWillBeGarbageCollectedOrNullMember"), toV8(impl.testInterfaceWillBeGarbageCollectedOrNullMember(), creationContext, isolate))))
|
| + if (impl.hasTestInterfaceGarbageCollectedOrNullMember()) {
|
| + if (!v8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext(), v8String(isolate, "testInterfaceGarbageCollectedOrNullMember"), toV8(impl.testInterfaceGarbageCollectedOrNullMember(), creationContext, isolate))))
|
| return false;
|
| }
|
|
|
| - if (impl.hasTestInterfaceWillBeGarbageCollectedSequenceMember()) {
|
| - if (!v8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext(), v8String(isolate, "testInterfaceWillBeGarbageCollectedSequenceMember"), toV8(impl.testInterfaceWillBeGarbageCollectedSequenceMember(), creationContext, isolate))))
|
| + if (impl.hasTestInterfaceGarbageCollectedSequenceMember()) {
|
| + if (!v8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext(), v8String(isolate, "testInterfaceGarbageCollectedSequenceMember"), toV8(impl.testInterfaceGarbageCollectedSequenceMember(), creationContext, isolate))))
|
| return false;
|
| } else {
|
| - if (!v8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext(), v8String(isolate, "testInterfaceWillBeGarbageCollectedSequenceMember"), toV8(WillBeHeapVector<RefPtrWillBeMember<TestInterfaceWillBeGarbageCollected>>(), creationContext, isolate))))
|
| + if (!v8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext(), v8String(isolate, "testInterfaceGarbageCollectedSequenceMember"), toV8(HeapVector<Member<TestInterfaceGarbageCollected>>(), creationContext, isolate))))
|
| return false;
|
| }
|
|
|
|
|