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

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

Issue 16836015: Rebaseline bindings test results after r152270 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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
« no previous file with comments | « Source/bindings/tests/results/V8TestInterface.h ('k') | Source/bindings/tests/results/V8TestObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/tests/results/V8TestInterface.cpp
diff --git a/Source/bindings/tests/results/V8TestInterface.cpp b/Source/bindings/tests/results/V8TestInterface.cpp
index 4069c0bd5dca600067faa7a4f0005ca1113a6f58..b1c6f1b5c1907c0140f234b8886b4efc7ceaf3c4 100644
--- a/Source/bindings/tests/results/V8TestInterface.cpp
+++ b/Source/bindings/tests/results/V8TestInterface.cpp
@@ -547,14 +547,14 @@ void V8TestInterface::constructorCallback(const v8::FunctionCallbackInfo<v8::Val
TestInterfaceV8Internal::constructor(args);
}
-v8::Handle<v8::Value> V8TestInterface::namedPropertyGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
+void V8TestInterface::namedPropertyGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
if (!info.Holder()->GetRealNamedPropertyInPrototypeChain(name).IsEmpty())
- return v8Undefined();
+ return;
if (info.Holder()->HasRealNamedCallbackProperty(name))
- return v8Undefined();
+ return;
if (info.Holder()->HasRealNamedProperty(name))
- return v8Undefined();
+ return;
ASSERT(V8DOMWrapper::maybeDOMWrapper(info.Holder()));
TestInterface* collection = toNative(info.Holder());
@@ -564,14 +564,20 @@ v8::Handle<v8::Value> V8TestInterface::namedPropertyGetter(v8::Local<v8::String>
bool element1Enabled = false;
RefPtr<NodeList> element1;
collection->getItem(propertyName, element0Enabled, element0, element1Enabled, element1);
- if (element0Enabled)
- return toV8Fast(element0.release(), info, collection);
- if (element1Enabled)
- return toV8Fast(element1.release(), info, collection);
- return v8Undefined();
+ if (element0Enabled) {
+ v8SetReturnValue(info, toV8Fast(element0.release(), info, collection));
+ return;
+ }
+
+ if (element1Enabled) {
+ v8SetReturnValue(info, toV8Fast(element1.release(), info, collection));
+ return;
+ }
+
+ return;
}
-v8::Handle<v8::Array> V8TestInterface::namedPropertyEnumerator(const v8::AccessorInfo& info)
+void V8TestInterface::namedPropertyEnumerator(const v8::PropertyCallbackInfo<v8::Array>& info)
{
ExceptionCode ec = 0;
TestInterface* collection = toNative(info.Holder());
@@ -579,12 +585,12 @@ v8::Handle<v8::Array> V8TestInterface::namedPropertyEnumerator(const v8::Accesso
collection->namedPropertyEnumerator(names, ec);
if (ec) {
setDOMException(ec, info.GetIsolate());
- return v8::Handle<v8::Array>();
+ return;
}
v8::Handle<v8::Array> v8names = v8::Array::New(names.size());
for (size_t i = 0; i < names.size(); ++i)
v8names->Set(v8Integer(i, info.GetIsolate()), v8String(names[i], info.GetIsolate()));
- return v8names;
+ v8SetReturnValue(info, v8names);
}
static v8::Handle<v8::FunctionTemplate> ConfigureV8TestInterfaceTemplate(v8::Handle<v8::FunctionTemplate> desc, v8::Isolate* isolate, WrapperWorldType currentWorldType)
« no previous file with comments | « Source/bindings/tests/results/V8TestInterface.h ('k') | Source/bindings/tests/results/V8TestObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698