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

Unified Diff: src/objects.cc

Issue 119172: Fix the issue with layout tests.... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 11 years, 7 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 | « src/objects.h ('k') | test/cctest/test-api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/objects.cc
===================================================================
--- src/objects.cc (revision 2103)
+++ src/objects.cc (working copy)
@@ -5617,10 +5617,11 @@
}
-Object* JSObject::GetPropertyWithInterceptorProper(
+bool JSObject::GetPropertyWithInterceptorProper(
JSObject* receiver,
String* name,
- PropertyAttributes* attributes) {
+ PropertyAttributes* attributes,
+ Object** result_object) {
HandleScope scope;
Handle<InterceptorInfo> interceptor(GetNamedInterceptor());
Handle<JSObject> receiver_handle(receiver);
@@ -5641,14 +5642,17 @@
VMState state(EXTERNAL);
result = getter(v8::Utils::ToLocal(name_handle), info);
}
- RETURN_IF_SCHEDULED_EXCEPTION();
+ if (Top::has_scheduled_exception()) {
+ return false;
+ }
if (!result.IsEmpty()) {
*attributes = NONE;
- return *v8::Utils::OpenHandle(*result);
+ *result_object = *v8::Utils::OpenHandle(*result);
+ return true;
}
}
- return NULL;
+ return false;
}
@@ -5662,8 +5666,12 @@
Handle<JSObject> holder_handle(this);
Handle<String> name_handle(name);
- Object* result = GetPropertyWithInterceptorProper(receiver, name, attributes);
- if (result) return result;
+ Object* result = NULL;
+ if (GetPropertyWithInterceptorProper(receiver, name, attributes, &result)) {
+ return result;
+ } else {
+ RETURN_IF_SCHEDULED_EXCEPTION();
+ }
int property_index = lookup_hint->value();
if (property_index >= 0) {
@@ -5708,8 +5716,12 @@
Handle<JSObject> holder_handle(this);
Handle<String> name_handle(name);
- Object* result = GetPropertyWithInterceptorProper(receiver, name, attributes);
- if (result) return result;
+ Object* result = NULL;
+ if (GetPropertyWithInterceptorProper(receiver, name, attributes, &result)) {
+ return result;
+ } else {
+ RETURN_IF_SCHEDULED_EXCEPTION();
+ }
result = holder_handle->GetPropertyPostInterceptor(
*receiver_handle,
« no previous file with comments | « src/objects.h ('k') | test/cctest/test-api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698