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

Side by Side Diff: src/api.cc

Issue 660448: Merge r4003 to trunk forming V8 version 2.1.2.5. (Closed) Base URL: http://v8.googlecode.com/svn/trunk/
Patch Set: Created 10 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/heap.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 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 bool V8::IsGlobalWeak(i::Object** obj) { 431 bool V8::IsGlobalWeak(i::Object** obj) {
432 LOG_API("IsGlobalWeak"); 432 LOG_API("IsGlobalWeak");
433 if (!i::V8::IsRunning()) return false; 433 if (!i::V8::IsRunning()) return false;
434 return i::GlobalHandles::IsWeak(obj); 434 return i::GlobalHandles::IsWeak(obj);
435 } 435 }
436 436
437 437
438 void V8::DisposeGlobal(i::Object** obj) { 438 void V8::DisposeGlobal(i::Object** obj) {
439 LOG_API("DisposeGlobal"); 439 LOG_API("DisposeGlobal");
440 if (!i::V8::IsRunning()) return; 440 if (!i::V8::IsRunning()) return;
441 if ((*obj)->IsGlobalContext()) i::Heap::NotifyContextDisposedDeprecated();
442 i::GlobalHandles::Destroy(obj); 441 i::GlobalHandles::Destroy(obj);
443 } 442 }
444 443
445 // --- H a n d l e s --- 444 // --- H a n d l e s ---
446 445
447 446
448 HandleScope::HandleScope() : is_closed_(false) { 447 HandleScope::HandleScope() : is_closed_(false) {
449 API_ENTRY_CHECK("HandleScope::HandleScope"); 448 API_ENTRY_CHECK("HandleScope::HandleScope");
450 i::HandleScope::Enter(&previous_); 449 i::HandleScope::Enter(&previous_);
451 } 450 }
(...skipping 2399 matching lines...) Expand 10 before | Expand all | Expand 10 after
2851 v8::Handle<ObjectTemplate> global_template, 2850 v8::Handle<ObjectTemplate> global_template,
2852 v8::Handle<Value> global_object) { 2851 v8::Handle<Value> global_object) {
2853 EnsureInitialized("v8::Context::New()"); 2852 EnsureInitialized("v8::Context::New()");
2854 LOG_API("Context::New"); 2853 LOG_API("Context::New");
2855 ON_BAILOUT("v8::Context::New()", return Persistent<Context>()); 2854 ON_BAILOUT("v8::Context::New()", return Persistent<Context>());
2856 2855
2857 // Enter V8 via an ENTER_V8 scope. 2856 // Enter V8 via an ENTER_V8 scope.
2858 i::Handle<i::Context> env; 2857 i::Handle<i::Context> env;
2859 { 2858 {
2860 ENTER_V8; 2859 ENTER_V8;
2861 #if defined(ANDROID)
2862 // On mobile device, full GC is expensive, leave it to the system to
2863 // decide when should make a full GC.
2864 #else
2865 // Give the heap a chance to cleanup if we've disposed contexts.
2866 i::Heap::CollectAllGarbageIfContextDisposedDeprecated();
2867 #endif
2868 v8::Handle<ObjectTemplate> proxy_template = global_template; 2860 v8::Handle<ObjectTemplate> proxy_template = global_template;
2869 i::Handle<i::FunctionTemplateInfo> proxy_constructor; 2861 i::Handle<i::FunctionTemplateInfo> proxy_constructor;
2870 i::Handle<i::FunctionTemplateInfo> global_constructor; 2862 i::Handle<i::FunctionTemplateInfo> global_constructor;
2871 2863
2872 if (!global_template.IsEmpty()) { 2864 if (!global_template.IsEmpty()) {
2873 // Make sure that the global_template has a constructor. 2865 // Make sure that the global_template has a constructor.
2874 global_constructor = 2866 global_constructor =
2875 EnsureConstructor(Utils::OpenHandle(*global_template)); 2867 EnsureConstructor(Utils::OpenHandle(*global_template));
2876 2868
2877 // Create a fresh template for the global proxy object. 2869 // Create a fresh template for the global proxy object.
(...skipping 1066 matching lines...) Expand 10 before | Expand all | Expand 10 after
3944 3936
3945 3937
3946 char* HandleScopeImplementer::Iterate(ObjectVisitor* v, char* storage) { 3938 char* HandleScopeImplementer::Iterate(ObjectVisitor* v, char* storage) {
3947 HandleScopeImplementer* thread_local = 3939 HandleScopeImplementer* thread_local =
3948 reinterpret_cast<HandleScopeImplementer*>(storage); 3940 reinterpret_cast<HandleScopeImplementer*>(storage);
3949 thread_local->IterateThis(v); 3941 thread_local->IterateThis(v);
3950 return storage + ArchiveSpacePerThread(); 3942 return storage + ArchiveSpacePerThread();
3951 } 3943 }
3952 3944
3953 } } // namespace v8::internal 3945 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/heap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698