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

Side by Side Diff: src/objects-inl.h

Issue 11415051: Revert r12990 and r12991 from trunk. (Closed) Base URL: https://v8.googlecode.com/svn/trunk
Patch Set: Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/objects.cc ('k') | src/runtime.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 5015 matching lines...) Expand 10 before | Expand all | Expand 10 after
5026 5026
5027 bool JSReceiver::HasLocalProperty(String* name) { 5027 bool JSReceiver::HasLocalProperty(String* name) {
5028 if (IsJSProxy()) { 5028 if (IsJSProxy()) {
5029 return JSProxy::cast(this)->HasPropertyWithHandler(name); 5029 return JSProxy::cast(this)->HasPropertyWithHandler(name);
5030 } 5030 }
5031 return GetLocalPropertyAttribute(name) != ABSENT; 5031 return GetLocalPropertyAttribute(name) != ABSENT;
5032 } 5032 }
5033 5033
5034 5034
5035 PropertyAttributes JSReceiver::GetPropertyAttribute(String* key) { 5035 PropertyAttributes JSReceiver::GetPropertyAttribute(String* key) {
5036 uint32_t index;
5037 if (IsJSObject() && key->AsArrayIndex(&index)) {
5038 return GetElementAttribute(index);
5039 }
5040 return GetPropertyAttributeWithReceiver(this, key); 5036 return GetPropertyAttributeWithReceiver(this, key);
5041 } 5037 }
5042 5038
5043 5039
5044 PropertyAttributes JSReceiver::GetElementAttribute(uint32_t index) { 5040 PropertyAttributes JSReceiver::GetElementAttribute(uint32_t index) {
5045 if (IsJSProxy()) { 5041 if (IsJSProxy()) {
5046 return JSProxy::cast(this)->GetElementAttributeWithHandler(this, index); 5042 return JSProxy::cast(this)->GetElementAttributeWithHandler(this, index);
5047 } 5043 }
5048 return JSObject::cast(this)->GetElementAttributeWithReceiver( 5044 return JSObject::cast(this)->GetElementAttributeWithReceiver(
5049 this, index, true); 5045 this, index, true);
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
5545 #undef WRITE_UINT32_FIELD 5541 #undef WRITE_UINT32_FIELD
5546 #undef READ_SHORT_FIELD 5542 #undef READ_SHORT_FIELD
5547 #undef WRITE_SHORT_FIELD 5543 #undef WRITE_SHORT_FIELD
5548 #undef READ_BYTE_FIELD 5544 #undef READ_BYTE_FIELD
5549 #undef WRITE_BYTE_FIELD 5545 #undef WRITE_BYTE_FIELD
5550 5546
5551 5547
5552 } } // namespace v8::internal 5548 } } // namespace v8::internal
5553 5549
5554 #endif // V8_OBJECTS_INL_H_ 5550 #endif // V8_OBJECTS_INL_H_
OLDNEW
« no previous file with comments | « src/objects.cc ('k') | src/runtime.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698