Index: Source/bindings/tests/results/V8TestNamedConstructor.cpp |
diff --git a/Source/bindings/tests/results/V8TestNamedConstructor.cpp b/Source/bindings/tests/results/V8TestNamedConstructor.cpp |
index c23c4c44434ebb188c1628f85d2a711077ae96cc..71198308fafc7d93dc6dafaccff47eef4e15f01d 100644 |
--- a/Source/bindings/tests/results/V8TestNamedConstructor.cpp |
+++ b/Source/bindings/tests/results/V8TestNamedConstructor.cpp |
@@ -40,7 +40,7 @@ namespace WebCore { |
static void initializeScriptWrappableForInterface(TestNamedConstructor* object) |
{ |
if (ScriptWrappable::wrapperCanBeStoredInObject(object)) |
- ScriptWrappable::setTypeInfoInObject(object, &V8TestNamedConstructor::info); |
+ ScriptWrappable::setTypeInfoInObject(object, &V8TestNamedConstructor::wrapperTypeInfo); |
else |
ASSERT_NOT_REACHED(); |
} |
@@ -57,7 +57,7 @@ void webCoreInitializeScriptWrappableForInterface(WebCore::TestNamedConstructor* |
} |
namespace WebCore { |
-WrapperTypeInfo V8TestNamedConstructor::info = { V8TestNamedConstructor::GetTemplate, V8TestNamedConstructor::derefObject, V8TestNamedConstructor::toActiveDOMObject, 0, 0, V8TestNamedConstructor::installPerContextEnabledPrototypeProperties, 0, WrapperTypeObjectPrototype }; |
+WrapperTypeInfo V8TestNamedConstructor::wrapperTypeInfo = { V8TestNamedConstructor::GetTemplate, V8TestNamedConstructor::derefObject, V8TestNamedConstructor::toActiveDOMObject, 0, 0, V8TestNamedConstructor::installPerContextEnabledPrototypeProperties, 0, WrapperTypeObjectPrototype }; |
namespace TestNamedConstructorV8Internal { |
@@ -65,7 +65,7 @@ template <typename T> void V8_USE(T) { } |
} // namespace TestNamedConstructorV8Internal |
-WrapperTypeInfo V8TestNamedConstructorConstructor::info = { V8TestNamedConstructorConstructor::GetTemplate, V8TestNamedConstructor::derefObject, V8TestNamedConstructor::toActiveDOMObject, 0, 0, V8TestNamedConstructor::installPerContextEnabledPrototypeProperties, 0, WrapperTypeObjectPrototype }; |
+WrapperTypeInfo V8TestNamedConstructorConstructor::wrapperTypeInfo = { V8TestNamedConstructorConstructor::GetTemplate, V8TestNamedConstructor::derefObject, V8TestNamedConstructor::toActiveDOMObject, 0, 0, V8TestNamedConstructor::installPerContextEnabledPrototypeProperties, 0, WrapperTypeObjectPrototype }; |
static void V8TestNamedConstructorConstructorCallback(const v8::FunctionCallbackInfo<v8::Value>& args) |
{ |
@@ -100,7 +100,7 @@ static void V8TestNamedConstructorConstructorCallback(const v8::FunctionCallback |
if (es.throwIfNeeded()) |
return; |
- V8DOMWrapper::associateObjectWithWrapper<V8TestNamedConstructor>(impl.release(), &V8TestNamedConstructorConstructor::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent); |
+ V8DOMWrapper::associateObjectWithWrapper<V8TestNamedConstructor>(impl.release(), &V8TestNamedConstructorConstructor::wrapperTypeInfo, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent); |
args.GetReturnValue().Set(wrapper); |
} |
@@ -144,28 +144,28 @@ static v8::Handle<v8::FunctionTemplate> ConfigureV8TestNamedConstructorTemplate( |
v8::Handle<v8::FunctionTemplate> V8TestNamedConstructor::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 = |
- ConfigureV8TestNamedConstructorTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType); |
- data->templateMap(currentWorldType).add(&info, UnsafePersistent<v8::FunctionTemplate>(isolate, templ)); |
+ ConfigureV8TestNamedConstructorTemplate(data->rawTemplate(&wrapperTypeInfo, currentWorldType), isolate, currentWorldType); |
+ data->templateMap(currentWorldType).add(&wrapperTypeInfo, UnsafePersistent<v8::FunctionTemplate>(isolate, templ)); |
return handleScope.Close(templ); |
} |
bool V8TestNamedConstructor::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 V8TestNamedConstructor::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); |
} |
ActiveDOMObject* V8TestNamedConstructor::toActiveDOMObject(v8::Handle<v8::Object> object) |
@@ -179,17 +179,17 @@ v8::Handle<v8::Object> V8TestNamedConstructor::createWrapper(PassRefPtr<TestName |
ASSERT(!DOMDataStore::containsWrapper<V8TestNamedConstructor>(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<V8TestNamedConstructor>(impl, &info, wrapper, isolate, WrapperConfiguration::Dependent); |
+ V8DOMWrapper::associateObjectWithWrapper<V8TestNamedConstructor>(impl, &wrapperTypeInfo, wrapper, isolate, WrapperConfiguration::Dependent); |
return wrapper; |
} |