| OLD | NEW |
| 1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2011 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 3075 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3086 i::Handle<i::String> name, | 3086 i::Handle<i::String> name, |
| 3087 i::LookupResult* lookup) { | 3087 i::LookupResult* lookup) { |
| 3088 if (!lookup->IsProperty()) { | 3088 if (!lookup->IsProperty()) { |
| 3089 // No real property was found. | 3089 // No real property was found. |
| 3090 return Local<Value>(); | 3090 return Local<Value>(); |
| 3091 } | 3091 } |
| 3092 | 3092 |
| 3093 // If the property being looked up is a callback, it can throw | 3093 // If the property being looked up is a callback, it can throw |
| 3094 // an exception. | 3094 // an exception. |
| 3095 EXCEPTION_PREAMBLE(isolate); | 3095 EXCEPTION_PREAMBLE(isolate); |
| 3096 i::Handle<i::Object> result = i::GetProperty(receiver, name, lookup); | 3096 PropertyAttributes attributes; |
| 3097 i::Handle<i::Object> result = i::Object::GetProperty(isolate, |
| 3098 receiver, |
| 3099 receiver, |
| 3100 lookup, |
| 3101 name, |
| 3102 &attributes); |
| 3097 has_pending_exception = result.is_null(); | 3103 has_pending_exception = result.is_null(); |
| 3098 EXCEPTION_BAILOUT_CHECK(isolate, Local<Value>()); | 3104 EXCEPTION_BAILOUT_CHECK(isolate, Local<Value>()); |
| 3099 | 3105 |
| 3100 return Utils::ToLocal(result); | 3106 return Utils::ToLocal(result); |
| 3101 } | 3107 } |
| 3102 | 3108 |
| 3103 | 3109 |
| 3104 Local<Value> v8::Object::GetRealNamedPropertyInPrototypeChain( | 3110 Local<Value> v8::Object::GetRealNamedPropertyInPrototypeChain( |
| 3105 Handle<String> key) { | 3111 Handle<String> key) { |
| 3106 i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate(); | 3112 i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate(); |
| (...skipping 2984 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6091 | 6097 |
| 6092 | 6098 |
| 6093 char* HandleScopeImplementer::Iterate(ObjectVisitor* v, char* storage) { | 6099 char* HandleScopeImplementer::Iterate(ObjectVisitor* v, char* storage) { |
| 6094 HandleScopeImplementer* scope_implementer = | 6100 HandleScopeImplementer* scope_implementer = |
| 6095 reinterpret_cast<HandleScopeImplementer*>(storage); | 6101 reinterpret_cast<HandleScopeImplementer*>(storage); |
| 6096 scope_implementer->IterateThis(v); | 6102 scope_implementer->IterateThis(v); |
| 6097 return storage + ArchiveSpacePerThread(); | 6103 return storage + ArchiveSpacePerThread(); |
| 6098 } | 6104 } |
| 6099 | 6105 |
| 6100 } } // namespace v8::internal | 6106 } } // namespace v8::internal |
| OLD | NEW |