| Index: Source/bindings/tests/results/V8TestInterface2.cpp
|
| diff --git a/Source/bindings/tests/results/V8TestSpecialOperationsIdentifierRaisesException.cpp b/Source/bindings/tests/results/V8TestInterface2.cpp
|
| similarity index 63%
|
| rename from Source/bindings/tests/results/V8TestSpecialOperationsIdentifierRaisesException.cpp
|
| rename to Source/bindings/tests/results/V8TestInterface2.cpp
|
| index abbe52e2ee24e64a7e6887f018cef40799c64872..2e262406df739b196628e1b95330da548c6acaab 100644
|
| --- a/Source/bindings/tests/results/V8TestSpecialOperationsIdentifierRaisesException.cpp
|
| +++ b/Source/bindings/tests/results/V8TestInterface2.cpp
|
| @@ -5,53 +5,58 @@
|
| // This file has been auto-generated by code_generator_v8.py. DO NOT MODIFY!
|
|
|
| #include "config.h"
|
| -#include "V8TestSpecialOperationsIdentifierRaisesException.h"
|
| +#include "V8TestInterface2.h"
|
|
|
| #include "RuntimeEnabledFeatures.h"
|
| +#include "V8Interface1.h"
|
| +#include "V8Interface2.h"
|
| #include "V8TestInterfaceEmpty.h"
|
| #include "bindings/v8/ExceptionState.h"
|
| #include "bindings/v8/V8DOMConfiguration.h"
|
| +#include "bindings/v8/V8GCController.h"
|
| #include "bindings/v8/V8HiddenValue.h"
|
| #include "bindings/v8/V8ObjectConstructor.h"
|
| #include "core/dom/ContextFeatures.h"
|
| #include "core/dom/Document.h"
|
| +#include "core/dom/Element.h"
|
| +#include "core/frame/DOMWindow.h"
|
| #include "platform/TraceEvent.h"
|
| #include "wtf/GetPtr.h"
|
| #include "wtf/RefPtr.h"
|
|
|
| namespace WebCore {
|
|
|
| -static void initializeScriptWrappableForInterface(TestSpecialOperationsIdentifierRaisesException* object)
|
| +static void initializeScriptWrappableForInterface(TestInterface2* object)
|
| {
|
| if (ScriptWrappable::wrapperCanBeStoredInObject(object))
|
| - ScriptWrappable::setTypeInfoInObject(object, &V8TestSpecialOperationsIdentifierRaisesException::wrapperTypeInfo);
|
| + ScriptWrappable::setTypeInfoInObject(object, &V8TestInterface2::wrapperTypeInfo);
|
| else
|
| ASSERT_NOT_REACHED();
|
| }
|
|
|
| } // namespace WebCore
|
|
|
| -void webCoreInitializeScriptWrappableForInterface(WebCore::TestSpecialOperationsIdentifierRaisesException* object)
|
| +void webCoreInitializeScriptWrappableForInterface(WebCore::TestInterface2* object)
|
| {
|
| WebCore::initializeScriptWrappableForInterface(object);
|
| }
|
|
|
| namespace WebCore {
|
| -const WrapperTypeInfo V8TestSpecialOperationsIdentifierRaisesException::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestSpecialOperationsIdentifierRaisesException::domTemplate, V8TestSpecialOperationsIdentifierRaisesException::derefObject, 0, 0, 0, V8TestSpecialOperationsIdentifierRaisesException::installPerContextEnabledMethods, 0, WrapperTypeObjectPrototype, false };
|
| +const WrapperTypeInfo V8TestInterface2::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestInterface2::domTemplate, V8TestInterface2::derefObject, 0, 0, V8TestInterface2::visitDOMWrapper, V8TestInterface2::installPerContextEnabledMethods, 0, WrapperTypeObjectPrototype, false };
|
|
|
| -namespace TestSpecialOperationsIdentifierRaisesExceptionV8Internal {
|
| +namespace TestInterface2V8Internal {
|
|
|
| template <typename T> void V8_USE(T) { }
|
|
|
| static void itemMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "item", "TestSpecialOperationsIdentifierRaisesException", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(ExceptionState::ExecutionContext, "item", "TestInterface2", info.Holder(), info.GetIsolate());
|
| if (UNLIKELY(info.Length() < 1)) {
|
| exceptionState.throwTypeError(ExceptionMessages::notEnoughArguments(1, info.Length()));
|
| exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| - TestSpecialOperationsIdentifierRaisesException* impl = V8TestSpecialOperationsIdentifierRaisesException::toNative(info.Holder());
|
| + TestInterface2* impl = V8TestInterface2::toNative(info.Holder());
|
| V8TRYCATCH_EXCEPTION_VOID(unsigned, index, toUInt32(info[0], exceptionState), exceptionState);
|
| RefPtr<TestInterfaceEmpty> result = impl->item(index, exceptionState);
|
| if (exceptionState.throwIfNeeded())
|
| @@ -62,19 +67,19 @@ static void itemMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| static void itemMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
|
| - TestSpecialOperationsIdentifierRaisesExceptionV8Internal::itemMethod(info);
|
| + TestInterface2V8Internal::itemMethod(info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| static void setItemMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "setItem", "TestSpecialOperationsIdentifierRaisesException", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(ExceptionState::ExecutionContext, "setItem", "TestInterface2", info.Holder(), info.GetIsolate());
|
| if (UNLIKELY(info.Length() < 2)) {
|
| exceptionState.throwTypeError(ExceptionMessages::notEnoughArguments(2, info.Length()));
|
| exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| - TestSpecialOperationsIdentifierRaisesException* impl = V8TestSpecialOperationsIdentifierRaisesException::toNative(info.Holder());
|
| + TestInterface2* impl = V8TestInterface2::toNative(info.Holder());
|
| V8TRYCATCH_EXCEPTION_VOID(unsigned, index, toUInt32(info[0], exceptionState), exceptionState);
|
| V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, value, info[1]);
|
| String result = impl->setItem(index, value, exceptionState);
|
| @@ -86,19 +91,19 @@ static void setItemMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| static void setItemMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
|
| - TestSpecialOperationsIdentifierRaisesExceptionV8Internal::setItemMethod(info);
|
| + TestInterface2V8Internal::setItemMethod(info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| static void deleteItemMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "deleteItem", "TestSpecialOperationsIdentifierRaisesException", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(ExceptionState::ExecutionContext, "deleteItem", "TestInterface2", info.Holder(), info.GetIsolate());
|
| if (UNLIKELY(info.Length() < 1)) {
|
| exceptionState.throwTypeError(ExceptionMessages::notEnoughArguments(1, info.Length()));
|
| exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| - TestSpecialOperationsIdentifierRaisesException* impl = V8TestSpecialOperationsIdentifierRaisesException::toNative(info.Holder());
|
| + TestInterface2* impl = V8TestInterface2::toNative(info.Holder());
|
| V8TRYCATCH_EXCEPTION_VOID(unsigned, index, toUInt32(info[0], exceptionState), exceptionState);
|
| bool result = impl->deleteItem(index, exceptionState);
|
| if (exceptionState.throwIfNeeded())
|
| @@ -109,19 +114,19 @@ static void deleteItemMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| static void deleteItemMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
|
| - TestSpecialOperationsIdentifierRaisesExceptionV8Internal::deleteItemMethod(info);
|
| + TestInterface2V8Internal::deleteItemMethod(info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| static void namedItemMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "namedItem", "TestSpecialOperationsIdentifierRaisesException", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(ExceptionState::ExecutionContext, "namedItem", "TestInterface2", info.Holder(), info.GetIsolate());
|
| if (UNLIKELY(info.Length() < 1)) {
|
| exceptionState.throwTypeError(ExceptionMessages::notEnoughArguments(1, info.Length()));
|
| exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| - TestSpecialOperationsIdentifierRaisesException* impl = V8TestSpecialOperationsIdentifierRaisesException::toNative(info.Holder());
|
| + TestInterface2* impl = V8TestInterface2::toNative(info.Holder());
|
| V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, name, info[0]);
|
| RefPtr<TestInterfaceEmpty> result = impl->namedItem(name, exceptionState);
|
| if (exceptionState.throwIfNeeded())
|
| @@ -132,19 +137,19 @@ static void namedItemMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| static void namedItemMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
|
| - TestSpecialOperationsIdentifierRaisesExceptionV8Internal::namedItemMethod(info);
|
| + TestInterface2V8Internal::namedItemMethod(info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| static void setNamedItemMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "setNamedItem", "TestSpecialOperationsIdentifierRaisesException", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(ExceptionState::ExecutionContext, "setNamedItem", "TestInterface2", info.Holder(), info.GetIsolate());
|
| if (UNLIKELY(info.Length() < 2)) {
|
| exceptionState.throwTypeError(ExceptionMessages::notEnoughArguments(2, info.Length()));
|
| exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| - TestSpecialOperationsIdentifierRaisesException* impl = V8TestSpecialOperationsIdentifierRaisesException::toNative(info.Holder());
|
| + TestInterface2* impl = V8TestInterface2::toNative(info.Holder());
|
| V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, name, info[0]);
|
| V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, value, info[1]);
|
| String result = impl->setNamedItem(name, value, exceptionState);
|
| @@ -156,19 +161,19 @@ static void setNamedItemMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| static void setNamedItemMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
|
| - TestSpecialOperationsIdentifierRaisesExceptionV8Internal::setNamedItemMethod(info);
|
| + TestInterface2V8Internal::setNamedItemMethod(info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| static void deleteNamedItemMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "deleteNamedItem", "TestSpecialOperationsIdentifierRaisesException", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(ExceptionState::ExecutionContext, "deleteNamedItem", "TestInterface2", info.Holder(), info.GetIsolate());
|
| if (UNLIKELY(info.Length() < 1)) {
|
| exceptionState.throwTypeError(ExceptionMessages::notEnoughArguments(1, info.Length()));
|
| exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| - TestSpecialOperationsIdentifierRaisesException* impl = V8TestSpecialOperationsIdentifierRaisesException::toNative(info.Holder());
|
| + TestInterface2* impl = V8TestInterface2::toNative(info.Holder());
|
| V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, name, info[0]);
|
| bool result = impl->deleteNamedItem(name, exceptionState);
|
| if (exceptionState.throwIfNeeded())
|
| @@ -179,14 +184,23 @@ static void deleteNamedItemMethod(const v8::FunctionCallbackInfo<v8::Value>& inf
|
| static void deleteNamedItemMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod");
|
| - TestSpecialOperationsIdentifierRaisesExceptionV8Internal::deleteNamedItemMethod(info);
|
| + TestInterface2V8Internal::deleteNamedItemMethod(info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| +static void constructor(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| +{
|
| + v8::Isolate* isolate = info.GetIsolate();
|
| + RefPtr<TestInterface2> impl = TestInterface2::create();
|
| +
|
| + v8::Handle<v8::Object> wrapper = wrap(impl.get(), info.Holder(), isolate);
|
| + v8SetReturnValue(info, wrapper);
|
| +}
|
| +
|
| static void indexedPropertyGetter(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| {
|
| - TestSpecialOperationsIdentifierRaisesException* impl = V8TestSpecialOperationsIdentifierRaisesException::toNative(info.Holder());
|
| - ExceptionState exceptionState(ExceptionState::IndexedGetterContext, "TestSpecialOperationsIdentifierRaisesException", info.Holder(), info.GetIsolate());
|
| + TestInterface2* impl = V8TestInterface2::toNative(info.Holder());
|
| + ExceptionState exceptionState(ExceptionState::IndexedGetterContext, "TestInterface2", info.Holder(), info.GetIsolate());
|
| RefPtr<TestInterfaceEmpty> result = impl->item(index, exceptionState);
|
| if (exceptionState.throwIfNeeded())
|
| return;
|
| @@ -198,15 +212,15 @@ static void indexedPropertyGetter(uint32_t index, const v8::PropertyCallbackInfo
|
| static void indexedPropertyGetterCallback(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMIndexedProperty");
|
| - TestSpecialOperationsIdentifierRaisesExceptionV8Internal::indexedPropertyGetter(index, info);
|
| + TestInterface2V8Internal::indexedPropertyGetter(index, info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| static void indexedPropertySetter(uint32_t index, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| {
|
| - TestSpecialOperationsIdentifierRaisesException* impl = V8TestSpecialOperationsIdentifierRaisesException::toNative(info.Holder());
|
| + TestInterface2* impl = V8TestInterface2::toNative(info.Holder());
|
| V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, propertyValue, v8Value);
|
| - ExceptionState exceptionState(ExceptionState::IndexedSetterContext, "TestSpecialOperationsIdentifierRaisesException", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(ExceptionState::IndexedSetterContext, "TestInterface2", info.Holder(), info.GetIsolate());
|
| bool result = impl->setItem(index, propertyValue, exceptionState);
|
| if (exceptionState.throwIfNeeded())
|
| return;
|
| @@ -218,14 +232,14 @@ static void indexedPropertySetter(uint32_t index, v8::Local<v8::Value> v8Value,
|
| static void indexedPropertySetterCallback(uint32_t index, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMIndexedProperty");
|
| - TestSpecialOperationsIdentifierRaisesExceptionV8Internal::indexedPropertySetter(index, v8Value, info);
|
| + TestInterface2V8Internal::indexedPropertySetter(index, v8Value, info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| static void indexedPropertyDeleter(uint32_t index, const v8::PropertyCallbackInfo<v8::Boolean>& info)
|
| {
|
| - TestSpecialOperationsIdentifierRaisesException* impl = V8TestSpecialOperationsIdentifierRaisesException::toNative(info.Holder());
|
| - ExceptionState exceptionState(ExceptionState::IndexedDeletionContext, "TestSpecialOperationsIdentifierRaisesException", info.Holder(), info.GetIsolate());
|
| + TestInterface2* impl = V8TestInterface2::toNative(info.Holder());
|
| + ExceptionState exceptionState(ExceptionState::IndexedDeletionContext, "TestInterface2", info.Holder(), info.GetIsolate());
|
| DeleteResult result = impl->deleteItem(index, exceptionState);
|
| if (exceptionState.throwIfNeeded())
|
| return;
|
| @@ -236,7 +250,7 @@ static void indexedPropertyDeleter(uint32_t index, const v8::PropertyCallbackInf
|
| static void indexedPropertyDeleterCallback(uint32_t index, const v8::PropertyCallbackInfo<v8::Boolean>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMIndexedProperty");
|
| - TestSpecialOperationsIdentifierRaisesExceptionV8Internal::indexedPropertyDeleter(index, info);
|
| + TestInterface2V8Internal::indexedPropertyDeleter(index, info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| @@ -247,10 +261,10 @@ static void namedPropertyGetter(v8::Local<v8::String> name, const v8::PropertyCa
|
| if (!info.Holder()->GetRealNamedPropertyInPrototypeChain(name).IsEmpty())
|
| return;
|
|
|
| - TestSpecialOperationsIdentifierRaisesException* impl = V8TestSpecialOperationsIdentifierRaisesException::toNative(info.Holder());
|
| + TestInterface2* impl = V8TestInterface2::toNative(info.Holder());
|
| AtomicString propertyName = toCoreAtomicString(name);
|
| v8::String::Utf8Value namedProperty(name);
|
| - ExceptionState exceptionState(ExceptionState::GetterContext, *namedProperty, "TestSpecialOperationsIdentifierRaisesException", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(ExceptionState::GetterContext, *namedProperty, "TestInterface2", info.Holder(), info.GetIsolate());
|
| RefPtr<TestInterfaceEmpty> result = impl->namedItem(propertyName, exceptionState);
|
| if (exceptionState.throwIfNeeded())
|
| return;
|
| @@ -262,7 +276,7 @@ static void namedPropertyGetter(v8::Local<v8::String> name, const v8::PropertyCa
|
| static void namedPropertyGetterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
|
| - TestSpecialOperationsIdentifierRaisesExceptionV8Internal::namedPropertyGetter(name, info);
|
| + TestInterface2V8Internal::namedPropertyGetter(name, info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| @@ -273,11 +287,11 @@ static void namedPropertySetter(v8::Local<v8::String> name, v8::Local<v8::Value>
|
| if (!info.Holder()->GetRealNamedPropertyInPrototypeChain(name).IsEmpty())
|
| return;
|
|
|
| - TestSpecialOperationsIdentifierRaisesException* impl = V8TestSpecialOperationsIdentifierRaisesException::toNative(info.Holder());
|
| + TestInterface2* impl = V8TestInterface2::toNative(info.Holder());
|
| V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, propertyName, name);
|
| V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, propertyValue, v8Value);
|
| v8::String::Utf8Value namedProperty(name);
|
| - ExceptionState exceptionState(ExceptionState::SetterContext, *namedProperty, "TestSpecialOperationsIdentifierRaisesException", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(ExceptionState::SetterContext, *namedProperty, "TestInterface2", info.Holder(), info.GetIsolate());
|
| bool result = impl->setNamedItem(propertyName, propertyValue, exceptionState);
|
| if (exceptionState.throwIfNeeded())
|
| return;
|
| @@ -289,16 +303,16 @@ static void namedPropertySetter(v8::Local<v8::String> name, v8::Local<v8::Value>
|
| static void namedPropertySetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
|
| - TestSpecialOperationsIdentifierRaisesExceptionV8Internal::namedPropertySetter(name, v8Value, info);
|
| + TestInterface2V8Internal::namedPropertySetter(name, v8Value, info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| static void namedPropertyQuery(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Integer>& info)
|
| {
|
| - TestSpecialOperationsIdentifierRaisesException* impl = V8TestSpecialOperationsIdentifierRaisesException::toNative(info.Holder());
|
| + TestInterface2* impl = V8TestInterface2::toNative(info.Holder());
|
| AtomicString propertyName = toCoreAtomicString(name);
|
| v8::String::Utf8Value namedProperty(name);
|
| - ExceptionState exceptionState(ExceptionState::GetterContext, *namedProperty, "TestSpecialOperationsIdentifierRaisesException", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(ExceptionState::GetterContext, *namedProperty, "TestInterface2", info.Holder(), info.GetIsolate());
|
| bool result = impl->namedPropertyQuery(propertyName, exceptionState);
|
| if (exceptionState.throwIfNeeded())
|
| return;
|
| @@ -310,16 +324,16 @@ static void namedPropertyQuery(v8::Local<v8::String> name, const v8::PropertyCal
|
| static void namedPropertyQueryCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Integer>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
|
| - TestSpecialOperationsIdentifierRaisesExceptionV8Internal::namedPropertyQuery(name, info);
|
| + TestInterface2V8Internal::namedPropertyQuery(name, info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| static void namedPropertyDeleter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Boolean>& info)
|
| {
|
| - TestSpecialOperationsIdentifierRaisesException* impl = V8TestSpecialOperationsIdentifierRaisesException::toNative(info.Holder());
|
| + TestInterface2* impl = V8TestInterface2::toNative(info.Holder());
|
| AtomicString propertyName = toCoreAtomicString(name);
|
| v8::String::Utf8Value namedProperty(name);
|
| - ExceptionState exceptionState(ExceptionState::DeletionContext, *namedProperty, "TestSpecialOperationsIdentifierRaisesException", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(ExceptionState::DeletionContext, *namedProperty, "TestInterface2", info.Holder(), info.GetIsolate());
|
| DeleteResult result = impl->deleteNamedItem(propertyName, exceptionState);
|
| if (exceptionState.throwIfNeeded())
|
| return;
|
| @@ -330,16 +344,16 @@ static void namedPropertyDeleter(v8::Local<v8::String> name, const v8::PropertyC
|
| static void namedPropertyDeleterCallback(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Boolean>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
|
| - TestSpecialOperationsIdentifierRaisesExceptionV8Internal::namedPropertyDeleter(name, info);
|
| + TestInterface2V8Internal::namedPropertyDeleter(name, info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| static void namedPropertyEnumerator(const v8::PropertyCallbackInfo<v8::Array>& info)
|
| {
|
| - TestSpecialOperationsIdentifierRaisesException* impl = V8TestSpecialOperationsIdentifierRaisesException::toNative(info.Holder());
|
| + TestInterface2* impl = V8TestInterface2::toNative(info.Holder());
|
| v8::Isolate* isolate = info.GetIsolate();
|
| Vector<String> names;
|
| - ExceptionState exceptionState(ExceptionState::EnumerationContext, "TestSpecialOperationsIdentifierRaisesException", info.Holder(), isolate);
|
| + ExceptionState exceptionState(ExceptionState::EnumerationContext, "TestInterface2", info.Holder(), isolate);
|
| impl->namedPropertyEnumerator(names, exceptionState);
|
| if (exceptionState.throwIfNeeded())
|
| return;
|
| @@ -352,41 +366,71 @@ static void namedPropertyEnumerator(const v8::PropertyCallbackInfo<v8::Array>& i
|
| static void namedPropertyEnumeratorCallback(const v8::PropertyCallbackInfo<v8::Array>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
|
| - TestSpecialOperationsIdentifierRaisesExceptionV8Internal::namedPropertyEnumerator(info);
|
| + TestInterface2V8Internal::namedPropertyEnumerator(info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| -} // namespace TestSpecialOperationsIdentifierRaisesExceptionV8Internal
|
| +} // namespace TestInterface2V8Internal
|
| +
|
| +void V8TestInterface2::visitDOMWrapper(void* object, const v8::Persistent<v8::Object>& wrapper, v8::Isolate* isolate)
|
| +{
|
| + TestInterface2* impl = fromInternalPointer(object);
|
| + // The ownerNode() method may return a reference or a pointer.
|
| + if (Node* owner = WTF::getPtr(impl->ownerNode())) {
|
| + Node* root = V8GCController::opaqueRootForGC(owner, isolate);
|
| + isolate->SetReferenceFromGroup(v8::UniqueId(reinterpret_cast<intptr_t>(root)), wrapper);
|
| + return;
|
| + }
|
| + setObjectGroup(object, wrapper, isolate);
|
| +}
|
|
|
| -static const V8DOMConfiguration::MethodConfiguration V8TestSpecialOperationsIdentifierRaisesExceptionMethods[] = {
|
| - {"item", TestSpecialOperationsIdentifierRaisesExceptionV8Internal::itemMethodCallback, 0, 1},
|
| - {"setItem", TestSpecialOperationsIdentifierRaisesExceptionV8Internal::setItemMethodCallback, 0, 2},
|
| - {"deleteItem", TestSpecialOperationsIdentifierRaisesExceptionV8Internal::deleteItemMethodCallback, 0, 1},
|
| - {"namedItem", TestSpecialOperationsIdentifierRaisesExceptionV8Internal::namedItemMethodCallback, 0, 1},
|
| - {"setNamedItem", TestSpecialOperationsIdentifierRaisesExceptionV8Internal::setNamedItemMethodCallback, 0, 2},
|
| - {"deleteNamedItem", TestSpecialOperationsIdentifierRaisesExceptionV8Internal::deleteNamedItemMethodCallback, 0, 1},
|
| +static const V8DOMConfiguration::MethodConfiguration V8TestInterface2Methods[] = {
|
| + {"item", TestInterface2V8Internal::itemMethodCallback, 0, 1},
|
| + {"setItem", TestInterface2V8Internal::setItemMethodCallback, 0, 2},
|
| + {"deleteItem", TestInterface2V8Internal::deleteItemMethodCallback, 0, 1},
|
| + {"namedItem", TestInterface2V8Internal::namedItemMethodCallback, 0, 1},
|
| + {"setNamedItem", TestInterface2V8Internal::setNamedItemMethodCallback, 0, 2},
|
| + {"deleteNamedItem", TestInterface2V8Internal::deleteNamedItemMethodCallback, 0, 1},
|
| };
|
|
|
| -static void configureV8TestSpecialOperationsIdentifierRaisesExceptionTemplate(v8::Handle<v8::FunctionTemplate> functionTemplate, v8::Isolate* isolate)
|
| +void V8TestInterface2::constructorCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| +{
|
| + TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "DOMConstructor");
|
| + if (!info.IsConstructCall()) {
|
| + throwTypeError(ExceptionMessages::constructorNotCallableAsFunction("TestInterface2"), info.GetIsolate());
|
| + return;
|
| + }
|
| +
|
| + if (ConstructorMode::current() == ConstructorMode::WrapExistingObject) {
|
| + v8SetReturnValue(info, info.Holder());
|
| + return;
|
| + }
|
| +
|
| + TestInterface2V8Internal::constructor(info);
|
| +}
|
| +
|
| +static void configureV8TestInterface2Template(v8::Handle<v8::FunctionTemplate> functionTemplate, v8::Isolate* isolate)
|
| {
|
| functionTemplate->ReadOnlyPrototype();
|
|
|
| v8::Local<v8::Signature> defaultSignature;
|
| - defaultSignature = V8DOMConfiguration::installDOMClassTemplate(functionTemplate, "TestSpecialOperationsIdentifierRaisesException", v8::Local<v8::FunctionTemplate>(), V8TestSpecialOperationsIdentifierRaisesException::internalFieldCount,
|
| + defaultSignature = V8DOMConfiguration::installDOMClassTemplate(functionTemplate, "TestInterface2", v8::Local<v8::FunctionTemplate>(), V8TestInterface2::internalFieldCount,
|
| 0, 0,
|
| 0, 0,
|
| - V8TestSpecialOperationsIdentifierRaisesExceptionMethods, WTF_ARRAY_LENGTH(V8TestSpecialOperationsIdentifierRaisesExceptionMethods),
|
| + V8TestInterface2Methods, WTF_ARRAY_LENGTH(V8TestInterface2Methods),
|
| isolate);
|
| + functionTemplate->SetCallHandler(V8TestInterface2::constructorCallback);
|
| + functionTemplate->SetLength(0);
|
| v8::Local<v8::ObjectTemplate> ALLOW_UNUSED instanceTemplate = functionTemplate->InstanceTemplate();
|
| v8::Local<v8::ObjectTemplate> ALLOW_UNUSED prototypeTemplate = functionTemplate->PrototypeTemplate();
|
| - functionTemplate->InstanceTemplate()->SetIndexedPropertyHandler(TestSpecialOperationsIdentifierRaisesExceptionV8Internal::indexedPropertyGetterCallback, TestSpecialOperationsIdentifierRaisesExceptionV8Internal::indexedPropertySetterCallback, 0, TestSpecialOperationsIdentifierRaisesExceptionV8Internal::indexedPropertyDeleterCallback, indexedPropertyEnumerator<TestSpecialOperationsIdentifierRaisesException>);
|
| - functionTemplate->InstanceTemplate()->SetNamedPropertyHandler(TestSpecialOperationsIdentifierRaisesExceptionV8Internal::namedPropertyGetterCallback, TestSpecialOperationsIdentifierRaisesExceptionV8Internal::namedPropertySetterCallback, TestSpecialOperationsIdentifierRaisesExceptionV8Internal::namedPropertyQueryCallback, TestSpecialOperationsIdentifierRaisesExceptionV8Internal::namedPropertyDeleterCallback, TestSpecialOperationsIdentifierRaisesExceptionV8Internal::namedPropertyEnumeratorCallback);
|
| + functionTemplate->InstanceTemplate()->SetIndexedPropertyHandler(TestInterface2V8Internal::indexedPropertyGetterCallback, TestInterface2V8Internal::indexedPropertySetterCallback, 0, TestInterface2V8Internal::indexedPropertyDeleterCallback, indexedPropertyEnumerator<TestInterface2>);
|
| + functionTemplate->InstanceTemplate()->SetNamedPropertyHandler(TestInterface2V8Internal::namedPropertyGetterCallback, TestInterface2V8Internal::namedPropertySetterCallback, TestInterface2V8Internal::namedPropertyQueryCallback, TestInterface2V8Internal::namedPropertyDeleterCallback, TestInterface2V8Internal::namedPropertyEnumeratorCallback);
|
|
|
| // Custom toString template
|
| functionTemplate->Set(v8AtomicString(isolate, "toString"), V8PerIsolateData::current()->toStringTemplate());
|
| }
|
|
|
| -v8::Handle<v8::FunctionTemplate> V8TestSpecialOperationsIdentifierRaisesException::domTemplate(v8::Isolate* isolate)
|
| +v8::Handle<v8::FunctionTemplate> V8TestInterface2::domTemplate(v8::Isolate* isolate)
|
| {
|
| V8PerIsolateData* data = V8PerIsolateData::from(isolate);
|
| v8::Local<v8::FunctionTemplate> result = data->existingDOMTemplate(const_cast<WrapperTypeInfo*>(&wrapperTypeInfo));
|
| @@ -395,30 +439,41 @@ v8::Handle<v8::FunctionTemplate> V8TestSpecialOperationsIdentifierRaisesExceptio
|
|
|
| TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
|
| result = v8::FunctionTemplate::New(isolate, V8ObjectConstructor::isValidConstructorMode);
|
| - configureV8TestSpecialOperationsIdentifierRaisesExceptionTemplate(result, isolate);
|
| + configureV8TestInterface2Template(result, isolate);
|
| data->setDOMTemplate(const_cast<WrapperTypeInfo*>(&wrapperTypeInfo), result);
|
| return result;
|
| }
|
|
|
| -bool V8TestSpecialOperationsIdentifierRaisesException::hasInstance(v8::Handle<v8::Value> v8Value, v8::Isolate* isolate)
|
| +bool V8TestInterface2::hasInstance(v8::Handle<v8::Value> v8Value, v8::Isolate* isolate)
|
| {
|
| return V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo, v8Value);
|
| }
|
|
|
| -v8::Handle<v8::Object> V8TestSpecialOperationsIdentifierRaisesException::findInstanceInPrototypeChain(v8::Handle<v8::Value> v8Value, v8::Isolate* isolate)
|
| +v8::Handle<v8::Object> V8TestInterface2::findInstanceInPrototypeChain(v8::Handle<v8::Value> v8Value, v8::Isolate* isolate)
|
| {
|
| return V8PerIsolateData::from(isolate)->findInstanceInPrototypeChain(&wrapperTypeInfo, v8Value);
|
| }
|
|
|
| -TestSpecialOperationsIdentifierRaisesException* V8TestSpecialOperationsIdentifierRaisesException::toNativeWithTypeCheck(v8::Isolate* isolate, v8::Handle<v8::Value> value)
|
| +TestInterface2* V8TestInterface2::toNativeWithTypeCheck(v8::Isolate* isolate, v8::Handle<v8::Value> value)
|
| {
|
| return hasInstance(value, isolate) ? fromInternalPointer(v8::Handle<v8::Object>::Cast(value)->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)) : 0;
|
| }
|
|
|
| -v8::Handle<v8::Object> V8TestSpecialOperationsIdentifierRaisesException::createWrapper(PassRefPtr<TestSpecialOperationsIdentifierRaisesException> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
|
| +v8::Handle<v8::Object> wrap(TestInterface2* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
|
| +{
|
| + ASSERT(impl);
|
| + if (impl->isInterface1())
|
| + return wrap(toInterface1(impl), creationContext, isolate);
|
| + if (impl->isInterface2())
|
| + return wrap(toInterface2(impl), creationContext, isolate);
|
| + v8::Handle<v8::Object> wrapper = V8TestInterface2::createWrapper(impl, creationContext, isolate);
|
| + return wrapper;
|
| +}
|
| +
|
| +v8::Handle<v8::Object> V8TestInterface2::createWrapper(PassRefPtr<TestInterface2> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
|
| {
|
| ASSERT(impl);
|
| - ASSERT(!DOMDataStore::containsWrapper<V8TestSpecialOperationsIdentifierRaisesException>(impl.get(), isolate));
|
| + ASSERT(!DOMDataStore::containsWrapper<V8TestInterface2>(impl.get(), isolate));
|
| if (ScriptWrappable::wrapperCanBeStoredInObject(impl.get())) {
|
| const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl.get());
|
| // Might be a XXXConstructor::wrapperTypeInfo instead of an XXX::wrapperTypeInfo. These will both have
|
| @@ -431,17 +486,17 @@ v8::Handle<v8::Object> V8TestSpecialOperationsIdentifierRaisesException::createW
|
| return wrapper;
|
|
|
| installPerContextEnabledProperties(wrapper, impl.get(), isolate);
|
| - V8DOMWrapper::associateObjectWithWrapper<V8TestSpecialOperationsIdentifierRaisesException>(impl, &wrapperTypeInfo, wrapper, isolate, WrapperConfiguration::Independent);
|
| + V8DOMWrapper::associateObjectWithWrapper<V8TestInterface2>(impl, &wrapperTypeInfo, wrapper, isolate, WrapperConfiguration::Dependent);
|
| return wrapper;
|
| }
|
|
|
| -void V8TestSpecialOperationsIdentifierRaisesException::derefObject(void* object)
|
| +void V8TestInterface2::derefObject(void* object)
|
| {
|
| fromInternalPointer(object)->deref();
|
| }
|
|
|
| template<>
|
| -v8::Handle<v8::Value> toV8NoInline(TestSpecialOperationsIdentifierRaisesException* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
|
| +v8::Handle<v8::Value> toV8NoInline(TestInterface2* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
|
| {
|
| return toV8(impl, creationContext, isolate);
|
| }
|
|
|