Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Unified Diff: Source/bindings/tests/results/V8TestObject.cpp

Issue 351403003: IDL: Merge duplicating local variable assignment in attribute_getter (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/bindings/tests/results/V8TestObject.cpp
diff --git a/Source/bindings/tests/results/V8TestObject.cpp b/Source/bindings/tests/results/V8TestObject.cpp
index 2bba9559e1d19b18d5d7d75eebb5dede6aa1acc6..587901b2b91148021ce60d2751f6dac6ad925486 100644
--- a/Source/bindings/tests/results/V8TestObject.cpp
+++ b/Source/bindings/tests/results/V8TestObject.cpp
@@ -134,10 +134,10 @@ static void readonlyTestInterfaceEmptyAttributeAttributeGetter(const v8::Propert
{
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
- RefPtr<TestInterfaceEmpty> result(impl->readonlyTestInterfaceEmptyAttribute());
- if (result && DOMDataStore::setReturnValueFromWrapper<V8TestInterfaceEmpty>(info.GetReturnValue(), result.get()))
+ RefPtr<TestInterfaceEmpty> v8Value(impl->readonlyTestInterfaceEmptyAttribute());
+ if (v8Value && DOMDataStore::setReturnValueFromWrapper<V8TestInterfaceEmpty>(info.GetReturnValue(), v8Value.get()))
return;
- v8::Handle<v8::Value> wrapper = toV8(result.get(), holder, info.GetIsolate());
+ v8::Handle<v8::Value> wrapper = toV8(v8Value.get(), holder, info.GetIsolate());
if (!wrapper.IsEmpty()) {
V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, v8AtomicString(info.GetIsolate(), "readonlyTestInterfaceEmptyAttribute"), wrapper);
v8SetReturnValue(info, wrapper);
@@ -1373,7 +1373,7 @@ static void readonlyEventTargetOrNullAttributeAttributeGetter(const v8::Property
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
bool isNull = false;
- RefPtrWillBeRawPtr<EventTarget> v8Value = impl->readonlyEventTargetOrNullAttribute(isNull);
+ RefPtrWillBeRawPtr<EventTarget> v8Value(impl->readonlyEventTargetOrNullAttribute(isNull));
if (isNull) {
v8SetReturnValueNull(info);
return;
@@ -1522,7 +1522,7 @@ static void stringOrNullAttributeAttributeGetter(const v8::PropertyCallbackInfo<
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
bool isNull = false;
- String v8Value = impl->stringOrNullAttribute(isNull);
+ String v8Value(impl->stringOrNullAttribute(isNull));
if (isNull) {
v8SetReturnValueNull(info);
return;
@@ -1557,7 +1557,7 @@ static void longOrNullAttributeAttributeGetter(const v8::PropertyCallbackInfo<v8
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
bool isNull = false;
- int v8Value = impl->longOrNullAttribute(isNull);
+ int v8Value(impl->longOrNullAttribute(isNull));
if (isNull) {
v8SetReturnValueNull(info);
return;
@@ -1593,7 +1593,7 @@ static void testInterfaceOrNullAttributeAttributeGetter(const v8::PropertyCallba
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
bool isNull = false;
- RefPtr<TestInterfaceImplementation> v8Value = impl->testInterfaceOrNullAttribute(isNull);
+ RefPtr<TestInterfaceImplementation> v8Value(impl->testInterfaceOrNullAttribute(isNull));
if (isNull) {
v8SetReturnValueNull(info);
return;
@@ -1710,7 +1710,7 @@ static void eventHandlerAttributeAttributeGetter(const v8::PropertyCallbackInfo<
{
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
- EventListener* v8Value = impl->eventHandlerAttribute();
+ EventListener* v8Value(impl->eventHandlerAttribute());
v8SetReturnValue(info, v8Value ? v8::Handle<v8::Value>(V8AbstractEventListener::cast(v8Value)->getListenerObject(impl->executionContext())) : v8::Handle<v8::Value>(v8::Null(info.GetIsolate())));
}
@@ -1856,7 +1856,7 @@ static void cachedAttributeAnyAttributeAttributeGetter(const v8::PropertyCallbac
return;
}
}
- ScriptValue v8Value = impl->cachedAttributeAnyAttribute();
+ ScriptValue v8Value(impl->cachedAttributeAnyAttribute());
V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, propertyName, v8Value.v8Value());
v8SetReturnValue(info, v8Value.v8Value());
}
@@ -1896,7 +1896,7 @@ static void cachedArrayAttributeAttributeGetter(const v8::PropertyCallbackInfo<v
return;
}
}
- Vector<String> v8Value = impl->cachedArrayAttribute();
+ Vector<String> v8Value(impl->cachedArrayAttribute());
V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, propertyName, v8Array(v8Value, info.Holder(), info.GetIsolate()));
v8SetReturnValue(info, v8Array(v8Value, info.Holder(), info.GetIsolate()));
}
@@ -2525,10 +2525,10 @@ static void perWorldBindingsReadonlyTestInterfaceEmptyAttributeAttributeGetter(c
{
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
- RefPtr<TestInterfaceEmpty> result(impl->perWorldBindingsReadonlyTestInterfaceEmptyAttribute());
- if (result && DOMDataStore::setReturnValueFromWrapper<V8TestInterfaceEmpty>(info.GetReturnValue(), result.get()))
+ RefPtr<TestInterfaceEmpty> v8Value(impl->perWorldBindingsReadonlyTestInterfaceEmptyAttribute());
+ if (v8Value && DOMDataStore::setReturnValueFromWrapper<V8TestInterfaceEmpty>(info.GetReturnValue(), v8Value.get()))
return;
- v8::Handle<v8::Value> wrapper = toV8(result.get(), holder, info.GetIsolate());
+ v8::Handle<v8::Value> wrapper = toV8(v8Value.get(), holder, info.GetIsolate());
if (!wrapper.IsEmpty()) {
V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, v8AtomicString(info.GetIsolate(), "perWorldBindingsReadonlyTestInterfaceEmptyAttribute"), wrapper);
v8SetReturnValue(info, wrapper);
@@ -2546,10 +2546,10 @@ static void perWorldBindingsReadonlyTestInterfaceEmptyAttributeAttributeGetterFo
{
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
- RefPtr<TestInterfaceEmpty> result(impl->perWorldBindingsReadonlyTestInterfaceEmptyAttribute());
- if (result && DOMDataStore::setReturnValueFromWrapperForMainWorld<V8TestInterfaceEmpty>(info.GetReturnValue(), result.get()))
+ RefPtr<TestInterfaceEmpty> v8Value(impl->perWorldBindingsReadonlyTestInterfaceEmptyAttribute());
+ if (v8Value && DOMDataStore::setReturnValueFromWrapperForMainWorld<V8TestInterfaceEmpty>(info.GetReturnValue(), v8Value.get()))
return;
- v8::Handle<v8::Value> wrapper = toV8(result.get(), holder, info.GetIsolate());
+ v8::Handle<v8::Value> wrapper = toV8(v8Value.get(), holder, info.GetIsolate());
if (!wrapper.IsEmpty()) {
V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, v8AtomicString(info.GetIsolate(), "perWorldBindingsReadonlyTestInterfaceEmptyAttribute"), wrapper);
v8SetReturnValue(info, wrapper);
@@ -3074,10 +3074,10 @@ static void locationGarbageCollectedAttributeGetter(const v8::PropertyCallbackIn
{
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
- RawPtr<TestInterfaceGarbageCollected> result(impl->locationGarbageCollected());
- if (result && DOMDataStore::setReturnValueFromWrapper<V8TestInterfaceGarbageCollected>(info.GetReturnValue(), result.get()))
+ RawPtr<TestInterfaceGarbageCollected> v8Value(impl->locationGarbageCollected());
+ if (v8Value && DOMDataStore::setReturnValueFromWrapper<V8TestInterfaceGarbageCollected>(info.GetReturnValue(), v8Value.get()))
return;
- v8::Handle<v8::Value> wrapper = toV8(result.get(), holder, info.GetIsolate());
+ v8::Handle<v8::Value> wrapper = toV8(v8Value.get(), holder, info.GetIsolate());
if (!wrapper.IsEmpty()) {
V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, v8AtomicString(info.GetIsolate(), "locationGarbageCollected"), wrapper);
v8SetReturnValue(info, wrapper);
@@ -3113,10 +3113,10 @@ static void locationWillBeGarbageCollectedAttributeGetter(const v8::PropertyCall
{
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
- RefPtrWillBeRawPtr<TestInterfaceWillBeGarbageCollected> result(impl->locationWillBeGarbageCollected());
- if (result && DOMDataStore::setReturnValueFromWrapper<V8TestInterfaceWillBeGarbageCollected>(info.GetReturnValue(), result.get()))
+ RefPtrWillBeRawPtr<TestInterfaceWillBeGarbageCollected> v8Value(impl->locationWillBeGarbageCollected());
+ if (v8Value && DOMDataStore::setReturnValueFromWrapper<V8TestInterfaceWillBeGarbageCollected>(info.GetReturnValue(), v8Value.get()))
return;
- v8::Handle<v8::Value> wrapper = toV8(result.get(), holder, info.GetIsolate());
+ v8::Handle<v8::Value> wrapper = toV8(v8Value.get(), holder, info.GetIsolate());
if (!wrapper.IsEmpty()) {
V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, v8AtomicString(info.GetIsolate(), "locationWillBeGarbageCollected"), wrapper);
v8SetReturnValue(info, wrapper);
@@ -3153,7 +3153,7 @@ static void raisesExceptionLongAttributeAttributeGetter(const v8::PropertyCallba
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
ExceptionState exceptionState(ExceptionState::GetterContext, "raisesExceptionLongAttribute", "TestObject", holder, info.GetIsolate());
- int v8Value = impl->raisesExceptionLongAttribute(exceptionState);
+ int v8Value(impl->raisesExceptionLongAttribute(exceptionState));
if (UNLIKELY(exceptionState.throwIfNeeded()))
return;
v8SetReturnValueInt(info, v8Value);
@@ -3188,7 +3188,7 @@ static void raisesExceptionGetterLongAttributeAttributeGetter(const v8::Property
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
ExceptionState exceptionState(ExceptionState::GetterContext, "raisesExceptionGetterLongAttribute", "TestObject", holder, info.GetIsolate());
- int v8Value = impl->raisesExceptionGetterLongAttribute(exceptionState);
+ int v8Value(impl->raisesExceptionGetterLongAttribute(exceptionState));
if (UNLIKELY(exceptionState.throwIfNeeded()))
return;
v8SetReturnValueInt(info, v8Value);
@@ -3253,7 +3253,7 @@ static void raisesExceptionTestInterfaceEmptyAttributeAttributeGetter(const v8::
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
ExceptionState exceptionState(ExceptionState::GetterContext, "raisesExceptionTestInterfaceEmptyAttribute", "TestObject", holder, info.GetIsolate());
- RefPtr<TestInterfaceEmpty> v8Value = impl->raisesExceptionTestInterfaceEmptyAttribute(exceptionState);
+ RefPtr<TestInterfaceEmpty> v8Value(impl->raisesExceptionTestInterfaceEmptyAttribute(exceptionState));
if (UNLIKELY(exceptionState.throwIfNeeded()))
return;
v8SetReturnValueFast(info, WTF::getPtr(v8Value.release()), impl);
@@ -3296,7 +3296,7 @@ static void cachedAttributeRaisesExceptionGetterAnyAttributeAttributeGetter(cons
}
}
ExceptionState exceptionState(ExceptionState::GetterContext, "cachedAttributeRaisesExceptionGetterAnyAttribute", "TestObject", holder, info.GetIsolate());
- ScriptValue v8Value = impl->cachedAttributeRaisesExceptionGetterAnyAttribute(exceptionState);
+ ScriptValue v8Value(impl->cachedAttributeRaisesExceptionGetterAnyAttribute(exceptionState));
if (UNLIKELY(exceptionState.throwIfNeeded()))
return;
V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, propertyName, v8Value.v8Value());
@@ -3707,7 +3707,7 @@ static void limitedToOnlyOneAttributeAttributeGetter(const v8::PropertyCallbackI
{
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
- String v8Value = impl->fastGetAttribute(HTMLNames::limitedtoonlyoneattributeAttr);
+ String v8Value(impl->fastGetAttribute(HTMLNames::limitedtoonlyoneattributeAttr));
if (v8Value.isEmpty()) {
;
} else if (equalIgnoringCase(v8Value, "unique")) {
@@ -3746,7 +3746,7 @@ static void limitedToOnlyAttributeAttributeGetter(const v8::PropertyCallbackInfo
{
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
- String v8Value = impl->fastGetAttribute(HTMLNames::limitedtoonlyattributeAttr);
+ String v8Value(impl->fastGetAttribute(HTMLNames::limitedtoonlyattributeAttr));
if (v8Value.isEmpty()) {
;
} else if (equalIgnoringCase(v8Value, "Per")) {
@@ -3789,7 +3789,7 @@ static void limitedToOnlyOtherAttributeAttributeGetter(const v8::PropertyCallbac
{
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
- String v8Value = impl->fastGetAttribute(HTMLNames::otherAttr);
+ String v8Value(impl->fastGetAttribute(HTMLNames::otherAttr));
if (v8Value.isEmpty()) {
;
} else if (equalIgnoringCase(v8Value, "Value1")) {
@@ -3830,7 +3830,7 @@ static void limitedWithMissingDefaultAttributeAttributeGetter(const v8::Property
{
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
- String v8Value = impl->fastGetAttribute(HTMLNames::limitedwithmissingdefaultattributeAttr);
+ String v8Value(impl->fastGetAttribute(HTMLNames::limitedwithmissingdefaultattributeAttr));
if (v8Value.isEmpty()) {
v8Value = "rsa";
} else if (equalIgnoringCase(v8Value, "rsa")) {
@@ -3871,7 +3871,7 @@ static void limitedWithInvalidMissingDefaultAttributeAttributeGetter(const v8::P
{
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
- String v8Value = impl->fastGetAttribute(HTMLNames::limitedwithinvalidmissingdefaultattributeAttr);
+ String v8Value(impl->fastGetAttribute(HTMLNames::limitedwithinvalidmissingdefaultattributeAttr));
if (v8Value.isEmpty()) {
v8Value = "auto";
} else if (equalIgnoringCase(v8Value, "ltr")) {
@@ -3914,7 +3914,7 @@ static void corsSettingAttributeAttributeGetter(const v8::PropertyCallbackInfo<v
{
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
- String v8Value = impl->fastGetAttribute(HTMLNames::corssettingattributeAttr);
+ String v8Value(impl->fastGetAttribute(HTMLNames::corssettingattributeAttr));
if (v8Value.isNull()) {
;
} else if (v8Value.isEmpty()) {
@@ -3940,7 +3940,7 @@ static void limitedWithEmptyMissingInvalidAttributeAttributeGetter(const v8::Pro
{
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
- String v8Value = impl->fastGetAttribute(HTMLNames::limitedwithemptymissinginvalidattributeAttr);
+ String v8Value(impl->fastGetAttribute(HTMLNames::limitedwithemptymissinginvalidattributeAttr));
if (v8Value.isNull()) {
v8Value = "missing";
} else if (v8Value.isEmpty()) {
@@ -4444,7 +4444,7 @@ static void typeCheckingNullableTestInterfaceOrNullAttributeAttributeGetter(cons
{
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
- RefPtr<TestInterfaceImplementation> v8Value = impl->typeCheckingNullableTestInterfaceOrNullAttribute();
+ RefPtr<TestInterfaceImplementation> v8Value(impl->typeCheckingNullableTestInterfaceOrNullAttribute());
if (!v8Value) {
v8SetReturnValueNull(info);
return;
@@ -4479,7 +4479,7 @@ static void typeCheckingInterfaceNullableTestInterfaceOrNullAttributeAttributeGe
{
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
- RefPtr<TestInterfaceImplementation> v8Value = impl->typeCheckingInterfaceNullableTestInterfaceOrNullAttribute();
+ RefPtr<TestInterfaceImplementation> v8Value(impl->typeCheckingInterfaceNullableTestInterfaceOrNullAttribute());
if (!v8Value) {
v8SetReturnValueNull(info);
return;
@@ -4749,7 +4749,7 @@ static void testInterfaceGarbageCollectedOrNullAttributeAttributeGetter(const v8
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
bool isNull = false;
- RawPtr<TestInterfaceGarbageCollected> v8Value = impl->testInterfaceGarbageCollectedOrNullAttribute(isNull);
+ RawPtr<TestInterfaceGarbageCollected> v8Value(impl->testInterfaceGarbageCollectedOrNullAttribute(isNull));
if (isNull) {
v8SetReturnValueNull(info);
return;
@@ -4813,7 +4813,7 @@ static void testInterfaceWillBeGarbageCollectedOrNullAttributeAttributeGetter(co
v8::Handle<v8::Object> holder = info.Holder();
TestObject* impl = V8TestObject::toNative(holder);
bool isNull = false;
- RefPtrWillBeRawPtr<TestInterfaceWillBeGarbageCollected> v8Value = impl->testInterfaceWillBeGarbageCollectedOrNullAttribute(isNull);
+ RefPtrWillBeRawPtr<TestInterfaceWillBeGarbageCollected> v8Value(impl->testInterfaceWillBeGarbageCollectedOrNullAttribute(isNull));
if (isNull) {
v8SetReturnValueNull(info);
return;

Powered by Google App Engine
This is Rietveld 408576698