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

Side by Side Diff: src/api.cc

Issue 100328: Removed the version handling from the 1.1 branch to make it simpler to update... (Closed) Base URL: http://v8.googlecode.com/svn/branches/1.1/
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 | « src/SConscript ('k') | src/version.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 2009 the V8 project authors. All rights reserved. 1 // Copyright 2009 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 19 matching lines...) Expand all
30 #include "api.h" 30 #include "api.h"
31 #include "bootstrapper.h" 31 #include "bootstrapper.h"
32 #include "compiler.h" 32 #include "compiler.h"
33 #include "debug.h" 33 #include "debug.h"
34 #include "execution.h" 34 #include "execution.h"
35 #include "global-handles.h" 35 #include "global-handles.h"
36 #include "platform.h" 36 #include "platform.h"
37 #include "serialize.h" 37 #include "serialize.h"
38 #include "snapshot.h" 38 #include "snapshot.h"
39 #include "v8threads.h" 39 #include "v8threads.h"
40 #include "version.h"
41 40
42 41
43 #define LOG_API(expr) LOG(ApiEntryCall(expr)) 42 #define LOG_API(expr) LOG(ApiEntryCall(expr))
44 43
45 #ifdef ENABLE_HEAP_PROTECTION 44 #ifdef ENABLE_HEAP_PROTECTION
46 #define ENTER_V8 i::VMState __state__(i::OTHER) 45 #define ENTER_V8 i::VMState __state__(i::OTHER)
47 #define LEAVE_V8 i::VMState __state__(i::EXTERNAL) 46 #define LEAVE_V8 i::VMState __state__(i::EXTERNAL)
48 #else 47 #else
49 #define ENTER_V8 ((void) 0) 48 #define ENTER_V8 ((void) 0)
50 #define LEAVE_V8 ((void) 0) 49 #define LEAVE_V8 ((void) 0)
(...skipping 2316 matching lines...) Expand 10 before | Expand all | Expand 10 after
2367 } 2366 }
2368 2367
2369 2368
2370 bool v8::V8::Dispose() { 2369 bool v8::V8::Dispose() {
2371 i::V8::TearDown(); 2370 i::V8::TearDown();
2372 return true; 2371 return true;
2373 } 2372 }
2374 2373
2375 2374
2376 const char* v8::V8::GetVersion() { 2375 const char* v8::V8::GetVersion() {
2377 static v8::internal::EmbeddedVector<char, 128> buffer; 2376 return "1.1.10.6";
2378 v8::internal::Version::GetString(buffer);
2379 return buffer.start();
2380 } 2377 }
2381 2378
2382 2379
2383 static i::Handle<i::FunctionTemplateInfo> 2380 static i::Handle<i::FunctionTemplateInfo>
2384 EnsureConstructor(i::Handle<i::ObjectTemplateInfo> templ) { 2381 EnsureConstructor(i::Handle<i::ObjectTemplateInfo> templ) {
2385 if (templ->constructor()->IsUndefined()) { 2382 if (templ->constructor()->IsUndefined()) {
2386 Local<FunctionTemplate> constructor = FunctionTemplate::New(); 2383 Local<FunctionTemplate> constructor = FunctionTemplate::New();
2387 Utils::OpenHandle(*constructor)->set_instance_template(*templ); 2384 Utils::OpenHandle(*constructor)->set_instance_template(*templ);
2388 templ->set_constructor(*Utils::OpenHandle(*constructor)); 2385 templ->set_constructor(*Utils::OpenHandle(*constructor));
2389 } 2386 }
(...skipping 952 matching lines...) Expand 10 before | Expand all | Expand 10 after
3342 reinterpret_cast<HandleScopeImplementer*>(storage); 3339 reinterpret_cast<HandleScopeImplementer*>(storage);
3343 List<void**>* blocks_of_archived_thread = thread_local->Blocks(); 3340 List<void**>* blocks_of_archived_thread = thread_local->Blocks();
3344 v8::ImplementationUtilities::HandleScopeData* handle_data_of_archived_thread = 3341 v8::ImplementationUtilities::HandleScopeData* handle_data_of_archived_thread =
3345 &thread_local->handle_scope_data_; 3342 &thread_local->handle_scope_data_;
3346 Iterate(v, blocks_of_archived_thread, handle_data_of_archived_thread); 3343 Iterate(v, blocks_of_archived_thread, handle_data_of_archived_thread);
3347 3344
3348 return storage + ArchiveSpacePerThread(); 3345 return storage + ArchiveSpacePerThread();
3349 } 3346 }
3350 3347
3351 } } // namespace v8::internal 3348 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/SConscript ('k') | src/version.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698