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

Side by Side Diff: src/api.cc

Issue 39128: Merge revisions 1412 and 1416 from bleeding_edge to trunk... (Closed) Base URL: http://v8.googlecode.com/svn/trunk/
Patch Set: Created 11 years, 9 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 | « no previous file | src/parser.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 2007-2008 the V8 project authors. All rights reserved. 1 // Copyright 2007-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 2167 matching lines...) Expand 10 before | Expand all | Expand 10 after
2178 HandleScope scope; 2178 HandleScope scope;
2179 if (i::Snapshot::Initialize()) { 2179 if (i::Snapshot::Initialize()) {
2180 return true; 2180 return true;
2181 } else { 2181 } else {
2182 return i::V8::Initialize(NULL); 2182 return i::V8::Initialize(NULL);
2183 } 2183 }
2184 } 2184 }
2185 2185
2186 2186
2187 const char* v8::V8::GetVersion() { 2187 const char* v8::V8::GetVersion() {
2188 return "1.0.3.1"; 2188 return "1.0.3.2";
2189 } 2189 }
2190 2190
2191 2191
2192 static i::Handle<i::FunctionTemplateInfo> 2192 static i::Handle<i::FunctionTemplateInfo>
2193 EnsureConstructor(i::Handle<i::ObjectTemplateInfo> templ) { 2193 EnsureConstructor(i::Handle<i::ObjectTemplateInfo> templ) {
2194 if (templ->constructor()->IsUndefined()) { 2194 if (templ->constructor()->IsUndefined()) {
2195 Local<FunctionTemplate> constructor = FunctionTemplate::New(); 2195 Local<FunctionTemplate> constructor = FunctionTemplate::New();
2196 Utils::OpenHandle(*constructor)->set_instance_template(*templ); 2196 Utils::OpenHandle(*constructor)->set_instance_template(*templ);
2197 templ->set_constructor(*Utils::OpenHandle(*constructor)); 2197 templ->set_constructor(*Utils::OpenHandle(*constructor));
2198 } 2198 }
(...skipping 836 matching lines...) Expand 10 before | Expand all | Expand 10 after
3035 reinterpret_cast<HandleScopeImplementer*>(storage); 3035 reinterpret_cast<HandleScopeImplementer*>(storage);
3036 List<void**>* blocks_of_archived_thread = thread_local->Blocks(); 3036 List<void**>* blocks_of_archived_thread = thread_local->Blocks();
3037 v8::ImplementationUtilities::HandleScopeData* handle_data_of_archived_thread = 3037 v8::ImplementationUtilities::HandleScopeData* handle_data_of_archived_thread =
3038 &thread_local->handle_scope_data_; 3038 &thread_local->handle_scope_data_;
3039 Iterate(v, blocks_of_archived_thread, handle_data_of_archived_thread); 3039 Iterate(v, blocks_of_archived_thread, handle_data_of_archived_thread);
3040 3040
3041 return storage + ArchiveSpacePerThread(); 3041 return storage + ArchiveSpacePerThread();
3042 } 3042 }
3043 3043
3044 } } // namespace v8::internal 3044 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698