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

Unified Diff: base/trace_event/heap_profiler_type_name_deduplicator.cc

Issue 1846333002: Revert of [tracing] Adding task information to heap profiler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
Index: base/trace_event/heap_profiler_type_name_deduplicator.cc
diff --git a/base/trace_event/heap_profiler_type_name_deduplicator.cc b/base/trace_event/heap_profiler_type_name_deduplicator.cc
index 055f86abf0adc15b5305659c94dc6866a192105a..e7f57c8ae0ebd853404eb3bfd2da792d8547b05a 100644
--- a/base/trace_event/heap_profiler_type_name_deduplicator.cc
+++ b/base/trace_event/heap_profiler_type_name_deduplicator.cc
@@ -15,33 +15,6 @@
namespace base {
namespace trace_event {
-
-namespace {
-
-// Extract directory name if |type_name| was file name. Otherwise, return
-// |type_name|.
-StringPiece ExtractDirNameFromFileName(const char* type_name) {
- StringPiece result(type_name);
- size_t last_seperator = result.find_last_of("\\/");
-
- // If |type_name| was a not a file path, the seperator will not be found, so
- // the whole type name is returned.
- if (last_seperator == StringPiece::npos)
- return result;
-
- // Remove the file name from the path.
- result.remove_suffix(result.length() - last_seperator);
-
- // Remove the parent directory references.
- const char kParentDirectory[] = "..";
- const size_t kParentDirectoryLength = 3; // '../' or '..\'.
- while (result.starts_with(kParentDirectory)) {
- result.remove_prefix(kParentDirectoryLength);
- }
- return result;
-}
-
-} // namespace
TypeNameDeduplicator::TypeNameDeduplicator() {
// A null pointer has type ID 0 ("unknown type");
@@ -80,13 +53,9 @@
// a dictionary.
SStringPrintf(&buffer, ",\"%d\":", it->second);
- // TODO(ssid): crbug.com/594803 the type name is misused for file name in
- // some cases.
- StringPiece type_info = ExtractDirNameFromFileName(it->first);
-
// |EscapeJSONString| appends, it does not overwrite |buffer|.
bool put_in_quotes = true;
- EscapeJSONString(type_info, put_in_quotes, &buffer);
+ EscapeJSONString(it->first, put_in_quotes, &buffer);
out->append(buffer);
}

Powered by Google App Engine
This is Rietveld 408576698