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

Side by Side Diff: src/objects.cc

Issue 597893002: Version 3.28.71.12 (merged r24125) (Closed) Base URL: https://v8.googlecode.com/svn/branches/3.28
Patch Set: move check to SetNormalizedProperty Created 6 years, 3 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/json-parser.h ('k') | src/version.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 2013 the V8 project authors. All rights reserved. 1 // Copyright 2013 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/v8.h" 5 #include "src/v8.h"
6 6
7 #include "src/accessors.h" 7 #include "src/accessors.h"
8 #include "src/allocation-site-scopes.h" 8 #include "src/allocation-site-scopes.h"
9 #include "src/api.h" 9 #include "src/api.h"
10 #include "src/arguments.h" 10 #include "src/arguments.h"
(...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 } else { 686 } else {
687 property_dictionary->ValueAtPut(result->GetDictionaryEntry(), *value); 687 property_dictionary->ValueAtPut(result->GetDictionaryEntry(), *value);
688 } 688 }
689 } 689 }
690 690
691 691
692 void JSObject::SetNormalizedProperty(Handle<JSObject> object, 692 void JSObject::SetNormalizedProperty(Handle<JSObject> object,
693 Handle<Name> name, 693 Handle<Name> name,
694 Handle<Object> value, 694 Handle<Object> value,
695 PropertyDetails details) { 695 PropertyDetails details) {
696 DCHECK(!object->HasFastProperties()); 696 CHECK(!object->HasFastProperties());
697 Handle<NameDictionary> property_dictionary(object->property_dictionary()); 697 Handle<NameDictionary> property_dictionary(object->property_dictionary());
698 698
699 if (!name->IsUniqueName()) { 699 if (!name->IsUniqueName()) {
700 name = object->GetIsolate()->factory()->InternalizeString( 700 name = object->GetIsolate()->factory()->InternalizeString(
701 Handle<String>::cast(name)); 701 Handle<String>::cast(name));
702 } 702 }
703 703
704 int entry = property_dictionary->FindEntry(name); 704 int entry = property_dictionary->FindEntry(name);
705 if (entry == NameDictionary::kNotFound) { 705 if (entry == NameDictionary::kNotFound) {
706 Handle<Object> store_value = value; 706 Handle<Object> store_value = value;
(...skipping 16236 matching lines...) Expand 10 before | Expand all | Expand 10 after
16943 #define ERROR_MESSAGES_TEXTS(C, T) T, 16943 #define ERROR_MESSAGES_TEXTS(C, T) T,
16944 static const char* error_messages_[] = { 16944 static const char* error_messages_[] = {
16945 ERROR_MESSAGES_LIST(ERROR_MESSAGES_TEXTS) 16945 ERROR_MESSAGES_LIST(ERROR_MESSAGES_TEXTS)
16946 }; 16946 };
16947 #undef ERROR_MESSAGES_TEXTS 16947 #undef ERROR_MESSAGES_TEXTS
16948 return error_messages_[reason]; 16948 return error_messages_[reason];
16949 } 16949 }
16950 16950
16951 16951
16952 } } // namespace v8::internal 16952 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/json-parser.h ('k') | src/version.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698