Pre-crop filled rects to avoid scissor

include/gpu/GrDrawContext.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrDrawContext_DEFINED
 #define GrDrawContext_DEFINED
 
@@ skipping 304 matching lines @@
     friend class GrMSAAPathRenderer;             // for access to drawBatch
     friend class GrStencilAndCoverPathRenderer;  // for access to drawBatch
     friend class GrTessellatingPathRenderer;     // for access to drawBatch
 
     bool drawFilledDRRect(const GrClip& clip,
                           const GrPaint& paint,
                           const SkMatrix& viewMatrix,
                           const SkRRect& origOuter,
                           const SkRRect& origInner);
 
-    GrDrawBatch* getFillRectBatch(const GrPaint& paint,
-                                  const SkMatrix& viewMatrix,
-                                  const SkRect& rect,
-                                  bool* useHWAA);
+    // Returns false if the draw should be skipped entirely.
+    bool getFillRectBatch(const GrClip& clip,
+                          const GrPaint& paint,
+                          const SkMatrix& viewMatrix,
+                          const SkRect& rect,
+                          SkAutoTUnref<GrDrawBatch>* batch,

[csmartdalton, 2016/07/08 21:20:45]

I'm not sure I like this approach. Would it be better to return a batch, and set
a bool pointer-parameter that says whether to skip the draw?

[robertphillips, 2016/07/08 22:39:48]

If you update to ToT this call should be replaced with a drawFillRect entry
point. You should just be able to skip the draw in there.

[csmartdalton, 2016/07/11 03:17:56]

Done. Much better!

+                          bool* useHWAA);
 
     void internalDrawPath(const GrClip& clip,
                           const GrPaint& paint,
                           const SkMatrix& viewMatrix,
                           const SkPath& path,
                           const GrStyle& style);
 
     // This entry point allows the GrTextContext-derived classes to add their batches to
     // the drawTarget.
     void drawBatch(const GrPipelineBuilder& pipelineBuilder, const GrClip&, GrDrawBatch* batch);
@@ skipping 11 matching lines @@
     GrInstancedPipelineInfo           fInstancedPipelineInfo;
 
     SkSurfaceProps                    fSurfaceProps;
     GrAuditTrail*                     fAuditTrail;
 
     // In debug builds we guard against improper thread handling
     SkDEBUGCODE(mutable GrSingleOwner* fSingleOwner;)
 };
 
 #endif