Index: Source/bindings/tests/results/V8TestException.cpp |
diff --git a/Source/bindings/tests/results/V8TestException.cpp b/Source/bindings/tests/results/V8TestException.cpp |
index cd73fe0dab6fccaca9f8eb3e6cd95421afcde561..6417abbb721cac9b06c124daccfc89f5a2a2b24f 100644 |
--- a/Source/bindings/tests/results/V8TestException.cpp |
+++ b/Source/bindings/tests/results/V8TestException.cpp |
@@ -36,7 +36,7 @@ namespace WebCore { |
static void initializeScriptWrappableForInterface(TestException* object) |
{ |
if (ScriptWrappable::wrapperCanBeStoredInObject(object)) |
- ScriptWrappable::setTypeInfoInObject(object, &V8TestException::info); |
+ ScriptWrappable::setTypeInfoInObject(object, &V8TestException::wrapperTypeInfo); |
else |
ASSERT_NOT_REACHED(); |
} |
@@ -53,7 +53,7 @@ void webCoreInitializeScriptWrappableForInterface(WebCore::TestException* object |
} |
namespace WebCore { |
-WrapperTypeInfo V8TestException::info = { V8TestException::GetTemplate, V8TestException::derefObject, 0, 0, 0, V8TestException::installPerContextEnabledPrototypeProperties, 0, WrapperTypeErrorPrototype }; |
+WrapperTypeInfo V8TestException::wrapperTypeInfo = { V8TestException::GetTemplate, V8TestException::derefObject, 0, 0, 0, V8TestException::installPerContextEnabledPrototypeProperties, 0, WrapperTypeErrorPrototype }; |
namespace TestExceptionV8Internal { |
@@ -96,28 +96,28 @@ static v8::Handle<v8::FunctionTemplate> ConfigureV8TestExceptionTemplate(v8::Han |
v8::Handle<v8::FunctionTemplate> V8TestException::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 = |
- ConfigureV8TestExceptionTemplate(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType); |
- data->templateMap(currentWorldType).add(&info, UnsafePersistent<v8::FunctionTemplate>(isolate, templ)); |
+ ConfigureV8TestExceptionTemplate(data->rawTemplate(&wrapperTypeInfo, currentWorldType), isolate, currentWorldType); |
+ data->templateMap(currentWorldType).add(&wrapperTypeInfo, UnsafePersistent<v8::FunctionTemplate>(isolate, templ)); |
return handleScope.Close(templ); |
} |
bool V8TestException::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 V8TestException::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> V8TestException::createWrapper(PassRefPtr<TestException> impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate) |
@@ -126,17 +126,17 @@ v8::Handle<v8::Object> V8TestException::createWrapper(PassRefPtr<TestException> |
ASSERT(!DOMDataStore::containsWrapper<V8TestException>(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<V8TestException>(impl, &info, wrapper, isolate, WrapperConfiguration::Independent); |
+ V8DOMWrapper::associateObjectWithWrapper<V8TestException>(impl, &wrapperTypeInfo, wrapper, isolate, WrapperConfiguration::Independent); |
return wrapper; |
} |