Index: Source/bindings/tests/results/V8TestExtendedEvent.cpp |
diff --git a/Source/bindings/tests/results/V8TestExtendedEvent.cpp b/Source/bindings/tests/results/V8TestExtendedEvent.cpp |
index 5fea3ab8c0dcf0c62d82ab640b895fc205f04c1e..3582765608ec0bfe6b84482adb019e0ff172eec6 100644 |
--- a/Source/bindings/tests/results/V8TestExtendedEvent.cpp |
+++ b/Source/bindings/tests/results/V8TestExtendedEvent.cpp |
@@ -42,7 +42,7 @@ namespace WebCore { |
static void initializeScriptWrappableForInterface(Event* object) |
{ |
if (ScriptWrappable::wrapperCanBeStoredInObject(object)) |
- ScriptWrappable::setTypeInfoInObject(object, &V8TestExtendedEvent::info); |
+ ScriptWrappable::setTypeInfoInObject(object, &V8TestExtendedEvent::wrapperTypeInfo); |
else |
ASSERT_NOT_REACHED(); |
} |
@@ -59,7 +59,7 @@ void webCoreInitializeScriptWrappableForInterface(WebCore::Event* object) |
} |
namespace WebCore { |
-WrapperTypeInfo V8TestExtendedEvent::info = { V8TestExtendedEvent::GetTemplate, V8TestExtendedEvent::derefObject, 0, 0, 0, V8TestExtendedEvent::installPerContextEnabledPrototypeProperties, &V8TestEvent::info, WrapperTypeObjectPrototype }; |
+WrapperTypeInfo V8TestExtendedEvent::wrapperTypeInfo = { V8TestExtendedEvent::GetTemplate, V8TestExtendedEvent::derefObject, 0, 0, 0, V8TestExtendedEvent::installPerContextEnabledPrototypeProperties, &V8TestEvent::wrapperTypeInfo, WrapperTypeObjectPrototype }; |
namespace EventV8Internal { |
@@ -109,7 +109,7 @@ static void constructor(const v8::FunctionCallbackInfo<v8::Value>& args) |
RefPtr<Event> event = Event::create(type, eventInit); |
v8::Handle<v8::Object> wrapper = args.Holder(); |
- V8DOMWrapper::associateObjectWithWrapper<V8TestExtendedEvent>(event.release(), &V8TestExtendedEvent::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent); |
+ V8DOMWrapper::associateObjectWithWrapper<V8TestExtendedEvent>(event.release(), &V8TestExtendedEvent::wrapperTypeInfo, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent); |
v8SetReturnValue(args, wrapper); |
} |
} // namespace EventV8Internal |
@@ -169,28 +169,28 @@ static v8::Handle<v8::FunctionTemplate> ConfigureV8TestExtendedEventTemplate(v8: |
v8::Handle<v8::FunctionTemplate> V8TestExtendedEvent::GetTemplate(v8::Isolate* isolate, WrapperWorldType currentWorldType) |
{ |
V8PerIsolateData* data = V8PerIsolateData::from(isolate); |
- V8PerIsolateData::TemplateMap::iterator result = data->templateMap(currentWorldType).find(&info); |
+ V8PerIsolateData::TemplateMap::iterator result = data->templateMap(currentWorldType).find(&wrapperTypeInfo); |
if (result != data->templateMap(currentWorldType).end()) |
return result->value.newLocal(isolate); |
TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate"); |
v8::HandleScope handleScope(isolate); |
v8::Handle<v8::FunctionTemplate> templ = |
- ConfigureV8TestExtendedEventTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType); |
- data->templateMap(currentWorldType).add(&info, UnsafePersistent<v8::FunctionTemplate>(isolate, templ)); |
+ ConfigureV8TestExtendedEventTemplate(data->rawTemplate(&wrapperTypeInfo, currentWorldType), isolate, currentWorldType); |
+ data->templateMap(currentWorldType).add(&wrapperTypeInfo, UnsafePersistent<v8::FunctionTemplate>(isolate, templ)); |
return handleScope.Close(templ); |
} |
bool V8TestExtendedEvent::HasInstance(v8::Handle<v8::Value> jsValue, v8::Isolate* isolate, WrapperWorldType currentWorldType) |
{ |
- return V8PerIsolateData::from(isolate)->hasInstance(&info, jsValue, currentWorldType); |
+ return V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo, jsValue, currentWorldType); |
} |
bool V8TestExtendedEvent::HasInstanceInAnyWorld(v8::Handle<v8::Value> jsValue, v8::Isolate* isolate) |
{ |
- return V8PerIsolateData::from(isolate)->hasInstance(&info, jsValue, MainWorld) |
- || V8PerIsolateData::from(isolate)->hasInstance(&info, jsValue, IsolatedWorld) |
- || V8PerIsolateData::from(isolate)->hasInstance(&info, jsValue, WorkerWorld); |
+ 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> V8TestExtendedEvent::createWrapper(PassRefPtr<Event> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate) |
@@ -199,17 +199,17 @@ v8::Handle<v8::Object> V8TestExtendedEvent::createWrapper(PassRefPtr<Event> impl |
ASSERT(!DOMDataStore::containsWrapper<V8TestExtendedEvent>(impl.get(), isolate)); |
if (ScriptWrappable::wrapperCanBeStoredInObject(impl.get())) { |
const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl.get()); |
- // Might be a XXXConstructor::info instead of an XXX::info. These will both have |
+ // 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 == info.derefObjectFunction); |
+ RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(actualInfo->derefObjectFunction == wrapperTypeInfo.derefObjectFunction); |
} |
- v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, toInternalPointer(impl.get()), isolate); |
+ 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<V8TestExtendedEvent>(impl, &info, wrapper, isolate, WrapperConfiguration::Independent); |
+ V8DOMWrapper::associateObjectWithWrapper<V8TestExtendedEvent>(impl, &wrapperTypeInfo, wrapper, isolate, WrapperConfiguration::Independent); |
return wrapper; |
} |