Revision: 7126
Author: [email protected]
Date: Thu Mar 10 04:22:59 2011
Log: A follow-up to r7125: fix a couple of remaining comments.
Review URL: http://codereview.chromium.org/6626043/
http://code.google.com/p/v8/source/detail?r=7126
Modified:
/branches/bleeding_edge/src/heap-profiler.cc
/branches/bleeding_edge/src/profile-generator.cc
/branches/bleeding_edge/src/profile-generator.h
=======================================
--- /branches/bleeding_edge/src/heap-profiler.cc Thu Mar 10 04:05:31 2011
+++ /branches/bleeding_edge/src/heap-profiler.cc Thu Mar 10 04:22:59 2011
@@ -367,6 +367,7 @@
void HeapProfiler::DefineWrapperClass(
uint16_t class_id, v8::HeapProfiler::WrapperInfoCallback callback) {
ASSERT(singleton_ != NULL);
+ ASSERT(class_id != v8::HeapProfiler::kPersistentHandleNoClassId);
if (singleton_->wrapper_callbacks_.length() <= class_id) {
singleton_->wrapper_callbacks_.AddBlock(
NULL, class_id - singleton_->wrapper_callbacks_.length() + 1);
=======================================
--- /branches/bleeding_edge/src/profile-generator.cc Thu Mar 10 04:05:31
2011
+++ /branches/bleeding_edge/src/profile-generator.cc Thu Mar 10 04:22:59
2011
@@ -1226,7 +1226,7 @@
uid_(uid),
root_entry_(NULL),
gc_roots_entry_(NULL),
- dom_subtrees_root_entry_(NULL),
+ natives_root_entry_(NULL),
raw_entries_(NULL),
entries_sorted_(false),
retaining_paths_(HeapEntry::Match) {
@@ -1303,8 +1303,8 @@
HeapEntry* HeapSnapshot::AddNativesRootEntry(int children_count,
int retainers_count) {
- ASSERT(dom_subtrees_root_entry_ == NULL);
- return (dom_subtrees_root_entry_ = AddEntry(
+ ASSERT(natives_root_entry_ == NULL);
+ return (natives_root_entry_ = AddEntry(
HeapEntry::kObject,
"(Native objects)",
HeapObjectsMap::kNativesRootObjectId,
@@ -2338,7 +2338,7 @@
ASSERT(child_entry != NULL);
filler_->SetIndexedAutoIndexReference(
HeapGraphEdge::kElement,
- kNativesRootObject, snapshot_->dom_subtrees_root(),
+ kNativesRootObject, snapshot_->natives_root(),
info, child_entry);
}
@@ -2363,7 +2363,7 @@
filler_->SetIndexedAutoIndexReference(
HeapGraphEdge::kElement,
V8HeapExplorer::kInternalRootObject, snapshot_->root(),
- kNativesRootObject, snapshot_->dom_subtrees_root());
+ kNativesRootObject, snapshot_->natives_root());
}
=======================================
--- /branches/bleeding_edge/src/profile-generator.h Thu Mar 10 04:05:31 2011
+++ /branches/bleeding_edge/src/profile-generator.h Thu Mar 10 04:22:59 2011
@@ -680,7 +680,7 @@
unsigned uid() { return uid_; }
HeapEntry* root() { return root_entry_; }
HeapEntry* gc_roots() { return gc_roots_entry_; }
- HeapEntry* dom_subtrees_root() { return dom_subtrees_root_entry_; }
+ HeapEntry* natives_root() { return natives_root_entry_; }
List<HeapEntry*>* entries() { return &entries_; }
void AllocateEntries(
@@ -715,7 +715,7 @@
unsigned uid_;
HeapEntry* root_entry_;
HeapEntry* gc_roots_entry_;
- HeapEntry* dom_subtrees_root_entry_;
+ HeapEntry* natives_root_entry_;
char* raw_entries_;
List<HeapEntry*> entries_;
bool entries_sorted_;
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
