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

Side by Side Diff: src/api.cc

Issue 57057: Merge bugfix for issue 294 from bleeding_edge to trunk. (Closed) Base URL: http://v8.googlecode.com/svn/trunk/
Patch Set: Created 11 years, 8 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/virtual-frame-ia32.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 2261 matching lines...) Expand 10 before | Expand all | Expand 10 after
2272 } 2272 }
2273 2273
2274 2274
2275 bool v8::V8::Dispose() { 2275 bool v8::V8::Dispose() {
2276 i::V8::TearDown(); 2276 i::V8::TearDown();
2277 return true; 2277 return true;
2278 } 2278 }
2279 2279
2280 2280
2281 const char* v8::V8::GetVersion() { 2281 const char* v8::V8::GetVersion() {
2282 return "1.1.4"; 2282 return "1.1.4.1";
2283 } 2283 }
2284 2284
2285 2285
2286 static i::Handle<i::FunctionTemplateInfo> 2286 static i::Handle<i::FunctionTemplateInfo>
2287 EnsureConstructor(i::Handle<i::ObjectTemplateInfo> templ) { 2287 EnsureConstructor(i::Handle<i::ObjectTemplateInfo> templ) {
2288 if (templ->constructor()->IsUndefined()) { 2288 if (templ->constructor()->IsUndefined()) {
2289 Local<FunctionTemplate> constructor = FunctionTemplate::New(); 2289 Local<FunctionTemplate> constructor = FunctionTemplate::New();
2290 Utils::OpenHandle(*constructor)->set_instance_template(*templ); 2290 Utils::OpenHandle(*constructor)->set_instance_template(*templ);
2291 templ->set_constructor(*Utils::OpenHandle(*constructor)); 2291 templ->set_constructor(*Utils::OpenHandle(*constructor));
2292 } 2292 }
(...skipping 906 matching lines...) Expand 10 before | Expand all | Expand 10 after
3199 reinterpret_cast<HandleScopeImplementer*>(storage); 3199 reinterpret_cast<HandleScopeImplementer*>(storage);
3200 List<void**>* blocks_of_archived_thread = thread_local->Blocks(); 3200 List<void**>* blocks_of_archived_thread = thread_local->Blocks();
3201 v8::ImplementationUtilities::HandleScopeData* handle_data_of_archived_thread = 3201 v8::ImplementationUtilities::HandleScopeData* handle_data_of_archived_thread =
3202 &thread_local->handle_scope_data_; 3202 &thread_local->handle_scope_data_;
3203 Iterate(v, blocks_of_archived_thread, handle_data_of_archived_thread); 3203 Iterate(v, blocks_of_archived_thread, handle_data_of_archived_thread);
3204 3204
3205 return storage + ArchiveSpacePerThread(); 3205 return storage + ArchiveSpacePerThread();
3206 } 3206 }
3207 3207
3208 } } // namespace v8::internal 3208 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/virtual-frame-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698