Chromium Code Reviews| Index: third_party/WebKit/Source/platform/heap/GCInfo.h |
| diff --git a/third_party/WebKit/Source/platform/heap/GCInfo.h b/third_party/WebKit/Source/platform/heap/GCInfo.h |
| index 0b6c1bbc6c900b1dd512ff2a95434df326496e5f..5a44554cecbc53f30b48ebbf72e0b5f2b1db3485 100644 |
| --- a/third_party/WebKit/Source/platform/heap/GCInfo.h |
| +++ b/third_party/WebKit/Source/platform/heap/GCInfo.h |
| @@ -121,18 +121,14 @@ extern PLATFORM_EXPORT GCInfo const** s_gcInfoTable; |
| // reachable. There is a GCInfo struct for each class that directly |
| // inherits from GarbageCollected or GarbageCollectedFinalized. |
| struct GCInfo { |
| - using GetClassNameCallback = const String (*)(); |
| - |
| bool hasFinalizer() const { return m_nonTrivialFinalizer; } |
| bool hasVTable() const { return m_hasVTable; } |
| TraceCallback m_trace; |
| FinalizationCallback m_finalize; |
| bool m_nonTrivialFinalizer; |
| bool m_hasVTable; |
| -#if ENABLE(DETAILED_MEMORY_INFRA) |
| - const String className() const { return m_className(); } |
| - GetClassNameCallback m_className; |
| -#endif |
| + const char* className() const { return m_className; } |
|
Primiano Tucci (use gerrit)
2016/02/19 10:04:51
I thought you were removing this completely.
If yo
hajimehoshi
2016/02/19 10:32:03
My understanding was to remove the member variable
|
| + const char* m_className; |
| }; |
| #if ENABLE(ASSERT) |
| @@ -177,9 +173,7 @@ struct GCInfoAtBaseType { |
| FinalizerTrait<T>::finalize, |
| FinalizerTrait<T>::nonTrivialFinalizer, |
| std::is_polymorphic<T>::value, |
| -#if ENABLE(DETAILED_MEMORY_INFRA) |
| - TypenameStringTrait<T>::get |
| -#endif |
| + WTF_HEAP_PROFILER_TYPE_NAME(T), |
| }; |
| static size_t gcInfoIndex = 0; |