Fix up GrAuditTrail to allow arbitrary reordering

tools/skiaserve/Request.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Request.h"
 
 #include "png.h"
@@ skipping 132 matching lines @@
         fprintf(stderr, "Could not create picture from stream.\n");
         return false;
     }
 
     // pour picture into debug canvas
     fDebugCanvas.reset(new SkDebugCanvas(kImageWidth, Request::kImageHeight));
     fDebugCanvas->drawPicture(fPicture);
 
     // for some reason we need to 'flush' the debug canvas by drawing all of the ops
     fDebugCanvas->drawTo(this->getCanvas(), this->getLastOp());
+    this->getCanvas()->flush();
     return true;
 }
 
 GrAuditTrail* Request::getAuditTrail(SkCanvas* canvas) {
     GrAuditTrail* at = nullptr;
 #if SK_SUPPORT_GPU
     GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget();
     if (rt) {
         GrContext* ctx = rt->getContext();
         if (ctx) {
@@ skipping 64 matching lines @@
     SkIRect clip = fDebugCanvas->getCurrentClip();
     Json::Value info(Json::objectValue);
     info["ViewMatrix"] = SkDrawCommand::MakeJsonMatrix(vm);
     info["ClipRect"] = SkDrawCommand::MakeJsonIRect(clip);
 
     std::string json = Json::FastWriter().write(info);
 
     // We don't want the null terminator so strlen is correct
     return SkData::NewWithCopy(json.c_str(), strlen(json.c_str()));
 }