Adding option in SkPicture to record device-space bounds of draw commands.

src/core/SkCanvas.cpp

 
 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkCanvas.h"
@@ skipping 495 matching lines @@
 
 SkDevice* SkCanvas::init(SkDevice* device) {
     fBounder = NULL;
     fLocalBoundsCompareType.setEmpty();
     fLocalBoundsCompareTypeDirty = true;
     fAllowSoftClip = true;
     fAllowSimplifyClip = false;
     fDeviceCMDirty = false;
     fSaveLayerCount = 0;
     fMetaData = NULL;
+    fQuickRejectEnabled = true;
 
     fMCRec = (MCRec*)fMCStack.push_back();
     new (fMCRec) MCRec(NULL, 0);
 
     fMCRec->fLayer = SkNEW_ARGS(DeviceCM, (NULL, 0, 0, NULL, NULL));
     fMCRec->fTopLayer = fMCRec->fLayer;
     fMCRec->fNext = NULL;
 
     fSurfaceBase = NULL;
 
@@ skipping 837 matching lines @@
         fLocalBoundsCompareType.setEmpty();
     } else {
         fLocalBoundsCompareType.set(SkScalarToCompareType(r.fLeft),
                                     SkScalarToCompareType(r.fTop),
                                     SkScalarToCompareType(r.fRight),
                                     SkScalarToCompareType(r.fBottom));
     }
 }
 
 bool SkCanvas::quickReject(const SkRect& rect) const {
+    if (fQuickRejectEnabled) {
+        if (!rect.isFinite())
+            return true;
 
-    if (!rect.isFinite())
-        return true;
-
-    if (fMCRec->fRasterClip->isEmpty()) {
-        return true;
-    }
-
-    if (fMCRec->fMatrix->hasPerspective()) {
-        SkRect dst;
-        fMCRec->fMatrix->mapRect(&dst, rect);
-        SkIRect idst;
-        dst.roundOut(&idst);
-        return !SkIRect::Intersects(idst, fMCRec->fRasterClip->getBounds());
-    } else {
-        const SkRectCompareType& clipR = this->getLocalClipBoundsCompareType();
-
-        // for speed, do the most likely reject compares first
-        SkScalarCompareType userT = SkScalarToCompareType(rect.fTop);
-        SkScalarCompareType userB = SkScalarToCompareType(rect.fBottom);
-        if (userT >= clipR.fBottom || userB <= clipR.fTop) {
+        if (fMCRec->fRasterClip->isEmpty()) {
             return true;
         }
-        SkScalarCompareType userL = SkScalarToCompareType(rect.fLeft);
-        SkScalarCompareType userR = SkScalarToCompareType(rect.fRight);
-        if (userL >= clipR.fRight || userR <= clipR.fLeft) {
-            return true;
+
+        if (fMCRec->fMatrix->hasPerspective()) {
+            SkRect dst;
+            fMCRec->fMatrix->mapRect(&dst, rect);
+            SkIRect idst;
+            dst.roundOut(&idst);
+            return !SkIRect::Intersects(idst, fMCRec->fRasterClip->getBounds());
+        } else {
+            const SkRectCompareType& clipR = this->getLocalClipBoundsCompareType();
+
+            // for speed, do the most likely reject compares first
+            SkScalarCompareType userT = SkScalarToCompareType(rect.fTop);
+            SkScalarCompareType userB = SkScalarToCompareType(rect.fBottom);
+            if (userT >= clipR.fBottom || userB <= clipR.fTop) {
+                return true;
+            }
+            SkScalarCompareType userL = SkScalarToCompareType(rect.fLeft);
+            SkScalarCompareType userR = SkScalarToCompareType(rect.fRight);
+            if (userL >= clipR.fRight || userR <= clipR.fLeft) {
+                return true;
+            }
+            return false;
         }
+    } else {
+#ifdef SK_DEBUG

[reed1, 2013/05/14 13:31:11]

Hmmm, not sure we always want to assert this. Seems like it would be
valid/interesting to disable quick-reject even if we then draw something that
will eventually get clipped out.

+        // Validate that the decision to skip the test is well founded by
+        // verifying that the test would have returned false.
+        SkCanvas* nonConstThis = const_cast<SkCanvas*>(this);
+        nonConstThis->fQuickRejectEnabled = true;
+        SkASSERT(false == quickReject(rect));
+        nonConstThis->fQuickRejectEnabled = false;
+#endif
         return false;
     }
 }
 
 bool SkCanvas::quickReject(const SkPath& path) const {
     return path.isEmpty() || this->quickReject(path.getBounds());
 }
 
 static inline int pinIntForScalar(int x) {
 #ifdef SK_SCALAR_IS_FIXED
@@ skipping 760 matching lines @@
     return *paint;
 }
 
 const SkRegion& SkCanvas::LayerIter::clip() const { return fImpl->getClip(); }
 int SkCanvas::LayerIter::x() const { return fImpl->getX(); }
 int SkCanvas::LayerIter::y() const { return fImpl->getY(); }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkCanvas::ClipVisitor::~ClipVisitor() { }