Modify gpu debug markers to store gpu device markers when a flush occurs.

src/gpu/GrTraceMarker.cpp

 
 /*
  * 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"
 
 ////////////////////////////////////////////////////////////////////////////////
 
-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;
-};
-
 ////////////////////////////////////////////////////////////////////////////////
 
 GrTraceMarkerSet::GrTraceMarkerSet(const GrTraceMarkerSet& other) {
    this->addSet(other);
 }
 
 void GrTraceMarkerSet::add(const GrGpuTraceMarker& marker) {
     this->fMarkerArray.push(marker);
 }
 
@@ skipping 51 matching lines @@
     return marker_string;
 }
 
 GrTraceMarkerSet::Iter GrTraceMarkerSet::begin() const {
     return Iter(this, 0);
 }
 
 GrTraceMarkerSet::Iter GrTraceMarkerSet::end() const {
     return Iter(this, this->fMarkerArray.count());
 }
+