commit edf3dc094b0fc55bfc932539da1127484051b474
author Derek Sollenberger <djsollen@google.com> Wed Aug 16 10:35:28 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Aug 16 15:37:51 2017 +0000
tree 4c1151831ba4b79928d0088c7db17277fab15e5e
parent 683d84baed9e6b453f6660c1a21e0fe5dc35e7bb

Cleanup tracing macros for use by the Android framework

Change-Id: I1b918cc55a5faba1e5c1e02ffeda5d5713866edd
Reviewed-on: https://skia-review.googlesource.com/35282
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 66e1faf..6edaff9 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -2656,7 +2656,9 @@
 }
 
 void SkCanvas::drawDrawable(SkDrawable* dr, SkScalar x, SkScalar y) {
+#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
     TRACE_EVENT0("skia", TRACE_FUNC);
+#endif
     RETURN_ON_NULL(dr);
     if (x || y) {
         SkMatrix matrix = SkMatrix::MakeTrans(x, y);
@@ -2667,7 +2669,9 @@
 }
 
 void SkCanvas::drawDrawable(SkDrawable* dr, const SkMatrix* matrix) {
+#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
     TRACE_EVENT0("skia", TRACE_FUNC);
+#endif
     RETURN_ON_NULL(dr);
     if (matrix && matrix->isIdentity()) {
         matrix = nullptr;