| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2014 Google Inc. | 3 * Copyright 2014 Google Inc. |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 #include "SkTDArray.h" | 9 #include "SkTDArray.h" |
| 10 | 10 |
| 11 #ifndef GrTraceMarkerSet_DEFINED | 11 #ifndef GrTraceMarkerSet_DEFINED |
| 12 #define GrTraceMarkerSet_DEFINED | 12 #define GrTraceMarkerSet_DEFINED |
| 13 | 13 |
| 14 class GrGpuTraceMarker { | 14 class GrGpuTraceMarker { |
| 15 public: | 15 public: |
| 16 GrGpuTraceMarker() {}; | |
| 17 GrGpuTraceMarker(const char* marker, int idCounter) : fMarker(marker), fID(i
dCounter) {} | 16 GrGpuTraceMarker(const char* marker, int idCounter) : fMarker(marker), fID(i
dCounter) {} |
| 18 | 17 |
| 19 bool operator<(const GrGpuTraceMarker& rhs) const { | 18 bool operator<(const GrGpuTraceMarker& rhs) const { |
| 20 return this->fMarker < rhs.fMarker || (this->fMarker == rhs.fMarker && t
his->fID < rhs.fID); | 19 return this->fMarker < rhs.fMarker || (this->fMarker == rhs.fMarker && t
his->fID < rhs.fID); |
| 21 } | 20 } |
| 22 | 21 |
| 23 bool operator==(const GrGpuTraceMarker& rhs) const { | 22 bool operator==(const GrGpuTraceMarker& rhs) const { |
| 24 return (this->fID == rhs.fID && this->fMarker == rhs.fMarker); | 23 return (this->fID == rhs.fID && this->fMarker == rhs.fMarker); |
| 25 } | 24 } |
| 26 | 25 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 Iter(const GrTraceMarkerSet* markers, int index) | 90 Iter(const GrTraceMarkerSet* markers, int index) |
| 92 : fMarkers(markers), fCurrentIndex(index) { | 91 : fMarkers(markers), fCurrentIndex(index) { |
| 93 SkASSERT(markers); | 92 SkASSERT(markers); |
| 94 } | 93 } |
| 95 | 94 |
| 96 const GrTraceMarkerSet* fMarkers; | 95 const GrTraceMarkerSet* fMarkers; |
| 97 int fCurrentIndex; | 96 int fCurrentIndex; |
| 98 }; | 97 }; |
| 99 | 98 |
| 100 #endif | 99 #endif |
| OLD | NEW |