| Index: Source/bindings/tests/results/V8TestCustomToV8Interface.cpp
|
| diff --git a/Source/bindings/tests/results/V8TestCustomWrapInterface.cpp b/Source/bindings/tests/results/V8TestCustomToV8Interface.cpp
|
| similarity index 67%
|
| copy from Source/bindings/tests/results/V8TestCustomWrapInterface.cpp
|
| copy to Source/bindings/tests/results/V8TestCustomToV8Interface.cpp
|
| index e5a6aaf0c1e965df20b6b01ab2241ecb59c3bd1f..7c588a855d6d44fd4dfe9765aabddc3d650179d5 100644
|
| --- a/Source/bindings/tests/results/V8TestCustomWrapInterface.cpp
|
| +++ b/Source/bindings/tests/results/V8TestCustomToV8Interface.cpp
|
| @@ -31,10 +31,9 @@
|
| // This file has been auto-generated by code_generator_v8.pm. DO NOT MODIFY!
|
|
|
| #include "config.h"
|
| -#include "V8TestCustomWrapInterface.h"
|
| +#include "V8TestCustomToV8Interface.h"
|
|
|
| #include "RuntimeEnabledFeatures.h"
|
| -#include "bindings/v8/ScriptController.h"
|
| #include "bindings/v8/V8Binding.h"
|
| #include "bindings/v8/V8DOMConfiguration.h"
|
| #include "bindings/v8/V8DOMWrapper.h"
|
| @@ -45,10 +44,10 @@
|
|
|
| namespace WebCore {
|
|
|
| -static void initializeScriptWrappableForInterface(TestCustomWrapInterface* object)
|
| +static void initializeScriptWrappableForInterface(TestCustomToV8Interface* object)
|
| {
|
| if (ScriptWrappable::wrapperCanBeStoredInObject(object))
|
| - ScriptWrappable::setTypeInfoInObject(object, &V8TestCustomWrapInterface::wrapperTypeInfo);
|
| + ScriptWrappable::setTypeInfoInObject(object, &V8TestCustomToV8Interface::wrapperTypeInfo);
|
| else
|
| ASSERT_NOT_REACHED();
|
| }
|
| @@ -59,26 +58,26 @@ static void initializeScriptWrappableForInterface(TestCustomWrapInterface* objec
|
| // the local declaration does not pick up the surrounding namespace. Therefore, we provide this function
|
| // in the global namespace.
|
| // (More info on the MSVC bug here: http://connect.microsoft.com/VisualStudio/feedback/details/664619/the-namespace-of-local-function-declarations-in-c)
|
| -void webCoreInitializeScriptWrappableForInterface(WebCore::TestCustomWrapInterface* object)
|
| +void webCoreInitializeScriptWrappableForInterface(WebCore::TestCustomToV8Interface* object)
|
| {
|
| WebCore::initializeScriptWrappableForInterface(object);
|
| }
|
|
|
| namespace WebCore {
|
| -const WrapperTypeInfo V8TestCustomWrapInterface::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestCustomWrapInterface::GetTemplate, V8TestCustomWrapInterface::derefObject, 0, 0, 0, V8TestCustomWrapInterface::installPerContextEnabledMethods, 0, WrapperTypeObjectPrototype };
|
| +const WrapperTypeInfo V8TestCustomToV8Interface::wrapperTypeInfo = { gin::kEmbedderBlink, V8TestCustomToV8Interface::GetTemplate, V8TestCustomToV8Interface::derefObject, 0, 0, 0, V8TestCustomToV8Interface::installPerContextEnabledMethods, 0, WrapperTypeObjectPrototype };
|
|
|
| -namespace TestCustomWrapInterfaceV8Internal {
|
| +namespace TestCustomToV8InterfaceV8Internal {
|
|
|
| template <typename T> void V8_USE(T) { }
|
|
|
| -} // namespace TestCustomWrapInterfaceV8Internal
|
| +} // namespace TestCustomToV8InterfaceV8Internal
|
|
|
| -static v8::Handle<v8::FunctionTemplate> ConfigureV8TestCustomWrapInterfaceTemplate(v8::Handle<v8::FunctionTemplate> functionTemplate, v8::Isolate* isolate, WrapperWorldType currentWorldType)
|
| +static v8::Handle<v8::FunctionTemplate> ConfigureV8TestCustomToV8InterfaceTemplate(v8::Handle<v8::FunctionTemplate> functionTemplate, v8::Isolate* isolate, WrapperWorldType currentWorldType)
|
| {
|
| functionTemplate->ReadOnlyPrototype();
|
|
|
| v8::Local<v8::Signature> defaultSignature;
|
| - defaultSignature = V8DOMConfiguration::installDOMClassTemplate(functionTemplate, "TestCustomWrapInterface", v8::Local<v8::FunctionTemplate>(), V8TestCustomWrapInterface::internalFieldCount,
|
| + defaultSignature = V8DOMConfiguration::installDOMClassTemplate(functionTemplate, "TestCustomToV8Interface", v8::Local<v8::FunctionTemplate>(), V8TestCustomToV8Interface::internalFieldCount,
|
| 0, 0,
|
| 0, 0,
|
| 0, 0,
|
| @@ -94,7 +93,7 @@ static v8::Handle<v8::FunctionTemplate> ConfigureV8TestCustomWrapInterfaceTempla
|
| return functionTemplate;
|
| }
|
|
|
| -v8::Handle<v8::FunctionTemplate> V8TestCustomWrapInterface::GetTemplate(v8::Isolate* isolate, WrapperWorldType currentWorldType)
|
| +v8::Handle<v8::FunctionTemplate> V8TestCustomToV8Interface::GetTemplate(v8::Isolate* isolate, WrapperWorldType currentWorldType)
|
| {
|
| V8PerIsolateData* data = V8PerIsolateData::from(isolate);
|
| V8PerIsolateData::TemplateMap::iterator result = data->templateMap(currentWorldType).find(&wrapperTypeInfo);
|
| @@ -104,44 +103,24 @@ v8::Handle<v8::FunctionTemplate> V8TestCustomWrapInterface::GetTemplate(v8::Isol
|
| TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
|
| v8::HandleScope handleScope(isolate);
|
| v8::Handle<v8::FunctionTemplate> templ =
|
| - ConfigureV8TestCustomWrapInterfaceTemplate(data->rawTemplate(&wrapperTypeInfo, currentWorldType), isolate, currentWorldType);
|
| + ConfigureV8TestCustomToV8InterfaceTemplate(data->rawTemplate(&wrapperTypeInfo, currentWorldType), isolate, currentWorldType);
|
| data->templateMap(currentWorldType).add(&wrapperTypeInfo, UnsafePersistent<v8::FunctionTemplate>(isolate, templ));
|
| return handleScope.Close(templ);
|
| }
|
|
|
| -bool V8TestCustomWrapInterface::hasInstance(v8::Handle<v8::Value> jsValue, v8::Isolate* isolate, WrapperWorldType currentWorldType)
|
| +bool V8TestCustomToV8Interface::hasInstance(v8::Handle<v8::Value> jsValue, v8::Isolate* isolate, WrapperWorldType currentWorldType)
|
| {
|
| return V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo, jsValue, currentWorldType);
|
| }
|
|
|
| -bool V8TestCustomWrapInterface::hasInstanceInAnyWorld(v8::Handle<v8::Value> jsValue, v8::Isolate* isolate)
|
| +bool V8TestCustomToV8Interface::hasInstanceInAnyWorld(v8::Handle<v8::Value> jsValue, v8::Isolate* isolate)
|
| {
|
| return V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo, jsValue, MainWorld)
|
| || V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo, jsValue, IsolatedWorld)
|
| || V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo, jsValue, WorkerWorld);
|
| }
|
|
|
| -v8::Handle<v8::Object> V8TestCustomWrapInterface::createWrapper(PassRefPtr<TestCustomWrapInterface> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
|
| -{
|
| - ASSERT(impl);
|
| - ASSERT(!DOMDataStore::containsWrapper<V8TestCustomWrapInterface>(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
|
| - // the same object de-ref functions, though, so use that as the basis of the check.
|
| - RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(actualInfo->derefObjectFunction == wrapperTypeInfo.derefObjectFunction);
|
| - }
|
| -
|
| - v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &wrapperTypeInfo, toInternalPointer(impl.get()), isolate);
|
| - if (UNLIKELY(wrapper.IsEmpty()))
|
| - return wrapper;
|
| -
|
| - installPerContextEnabledProperties(wrapper, impl.get(), isolate);
|
| - V8DOMWrapper::associateObjectWithWrapper<V8TestCustomWrapInterface>(impl, &wrapperTypeInfo, wrapper, isolate, WrapperConfiguration::Independent);
|
| - return wrapper;
|
| -}
|
| -
|
| -void V8TestCustomWrapInterface::derefObject(void* object)
|
| +void V8TestCustomToV8Interface::derefObject(void* object)
|
| {
|
| fromInternalPointer(object)->deref();
|
| }
|
|
|