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

Side by Side Diff: src/objects.cc

Issue 600733003: Version 3.27.34.21 (merged r24125) (Closed) Base URL: https://v8.googlecode.com/svn/branches/3.27
Patch Set: Created 6 years, 2 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 681 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 } else { 692 } else {
693 property_dictionary->ValueAtPut(result->GetDictionaryEntry(), *value); 693 property_dictionary->ValueAtPut(result->GetDictionaryEntry(), *value);
694 } 694 }
695 } 695 }
696 696
697 697
698 void JSObject::SetNormalizedProperty(Handle<JSObject> object, 698 void JSObject::SetNormalizedProperty(Handle<JSObject> object,
699 Handle<Name> name, 699 Handle<Name> name,
700 Handle<Object> value, 700 Handle<Object> value,
701 PropertyDetails details) { 701 PropertyDetails details) {
702 ASSERT(!object->HasFastProperties()); 702 CHECK(!object->HasFastProperties());
703 Handle<NameDictionary> property_dictionary(object->property_dictionary()); 703 Handle<NameDictionary> property_dictionary(object->property_dictionary());
704 704
705 if (!name->IsUniqueName()) { 705 if (!name->IsUniqueName()) {
706 name = object->GetIsolate()->factory()->InternalizeString( 706 name = object->GetIsolate()->factory()->InternalizeString(
707 Handle<String>::cast(name)); 707 Handle<String>::cast(name));
708 } 708 }
709 709
710 int entry = property_dictionary->FindEntry(name); 710 int entry = property_dictionary->FindEntry(name);
711 if (entry == NameDictionary::kNotFound) { 711 if (entry == NameDictionary::kNotFound) {
712 Handle<Object> store_value = value; 712 Handle<Object> store_value = value;
(...skipping 16302 matching lines...) Expand 10 before | Expand all | Expand 10 after
17015 #define ERROR_MESSAGES_TEXTS(C, T) T, 17015 #define ERROR_MESSAGES_TEXTS(C, T) T,
17016 static const char* error_messages_[] = { 17016 static const char* error_messages_[] = {
17017 ERROR_MESSAGES_LIST(ERROR_MESSAGES_TEXTS) 17017 ERROR_MESSAGES_LIST(ERROR_MESSAGES_TEXTS)
17018 }; 17018 };
17019 #undef ERROR_MESSAGES_TEXTS 17019 #undef ERROR_MESSAGES_TEXTS
17020 return error_messages_[reason]; 17020 return error_messages_[reason];
17021 } 17021 }
17022 17022
17023 17023
17024 } } // namespace v8::internal 17024 } } // 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