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

Side by Side Diff: src/api.cc

Issue 8273037: Merge r9430, r9433, r9508 and 9615 into 3.6 branch. (Closed) Base URL: http://v8.googlecode.com/svn/branches/3.6/
Patch Set: '' Created 9 years, 2 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 | « include/v8-profiler.h ('k') | src/cpu-profiler.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 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 5786 matching lines...) Expand 10 before | Expand all | Expand 10 after
5797 } 5797 }
5798 5798
5799 5799
5800 const HeapGraphNode* HeapGraphNode::GetDominatorNode() const { 5800 const HeapGraphNode* HeapGraphNode::GetDominatorNode() const {
5801 i::Isolate* isolate = i::Isolate::Current(); 5801 i::Isolate* isolate = i::Isolate::Current();
5802 IsDeadCheck(isolate, "v8::HeapSnapshot::GetDominatorNode"); 5802 IsDeadCheck(isolate, "v8::HeapSnapshot::GetDominatorNode");
5803 return reinterpret_cast<const HeapGraphNode*>(ToInternal(this)->dominator()); 5803 return reinterpret_cast<const HeapGraphNode*>(ToInternal(this)->dominator());
5804 } 5804 }
5805 5805
5806 5806
5807 v8::Handle<v8::Value> HeapGraphNode::GetHeapValue() const {
5808 i::Isolate* isolate = i::Isolate::Current();
5809 IsDeadCheck(isolate, "v8::HeapGraphNode::GetHeapValue");
5810 i::Handle<i::HeapObject> object = ToInternal(this)->GetHeapObject();
5811 return v8::Handle<Value>(!object.is_null() ?
5812 ToApi<Value>(object) : ToApi<Value>(
5813 isolate->factory()->undefined_value()));
5814 }
5815
5816
5807 static i::HeapSnapshot* ToInternal(const HeapSnapshot* snapshot) { 5817 static i::HeapSnapshot* ToInternal(const HeapSnapshot* snapshot) {
5808 return const_cast<i::HeapSnapshot*>( 5818 return const_cast<i::HeapSnapshot*>(
5809 reinterpret_cast<const i::HeapSnapshot*>(snapshot)); 5819 reinterpret_cast<const i::HeapSnapshot*>(snapshot));
5810 } 5820 }
5811 5821
5812 5822
5813 void HeapSnapshot::Delete() { 5823 void HeapSnapshot::Delete() {
5814 i::Isolate* isolate = i::Isolate::Current(); 5824 i::Isolate* isolate = i::Isolate::Current();
5815 IsDeadCheck(isolate, "v8::HeapSnapshot::Delete"); 5825 IsDeadCheck(isolate, "v8::HeapSnapshot::Delete");
5816 if (i::HeapProfiler::GetSnapshotsCount() > 1) { 5826 if (i::HeapProfiler::GetSnapshotsCount() > 1) {
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
6076 6086
6077 6087
6078 char* HandleScopeImplementer::Iterate(ObjectVisitor* v, char* storage) { 6088 char* HandleScopeImplementer::Iterate(ObjectVisitor* v, char* storage) {
6079 HandleScopeImplementer* scope_implementer = 6089 HandleScopeImplementer* scope_implementer =
6080 reinterpret_cast<HandleScopeImplementer*>(storage); 6090 reinterpret_cast<HandleScopeImplementer*>(storage);
6081 scope_implementer->IterateThis(v); 6091 scope_implementer->IterateThis(v);
6082 return storage + ArchiveSpacePerThread(); 6092 return storage + ArchiveSpacePerThread();
6083 } 6093 }
6084 6094
6085 } } // namespace v8::internal 6095 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « include/v8-profiler.h ('k') | src/cpu-profiler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698