Remove GrTraceMarker and friends

This has been disabled for almost two years.

Bug: skia:
Change-Id: Idc1dbf2220514947d2ccd91968e6e173d44d1b86
Reviewed-on: https://skia-review.googlesource.com/27740
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

3 files changed, 3 insertions, 301 deletions

diff --git a/src/gpu/GrTraceMarker.cpp b/src/gpu/GrTraceMarker.cpp
deleted file mode 100644
index c4d2ad4cef..0000000000
--- a/src/gpu/GrTraceMarker.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrTraceMarker.h"
-#include "GrTracing.h"
-#include "SkString.h"
-#include "SkTSort.h"
-
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-
-GrTraceMarkerSet::GrTraceMarkerSet(const GrTraceMarkerSet& other) {
-   this->addSet(other);
-}
-
-void GrTraceMarkerSet::add(const GrGpuTraceMarker& marker) {
-    this->fMarkerArray.push(marker);
-}
-
-void GrTraceMarkerSet::addSet(const GrTraceMarkerSet& markerSet) {
-    for (Iter iter = markerSet.begin(); iter != markerSet.end(); ++iter) {
-        this->add(*iter);
-    }
-}
-
-void GrTraceMarkerSet::remove(const GrGpuTraceMarker& marker) {
-    SkASSERT(-1 != fMarkerArray.find(marker));
-    int index = this->fMarkerArray.find(marker);
-    this->fMarkerArray.remove(index);
-}
-
-int GrTraceMarkerSet::count() const {
-    return this->fMarkerArray.count();
-}
-
-SkString GrTraceMarkerSet::toStringLast() const {
-    const int numMarkers = this->fMarkerArray.count();
-    SkString marker_string;
-    if (numMarkers > 0) {
-        GrGpuTraceMarker& lastMarker = this->fMarkerArray[numMarkers - 1];
-        marker_string.append(lastMarker.fMarker);
-        if (lastMarker.fID != -1) {
-            marker_string.append("(");
-            marker_string.appendS32(lastMarker.fID);
-            marker_string.append(")");
-        }
-    }
-    return marker_string;
-}
-
-SkString GrTraceMarkerSet::toString() const {
-    SkTQSort<GrGpuTraceMarker>(this->fMarkerArray.begin(), this->fMarkerArray.end() - 1);
-    SkString marker_string;
-    const char* prevMarkerName = "";
-    int prevMarkerID = -1;
-    int counter = 0;
-    const int numMarkers = this->fMarkerArray.count();
-
-    // check used for GrGLGpu device after we've already collapsed all markers
-    if (1 == numMarkers && -1 == this->fMarkerArray[0].fID) {
-        marker_string.append(this->fMarkerArray[0].fMarker);
-        return marker_string;
-    }
-
-    for (int i = 0; i < numMarkers; ++i ) {
-        GrGpuTraceMarker& currMarker = this->fMarkerArray[i];
-        const char* currCmd = currMarker.fMarker;
-        if (currCmd != prevMarkerName) {
-            if (prevMarkerID != -1) {
-                marker_string.append(") ");
-            }
-            marker_string.append(currCmd);
-            if (currMarker.fID != -1) {
-                marker_string.append("(");
-                marker_string.appendS32(currMarker.fID);
-            }
-            prevMarkerName = currCmd;
-        } else if (currMarker.fID != prevMarkerID) {
-            marker_string.append(", ");
-            marker_string.appendS32(currMarker.fID);
-        }
-        prevMarkerID = currMarker.fID;
-        ++counter;
-    }
-    if (counter > 0 && prevMarkerID != -1) {
-        marker_string.append(")");
-    }
-    return marker_string;
-}
-
-GrTraceMarkerSet::Iter GrTraceMarkerSet::begin() const {
-    return Iter(this, 0);
-}
-
-GrTraceMarkerSet::Iter GrTraceMarkerSet::end() const {
-    return Iter(this, this->fMarkerArray.count());
-}
diff --git a/src/gpu/GrTraceMarker.h b/src/gpu/GrTraceMarker.h
deleted file mode 100644
index 037112168b..0000000000
--- a/src/gpu/GrTraceMarker.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkTDArray.h"
-
-#ifndef GrTraceMarkerSet_DEFINED
-#define GrTraceMarkerSet_DEFINED
-
-class GrGpuTraceMarker {
-public:
-    GrGpuTraceMarker(const char* marker, int idCounter) : fMarker(marker), fID(idCounter) {}
-
-    bool operator<(const GrGpuTraceMarker& rhs) const {
-        return this->fMarker < rhs.fMarker || (this->fMarker == rhs.fMarker && this->fID < rhs.fID);
-    }
-
-    bool operator==(const GrGpuTraceMarker& rhs) const {
-        return (this->fID == rhs.fID && this->fMarker == rhs.fMarker);
-    }
-
-    const char* fMarker;
-    int fID;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-class SkString;
-
-class GrTraceMarkerSet {
-public:
-    GrTraceMarkerSet() {}
-
-    GrTraceMarkerSet(const GrTraceMarkerSet& other);
-
-    // Adds marker to the set.
-    void add(const GrGpuTraceMarker& marker);
-    // Adds all markers from one set into this set.
-    void addSet(const GrTraceMarkerSet& markerSet);
-
-    void remove(const GrGpuTraceMarker& marker);
-
-    int count() const;
-
-    /**
-     * First sorts fMarkerArray and returns a string of the format
-     * MarkerName1(#,#,...)%MarkerName2(#,#,...):... where MarkerName is the
-     * marker string used in the TraceMarker and the (#,#,..) is a list of instance
-     * id's for the the given marker string
-     */
-    SkString toString() const;
-
-    SkString toStringLast() const;
-
-    class Iter;
-
-    Iter begin() const;
-
-    Iter end() const;
-
-private:
-    mutable SkTDArray<GrGpuTraceMarker> fMarkerArray;
-};
-
-class GrTraceMarkerSet::Iter {
-public:
-    Iter() {}
-    Iter& operator=(const Iter& i) {
-        fCurrentIndex = i.fCurrentIndex;
-        fMarkers = i.fMarkers;
-        return *this;
-    }
-    bool operator==(const Iter& i) const {
-        return fCurrentIndex == i.fCurrentIndex && fMarkers == i.fMarkers;
-    }
-    bool operator!=(const Iter& i) const { return !(*this == i); }
-    const GrGpuTraceMarker& operator*() const { return fMarkers->fMarkerArray[fCurrentIndex]; }
-    Iter& operator++() {
-        SkASSERT(*this != fMarkers->end());
-        ++fCurrentIndex;
-        return *this;
-    }
-
-private:
-    friend class GrTraceMarkerSet;
-    Iter(const GrTraceMarkerSet* markers, int index)
-            : fMarkers(markers), fCurrentIndex(index) {
-        SkASSERT(markers);
-    }
-
-    const GrTraceMarkerSet* fMarkers;
-    int fCurrentIndex;
-};
-
-#endif
diff --git a/src/gpu/GrTracing.h b/src/gpu/GrTracing.h
index 6a6916ab89..42c4bfc775 100644
--- a/src/gpu/GrTracing.h
+++ b/src/gpu/GrTracing.h
@@ -8,113 +8,15 @@
 #ifndef GrTracing_DEFINED
 #define GrTracing_DEFINED
 
-#include "GrTraceMarker.h"
-#include "SkTLazy.h"
 #include "SkTraceEvent.h"
 
 class GrContext;
 
 /**
- * Marker generation class used for adding and removing markers around code blocks
- */
-class GrGpuTraceMarkerGenerator : public ::SkNoncopyable {
-public:
-    GrGpuTraceMarkerGenerator() {}
-
-    ~GrGpuTraceMarkerGenerator() {
-        if (fTraceMarker.isValid()) {
-            // TODO remove trace marker
-        }
-    }
-
-    void initialize(const char* marker_str, int* marker_counter) {
-        // GrGpuTraceMarker* traceMarker = fTraceMarker.init(marker_str, *marker_counter);
-        // TODO add trace marker
-    }
-
-private:
-    SkTLazy<GrGpuTraceMarker> fTraceMarker;
-};
-
-class GrGpuTraceMarkerGeneratorContext : public ::SkNoncopyable {
-public:
-    GrGpuTraceMarkerGeneratorContext(GrContext* context) {}
-
-    ~GrGpuTraceMarkerGeneratorContext() {
-        if (fTraceMarker.isValid()) {
-            // TODO remove trace marker
-        }
-    }
-
-    void initialize(const char* marker_str, int* marker_counter) {
-        // GrGpuTraceMarker* traceMarker = fTraceMarker.init(marker_str, *marker_counter);
-        // TODO add trace marker
-    }
-
-private:
-    SkTLazy<GrGpuTraceMarker> fTraceMarker;
-};
-
-/**
- * GR_CREATE_TRACE_MARKER will place begin and end trace markers for both
- * cpu and gpu (if gpu tracing enabled) for the current scope.
- * name is of type const char* and target is of type GrOpList*
- */
-#define GR_CREATE_TRACE_MARKER(name, target)                                                       \
-    /* Chromium tracing */                                                                         \
-    static int SK_MACRO_APPEND_LINE(name_counter) = 0;                                             \
-    bool SK_MACRO_APPEND_LINE(gpuTracingEnabled);                                                  \
-    TRACE_EVENT_CATEGORY_GROUP_ENABLED("skia.gpu",                                                 \
-                                       &SK_MACRO_APPEND_LINE(gpuTracingEnabled));                  \
-    if (SK_MACRO_APPEND_LINE(gpuTracingEnabled)) {                                                 \
-        INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED(name, SK_MACRO_APPEND_LINE(name_counter), target)   \
-    }                                                                                              \
-    INTERNAL_TRACE_EVENT_ADD_SCOPED("skia.gpu", name, "id", SK_MACRO_APPEND_LINE(name_counter));
-
-#define INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED(name, name_counter, target)        \
-    static const char* SK_MACRO_APPEND_LINE(static_name) = name;                  \
-    INTERNAL_GR_CREATE_TRACE_MARKER(SK_MACRO_APPEND_LINE(static_name),            \
-                                    name_counter,                                 \
-                                    target)                                       \
-    sk_atomic_inc(&name_counter);
-
-#define INTERNAL_GR_CREATE_TRACE_MARKER(name, name_counter, target, ...)          \
-    GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target)                        \
-
-#define GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target)                    \
-    GrGpuTraceMarkerGenerator SK_MACRO_APPEND_LINE(TMG)(target);                  \
-    SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);                    \
-
-/**
  * Context level GrTracing macros, classname and op are const char*, context is GrContext
- * TODO can we just have one set of macros?  Probably.
  */
-#define GR_CREATE_TRACE_MARKER_CONTEXT(classname, op, context)                                     \
-    /* Chromium tracing */                                                                         \
-    static int SK_MACRO_APPEND_LINE(name_counter) = 0;                                             \
-    bool SK_MACRO_APPEND_LINE(gpuTracingEnabled);                                                  \
-    TRACE_EVENT_CATEGORY_GROUP_ENABLED("skia.gpu",                                                 \
-                                       &SK_MACRO_APPEND_LINE(gpuTracingEnabled));                  \
-    if (SK_MACRO_APPEND_LINE(gpuTracingEnabled)) {                                                 \
-        INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(classname "::" op,                                \
-                                                 SK_MACRO_APPEND_LINE(name_counter), context)      \
-    }                                                                                              \
-    GR_AUDIT_TRAIL_AUTO_FRAME(context->getAuditTrail(), classname "::" op);                        \
-    INTERNAL_TRACE_EVENT_ADD_SCOPED("skia.gpu", classname "::" op,                                 \
-                                    "id", SK_MACRO_APPEND_LINE(name_counter));
-
-#define INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(name, name_counter, context)     \
-    static const char* SK_MACRO_APPEND_LINE(static_name) = name;                  \
-    INTERNAL_GR_CREATE_TRACE_MARKER_C(SK_MACRO_APPEND_LINE(static_name),          \
-                                      name_counter,                               \
-                                      context)                                    \
-    sk_atomic_inc(&name_counter);
-
-#define INTERNAL_GR_CREATE_TRACE_MARKER_C(name, name_counter, context, ...)       \
-    GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context)                     \
-
-#define GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context)                 \
-    GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context);          \
-    SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);                    \
+#define GR_CREATE_TRACE_MARKER_CONTEXT(classname, op, context)               \
+    GR_AUDIT_TRAIL_AUTO_FRAME(context->getAuditTrail(), classname "::" op);  \
+    INTERNAL_TRACE_EVENT_ADD_SCOPED("skia.gpu", classname "::" op);
 
 #endif