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

src/gpu/GrInOrderDrawBuffer.cpp

Index: src/gpu/GrInOrderDrawBuffer.cpp
diff --git a/src/gpu/GrInOrderDrawBuffer.cpp b/src/gpu/GrInOrderDrawBuffer.cpp
index 801d163e5de2d318272a596da522922caed1c9fd..6a503bbfd582ecc6af5d9bfd2b35e8ee2bb7e103 100644
--- a/src/gpu/GrInOrderDrawBuffer.cpp
+++ b/src/gpu/GrInOrderDrawBuffer.cpp
@@ -591,6 +591,7 @@ void GrInOrderDrawBuffer::flush() {
     int currCopySurface = 0;
     int currCmdMarker   = 0;
 
+    fDstGpu->saveActiveTraceMarkers();
     for (int c = 0; c < numCmds; ++c) {
         GrGpuTraceMarker newMarker("", -1);
         if (cmd_has_trace_marker(fCmds[c])) {
@@ -666,6 +667,7 @@ void GrInOrderDrawBuffer::flush() {
             fDstGpu->removeGpuTraceMarker(&newMarker);
         }
     }
+    fDstGpu->restoreActiveTraceMarkers();
     // we should have consumed all the states, clips, etc.
     SkASSERT(fStates.count() == currState);
     SkASSERT(fClips.count() == currClip);