SkDebugCanvas ignore batch bounds if they are offscreen

tools/debugger/SkDebugCanvas.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvasPriv.h"
 #include "SkClipStack.h"
 #include "SkDebugCanvas.h"
 #include "SkDrawCommand.h"
 #include "SkDevice.h"
 #include "SkPaintFilterCanvas.h"
 #include "SkOverdrawMode.h"
 
 #if SK_SUPPORT_GPU
 #include "GrAuditTrail.h"
 #include "GrContext.h"
 #include "GrRenderTarget.h"
+#include "SkGpuDevice.h"
 #endif
 
 #define SKDEBUGCANVAS_VERSION            1
 #define SKDEBUGCANVAS_ATTRIBUTE_VERSION  "version"
 #define SKDEBUGCANVAS_ATTRIBUTE_COMMANDS "commands"
 
 class DebugPaintFilterCanvas : public SkPaintFilterCanvas {
 public:
     DebugPaintFilterCanvas(int width,
                            int height,
@@ skipping 293 matching lines @@
 
     canvas->restoreToCount(saveCount);
 
     if (fPaintFilterCanvas) {
         fPaintFilterCanvas->removeAll();
     }
 
 #if SK_SUPPORT_GPU
     // draw any batches if required and issue a full reset onto GrAuditTrail
     if (at) {
+        // get the render target of the top device so we can ignore batches drawn offscreen
+        SkBaseDevice* bd = canvas->getDevice_just_for_deprecated_compatibility_testing();

[bsalomon, 2016/03/01 14:50:12]

Don't love it but it's the best we have for now. lgtm.

+        SkGpuDevice* gbd = reinterpret_cast<SkGpuDevice*>(bd);
+        uint32_t rtID = gbd->accessRenderTarget()->getUniqueID();
+
+        // get the bounding boxes to draw
         GrAuditTrail::AutoEnable ae(at);
         SkTArray<GrAuditTrail::BatchInfo> childrenBounds;
         at->getBoundsByClientID(&childrenBounds, index);
         SkPaint paint;
         paint.setStyle(SkPaint::kStroke_Style);
         paint.setStrokeWidth(1);
         for (int i = 0; i < childrenBounds.count(); i++) {
+            if (childrenBounds[i].fRenderTargetUniqueID != rtID) {
+                // offscreen draw, ignore for now
+                continue;
+            }
             paint.setColor(SK_ColorBLACK);
             canvas->drawRect(childrenBounds[i].fBounds, paint);
             for (int j = 0; j < childrenBounds[i].fBatches.count(); j++) {
                 const GrAuditTrail::BatchInfo::Batch& batch = childrenBounds[i].fBatches[j];
                 if (batch.fClientID != index) {
                     paint.setColor(SK_ColorBLUE);
                 } else {
                     paint.setColor(SK_ColorRED);
                 }
                 canvas->drawRect(batch.fBounds, paint);
@@ skipping 355 matching lines @@
 }
 
 bool SkDebugCanvas::lastClipStackData(const SkPath& devPath) {
     if (fCalledAddStackData) {
         fClipStackData.appendf("<br>");
         addPathData(devPath, "pathOut");
         return true;
     }
     return false;
 }