commit 10df05742759ad742a6ee703089922d6e9b25f73
author sigbjornf@opera.com <sigbjornf@opera.com> Sat Aug 15 12:28:21 2015
committer sigbjornf@opera.com <sigbjornf@opera.com> Sat Aug 15 12:28:21 2015
tree 7969dea599e494479e1e9203189b83b6f02374dc
parent e15fc774756d42dd272ed92d1603af9831996137

Conditionally bail out earlier in Heap::reportMemoryUsageForTracing()

R=haraken
BUG=474470

Review URL: https://codereview.chromium.org/1301463002

git-svn-id: svn://svn.chromium.org/blink/trunk@200608 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/platform/heap/Heap.cpp

diff --git a/third_party/WebKit/Source/platform/heap/Heap.cpp b/third_party/WebKit/Source/platform/heap/Heap.cpp
index ef9249c..665b546 100644
--- a/third_party/WebKit/Source/platform/heap/Heap.cpp
+++ b/third_party/WebKit/Source/platform/heap/Heap.cpp
@@ -2400,6 +2400,11 @@
 
 void Heap::reportMemoryUsageForTracing()
 {
+    bool gcTracingEnabled;
+    TRACE_EVENT_CATEGORY_GROUP_ENABLED("blink_gc", &gcTracingEnabled);
+    if (!gcTracingEnabled)
+        return;
+
     // These values are divided by 1024 to avoid overflow in practical cases (TRACE_COUNTER values are 32-bit ints).
     // They are capped to INT_MAX just in case.
     TRACE_COUNTER1("blink_gc", "Heap::allocatedObjectSizeKB", std::min(Heap::allocatedObjectSize() / 1024, static_cast<size_t>(INT_MAX)));