replace old SK_TRACE_EVENT macros with new TRACE_EVENT ones

experimental/AndroidPathRenderer/AndroidPathRenderer.cpp

 /*
  * Copyright 2012 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #define LOG_TAG "PathRenderer"
 #define LOG_NDEBUG 1
 #define ATRACE_TAG ATRACE_TAG_GRAPHICS
 
 #define VERTEX_DEBUG 0
 
 #include <SkPath.h>
 #include <SkStrokeRec.h>
 
 #include <stdlib.h>
 #include <stdint.h>
 #include <sys/types.h>
 
 #include <SkTypes.h>
-#include <SkTrace.h>
+#include <SkTraceEvent.h>
 #include <SkMatrix.h>
 #include <SkPoint.h>
 
 #ifdef VERBOSE
 #define ALOGV SkDebugf
 #else
 #define ALOGV(x, ...)
 #endif
 
 #include "AndroidPathRenderer.h"
@@ skipping 482 matching lines @@
 
 #if VERTEX_DEBUG
     for (unsigned int i = 0; i < vertexBuffer.getSize(); i++) {
         SkDebugf("point at %f %f, alpha %f", buffer[i].position[0], buffer[i].position[1], buffer[i].alpha);
     }
 #endif
 }
 
 void PathRenderer::ConvexPathVertices(const SkPath &path, const SkStrokeRec& stroke, bool isAA,
         const SkMatrix* transform, VertexBuffer* vertexBuffer) {
-    SK_TRACE_EVENT0("PathRenderer::convexPathVertices");
+    TRACE_EVENT0("skia", "PathRenderer::convexPathVertices");
 
     SkStrokeRec::Style style = stroke.getStyle();
 
     float inverseScaleX, inverseScaleY;
     computeInverseScales(transform, inverseScaleX, inverseScaleY);
 
     SkTArray<Vertex, true> tempVertices;
     float threshInvScaleX = inverseScaleX;
     float threshInvScaleY = inverseScaleY;
     if (style == SkStrokeRec::kStroke_Style) {
@@ skipping 55 matching lines @@
 
 static void pushToVector(SkTArray<Vertex, true>* vertices, float x, float y) {
     // TODO: make this not yuck
     vertices->push_back();
     Vertex* newVertex = &((*vertices)[vertices->count() - 1]);
     Vertex::set(newVertex, x, y);
 }
 
 bool PathRenderer::ConvexPathPerimeterVertices(const SkPath& path, bool forceClose,
         float sqrInvScaleX, float sqrInvScaleY, SkTArray<Vertex, true>* outputVertices) {
-    SK_TRACE_EVENT0("PathRenderer::convexPathPerimeterVertices");
+    TRACE_EVENT0("skia", "PathRenderer::convexPathPerimeterVertices");
 
 
     // TODO: to support joins other than sharp miter, join vertices should be labelled in the
     // perimeter, or resolved into more vertices. Reconsider forceClose-ing in that case.
     SkPath::Iter iter(path, forceClose);
     SkPoint pts[4];
     SkPath::Verb v;
 
     while (SkPath::kDone_Verb != (v = iter.next(pts))) {
             switch (v) {
@@ skipping 110 matching lines @@
 
         RecursiveQuadraticBezierVertices(ax, ay, mx, my, acx, acy,
                 sqrInvScaleX, sqrInvScaleY, outputVertices);
         RecursiveQuadraticBezierVertices(mx, my, bx, by, bcx, bcy,
                 sqrInvScaleX, sqrInvScaleY, outputVertices);
     }
 }
 
 }; // namespace uirenderer
 }; // namespace android