From 9f7300043b34d8782ba7bca41b4f4b8d4af49397 Mon Sep 17 00:00:00 2001 From: "alph@chromium.org" Date: Fri, 15 Mar 2013 13:07:39 +0000 Subject: [PATCH] Remove kContext node type introduced in r13936 It has been decided not to pollute node types with extra values. Review URL: https://codereview.chromium.org//12833005 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13959 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- include/v8-profiler.h | 3 +-- src/heap-snapshot-generator.cc | 6 ++---- src/heap-snapshot-generator.h | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/v8-profiler.h b/include/v8-profiler.h index 32a35fd..90a3d4d 100644 --- a/include/v8-profiler.h +++ b/include/v8-profiler.h @@ -254,9 +254,8 @@ class V8EXPORT HeapGraphNode { kRegExp = 6, // RegExp. kHeapNumber = 7, // Number stored in the heap. kNative = 8, // Native object (not from V8 heap). - kSynthetic = 9, // Synthetic object, usualy used for grouping + kSynthetic = 9 // Synthetic object, usualy used for grouping // snapshot items together. - kContext = 10 // Context }; /** Returns node type (see HeapGraphNode::Type). */ diff --git a/src/heap-snapshot-generator.cc b/src/heap-snapshot-generator.cc index cdd5a07..824e507 100644 --- a/src/heap-snapshot-generator.cc +++ b/src/heap-snapshot-generator.cc @@ -174,7 +174,6 @@ const char* HeapEntry::TypeAsString() { case kHeapNumber: return "/number/"; case kNative: return "/native/"; case kSynthetic: return "/synthetic/"; - case kContext: return "/context/"; default: return "???"; } } @@ -827,7 +826,7 @@ HeapEntry* V8HeapExplorer::AddEntry(HeapObject* object) { } else if (object->IsNativeContext()) { return AddEntry(object, HeapEntry::kHidden, "system / NativeContext"); } else if (object->IsContext()) { - return AddEntry(object, HeapEntry::kContext, "system / Context"); + return AddEntry(object, HeapEntry::kObject, "system / Context"); } else if (object->IsFixedArray() || object->IsFixedDoubleArray() || object->IsByteArray() || @@ -2580,8 +2579,7 @@ void HeapSnapshotJSONSerializer::SerializeSnapshot() { JSON_S("regexp") "," JSON_S("number") "," JSON_S("native") "," - JSON_S("synthetic") "," - JSON_S("context")) "," + JSON_S("synthetic")) "," JSON_S("string") "," JSON_S("number") "," JSON_S("number") "," diff --git a/src/heap-snapshot-generator.h b/src/heap-snapshot-generator.h index c952381..08c2fe7 100644 --- a/src/heap-snapshot-generator.h +++ b/src/heap-snapshot-generator.h @@ -98,8 +98,7 @@ class HeapEntry BASE_EMBEDDED { kRegExp = v8::HeapGraphNode::kRegExp, kHeapNumber = v8::HeapGraphNode::kHeapNumber, kNative = v8::HeapGraphNode::kNative, - kSynthetic = v8::HeapGraphNode::kSynthetic, - kContext = v8::HeapGraphNode::kContext + kSynthetic = v8::HeapGraphNode::kSynthetic }; static const int kNoEntry; -- 2.7.4