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

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

Issue 660173: Fix bad merge of serialize.cc numbers for external references to ... (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/partial_snapshots/
Patch Set: Created 10 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/objects.cc ('k') | src/serialize.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 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 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 2750 matching lines...) Expand 10 before | Expand all | Expand 10 after
2761 bool JSObject::HasNamedInterceptor() { 2761 bool JSObject::HasNamedInterceptor() {
2762 return map()->has_named_interceptor(); 2762 return map()->has_named_interceptor();
2763 } 2763 }
2764 2764
2765 2765
2766 bool JSObject::HasIndexedInterceptor() { 2766 bool JSObject::HasIndexedInterceptor() {
2767 return map()->has_indexed_interceptor(); 2767 return map()->has_indexed_interceptor();
2768 } 2768 }
2769 2769
2770 2770
2771 bool JSObject::AllowsSetElementsLength() {
2772 bool result = elements()->IsFixedArray();
2773 ASSERT(result == (!HasPixelElements() && !HasExternalArrayElements()));
2774 return result;
2775 }
2776
2777
2778 StringDictionary* JSObject::property_dictionary() { 2771 StringDictionary* JSObject::property_dictionary() {
2779 ASSERT(!HasFastProperties()); 2772 ASSERT(!HasFastProperties());
2780 return StringDictionary::cast(properties()); 2773 return StringDictionary::cast(properties());
2781 } 2774 }
2782 2775
2783 2776
2784 NumberDictionary* JSObject::element_dictionary() { 2777 NumberDictionary* JSObject::element_dictionary() {
2785 ASSERT(HasDictionaryElements()); 2778 ASSERT(HasDictionaryElements());
2786 return NumberDictionary::cast(elements()); 2779 return NumberDictionary::cast(elements());
2787 } 2780 }
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
3042 #undef WRITE_INT_FIELD 3035 #undef WRITE_INT_FIELD
3043 #undef READ_SHORT_FIELD 3036 #undef READ_SHORT_FIELD
3044 #undef WRITE_SHORT_FIELD 3037 #undef WRITE_SHORT_FIELD
3045 #undef READ_BYTE_FIELD 3038 #undef READ_BYTE_FIELD
3046 #undef WRITE_BYTE_FIELD 3039 #undef WRITE_BYTE_FIELD
3047 3040
3048 3041
3049 } } // namespace v8::internal 3042 } } // namespace v8::internal
3050 3043
3051 #endif // V8_OBJECTS_INL_H_ 3044 #endif // V8_OBJECTS_INL_H_
OLDNEW
« no previous file with comments | « src/objects.cc ('k') | src/serialize.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698