| 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 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 int count() const; | 48 int count() const; |
| 49 | 49 |
| 50 /** | 50 /** |
| 51 * First sorts fMarkerArray and returns a string of the format | 51 * First sorts fMarkerArray and returns a string of the format |
| 52 * MarkerName1(#,#,...)%MarkerName2(#,#,...):... where MarkerName is the | 52 * MarkerName1(#,#,...)%MarkerName2(#,#,...):... where MarkerName is the |
| 53 * marker string used in the TraceMarker and the (#,#,..) is a list of insta
nce | 53 * marker string used in the TraceMarker and the (#,#,..) is a list of insta
nce |
| 54 * id's for the the given marker string | 54 * id's for the the given marker string |
| 55 */ | 55 */ |
| 56 SkString toString() const; | 56 SkString toString() const; |
| 57 | 57 |
| 58 SkString toStringLast() const; |
| 59 |
| 58 class Iter; | 60 class Iter; |
| 59 | 61 |
| 60 Iter begin() const; | 62 Iter begin() const; |
| 61 | 63 |
| 62 Iter end() const; | 64 Iter end() const; |
| 63 | 65 |
| 64 private: | 66 private: |
| 65 mutable SkTDArray<GrGpuTraceMarker> fMarkerArray; | 67 mutable SkTDArray<GrGpuTraceMarker> fMarkerArray; |
| 66 }; | 68 }; |
| 67 | 69 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 89 Iter(const GrTraceMarkerSet* markers, int index) | 91 Iter(const GrTraceMarkerSet* markers, int index) |
| 90 : fMarkers(markers), fCurrentIndex(index) { | 92 : fMarkers(markers), fCurrentIndex(index) { |
| 91 SkASSERT(markers); | 93 SkASSERT(markers); |
| 92 } | 94 } |
| 93 | 95 |
| 94 const GrTraceMarkerSet* fMarkers; | 96 const GrTraceMarkerSet* fMarkers; |
| 95 int fCurrentIndex; | 97 int fCurrentIndex; |
| 96 }; | 98 }; |
| 97 | 99 |
| 98 #endif | 100 #endif |
| OLD | NEW |