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

Side by Side Diff: src/api.cc

Issue 115020: Merge bleeding_edge@1868 to 0.3 branch. (Closed) Base URL: http://v8.googlecode.com/svn/branches/0.3/
Patch Set: Created 11 years, 7 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/heap-inl.h » ('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 2205 matching lines...) Expand 10 before | Expand all | Expand 10 after
2216 if (i::Snapshot::Initialize()) { 2216 if (i::Snapshot::Initialize()) {
2217 i::Serializer::disable(); 2217 i::Serializer::disable();
2218 return true; 2218 return true;
2219 } else { 2219 } else {
2220 return i::V8::Initialize(NULL); 2220 return i::V8::Initialize(NULL);
2221 } 2221 }
2222 } 2222 }
2223 2223
2224 2224
2225 const char* v8::V8::GetVersion() { 2225 const char* v8::V8::GetVersion() {
2226 return "0.3.9.4"; 2226 return "0.3.9.5";
2227 } 2227 }
2228 2228
2229 2229
2230 Persistent<Context> v8::Context::New(v8::ExtensionConfiguration* extensions, 2230 Persistent<Context> v8::Context::New(v8::ExtensionConfiguration* extensions,
2231 v8::Handle<ObjectTemplate> global_template, 2231 v8::Handle<ObjectTemplate> global_template,
2232 v8::Handle<Value> global_object) { 2232 v8::Handle<Value> global_object) {
2233 EnsureInitialized("v8::Context::New()"); 2233 EnsureInitialized("v8::Context::New()");
2234 LOG_API("Context::New"); 2234 LOG_API("Context::New");
2235 ON_BAILOUT("v8::Context::New()", return Persistent<Context>()); 2235 ON_BAILOUT("v8::Context::New()", return Persistent<Context>());
2236 // Make sure that the global_template has a constructor. 2236 // Make sure that the global_template has a constructor.
(...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after
2946 reinterpret_cast<HandleScopeImplementer*>(storage); 2946 reinterpret_cast<HandleScopeImplementer*>(storage);
2947 List<void**>* blocks_of_archived_thread = thread_local->Blocks(); 2947 List<void**>* blocks_of_archived_thread = thread_local->Blocks();
2948 ImplementationUtilities::HandleScopeData* handle_data_of_archived_thread = 2948 ImplementationUtilities::HandleScopeData* handle_data_of_archived_thread =
2949 &thread_local->handle_scope_data_; 2949 &thread_local->handle_scope_data_;
2950 Iterate(v, blocks_of_archived_thread, handle_data_of_archived_thread); 2950 Iterate(v, blocks_of_archived_thread, handle_data_of_archived_thread);
2951 2951
2952 return storage + ArchiveSpacePerThread(); 2952 return storage + ArchiveSpacePerThread();
2953 } 2953 }
2954 2954
2955 } } // namespace v8::internal 2955 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/heap-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698