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

src/core/SkBBoxRecord.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 "SkBBoxRecord.h"
 
 void SkBBoxRecord::drawOval(const SkRect& rect, const SkPaint& paint) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::drawOval(rect, paint);
+    this->handleBBox(offset);
+#else
     if (this->transformBounds(rect, &paint)) {
         INHERITED::drawOval(rect, paint);
     }
+#endif
 }
 
 void SkBBoxRecord::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::drawRRect(rrect, paint);
+    this->handleBBox(offset);
+#else
     if (this->transformBounds(rrect.rect(), &paint)) {
         INHERITED::drawRRect(rrect, paint);
     }
+#endif
 }
 
 void SkBBoxRecord::drawRect(const SkRect& rect, const SkPaint& paint) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::drawRect(rect, paint);
+    this->handleBBox(offset);
+#else
     if (this->transformBounds(rect, &paint)) {
         INHERITED::drawRect(rect, paint);
     }
+#endif
 }
 
 void SkBBoxRecord::drawPath(const SkPath& path, const SkPaint& paint) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::drawPath(path, paint);
+    this->handleBBox(offset);
+#else
     if (path.isInverseFillType()) {
         // If path is inverse filled, use the current clip bounds as the
         // path's device-space bounding box.
         SkIRect clipBounds;
         if (this->getClipDeviceBounds(&clipBounds)) {
             this->handleBBox(SkRect::MakeFromIRect(clipBounds));
             INHERITED::drawPath(path, paint);
         }
     } else if (this->transformBounds(path.getBounds(), &paint)) {
         INHERITED::drawPath(path, paint);
     }
+#endif
 }
 
 void SkBBoxRecord::drawPoints(PointMode mode, size_t count, const SkPoint pts[],
                               const SkPaint& paint) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::drawPoints(mode, count, pts, paint);

[Tom Hudson, 2013/05/14 17:00:49]

I like the way this file starts losing special cases, but are we not going to
have to reinstantiate them somewhere?

+    this->handleBBox(offset);
+#else
     SkRect bbox;
     bbox.set(pts, count);
     // Small min width value, just to ensure hairline point bounding boxes aren't empty.
     // Even though we know hairline primitives are drawn one pixel wide, we do not use a
     // minimum of 1 because the playback scale factor is unknown at record time. Later
     // outsets will take care of adding additional padding for antialiasing and rounding out
     // to integer device coordinates, guaranteeing that the rasterized pixels will be included
     // in the computed bounds.
     // Note: The device coordinate outset in SkBBoxHierarchyRecord::handleBBox is currently
     // done in the recording coordinate space, which is wrong.
     // http://code.google.com/p/skia/issues/detail?id=1021
     static const SkScalar kMinWidth = SkFloatToScalar(0.01f);
     SkScalar halfStrokeWidth = SkMaxScalar(paint.getStrokeWidth(), kMinWidth) / 2;
     bbox.outset(halfStrokeWidth, halfStrokeWidth);
     if (this->transformBounds(bbox, &paint)) {
         INHERITED::drawPoints(mode, count, pts, paint);
     }
+#endif
 }
 
 void SkBBoxRecord::drawPaint(const SkPaint& paint) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::drawPaint(paint);
+    this->handleBBox(offset);
+#else
     SkRect bbox;
     if (this->getClipBounds(&bbox)) {
         if (this->transformBounds(bbox, &paint)) {
             INHERITED::drawPaint(paint);
         }
     }
+#endif
 }
 
 void SkBBoxRecord::clear(SkColor color) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::clear(color);
+    this->handleBBox(offset);
+#else
     SkISize size = this->getDeviceSize();
     SkRect bbox = {0, 0, SkIntToScalar(size.width()), SkIntToScalar(size.height())};
     this->handleBBox(bbox);
     INHERITED::clear(color);
+#endif
 }
 
 void SkBBoxRecord::drawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
                             const SkPaint& paint) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::drawText(text, byteLength, x, y, paint);
+    this->handleBBox(offset);
+#else
     SkRect bbox;
     paint.measureText(text, byteLength, &bbox);
     SkPaint::FontMetrics metrics;
     paint.getFontMetrics(&metrics);
 
     // Vertical and aligned text need to be offset
     if (paint.isVerticalText()) {
         SkScalar h = bbox.fBottom - bbox.fTop;
         if (paint.getTextAlign() == SkPaint::kCenter_Align) {
             bbox.fTop    -= h / 2;
@@ skipping 24 matching lines @@
     bbox.fLeft  -= pad;
     bbox.fRight += pad;
 
     bbox.fLeft += x;
     bbox.fRight += x;
     bbox.fTop += y;
     bbox.fBottom += y;
     if (this->transformBounds(bbox, &paint)) {
         INHERITED::drawText(text, byteLength, x, y, paint);
     }
+#endif
 }
 
 void SkBBoxRecord::drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
                               const SkPaint* paint) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::drawBitmap(bitmap, left, top, paint);
+    this->handleBBox(offset);
+#else
     SkRect bbox = {left, top, left + bitmap.width(), top + bitmap.height()};
     if (this->transformBounds(bbox, paint)) {
         INHERITED::drawBitmap(bitmap, left, top, paint);
     }
+#endif
 }
 
 void SkBBoxRecord::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
                                   const SkRect& dst, const SkPaint* paint) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::drawBitmapRectToRect(bitmap, src, dst, paint);
+    this->handleBBox(offset);
+#else
     if (this->transformBounds(dst, paint)) {
         INHERITED::drawBitmapRectToRect(bitmap, src, dst, paint);
     }
+#endif
 }
 
 void SkBBoxRecord::drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& mat,
                                     const SkPaint* paint) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::drawBitmapMatrix(bitmap, mat, paint);
+    this->handleBBox(offset);
+#else
     SkMatrix m = mat;
     SkRect bbox = {0, 0, SkIntToScalar(bitmap.width()), SkIntToScalar(bitmap.height())};
     m.mapRect(&bbox);
     if (this->transformBounds(bbox, paint)) {
         INHERITED::drawBitmapMatrix(bitmap, mat, paint);
     }
+#endif
 }
 
 void SkBBoxRecord::drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
                                   const SkRect& dst, const SkPaint* paint) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::drawBitmapNine(bitmap, center, dst, paint);
+    this->handleBBox(offset);
+#else
     if (this->transformBounds(dst, paint)) {
         INHERITED::drawBitmapNine(bitmap, center, dst, paint);
     }
+#endif
 }
 
 void SkBBoxRecord::drawPosText(const void* text, size_t byteLength,
                                const SkPoint pos[], const SkPaint& paint) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::drawPosText(text, byteLength, pos, paint);
+    this->handleBBox(offset);
+#else
     SkRect bbox;
     bbox.set(pos, paint.countText(text, byteLength));
     SkPaint::FontMetrics metrics;
     paint.getFontMetrics(&metrics);
     bbox.fTop += metrics.fTop;
     bbox.fBottom += metrics.fBottom;
 
     // pad on left and right by half of max vertical glyph extents
     SkScalar pad = (metrics.fTop - metrics.fBottom) / 2;
     bbox.fLeft += pad;
     bbox.fRight -= pad;
 
     if (this->transformBounds(bbox, &paint)) {
         INHERITED::drawPosText(text, byteLength, pos, paint);
     }
+#endif
 }
 
 void SkBBoxRecord::drawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
                                 SkScalar constY, const SkPaint& paint) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::drawPosTextH(text, byteLength, xpos, constY, paint);
+    this->handleBBox(offset);
+#else
     SkRect bbox;
     size_t numChars = paint.countText(text, byteLength);
     if (numChars > 0) {
         bbox.fLeft  = xpos[0];
         bbox.fRight = xpos[numChars - 1];
         // if we had a guarantee that these will be monotonically increasing, this could be sped up
         for (size_t i = 1; i < numChars; ++i) {
             if (xpos[i] < bbox.fLeft) {
                 bbox.fLeft = xpos[i];
             }
             if (xpos[i] > bbox.fRight) {
                 bbox.fRight = xpos[i];
             }
         }
         SkPaint::FontMetrics metrics;
         paint.getFontMetrics(&metrics);
 
         // pad horizontally by max glyph height
         SkScalar pad = (metrics.fTop - metrics.fBottom);
         bbox.fLeft  += pad;
         bbox.fRight -= pad;
 
         bbox.fTop    = metrics.fTop + constY;
         bbox.fBottom = metrics.fBottom + constY;
         if (!this->transformBounds(bbox, &paint)) {
             return;
         }
     }
     INHERITED::drawPosTextH(text, byteLength, xpos, constY, paint);
+#endif
 }
 
 void SkBBoxRecord::drawSprite(const SkBitmap& bitmap, int left, int top,
                               const SkPaint* paint) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::drawSprite(bitmap, left, top, paint);
+    this->handleBBox(offset);
+#else
     SkRect bbox;
     bbox.set(SkIRect::MakeXYWH(left, top, bitmap.width(), bitmap.height()));
     this->handleBBox(bbox); // directly call handleBBox, matrix is ignored
     INHERITED::drawSprite(bitmap, left, top, paint);
+#endif
 }
 
 void SkBBoxRecord::drawTextOnPath(const void* text, size_t byteLength,
                                   const SkPath& path, const SkMatrix* matrix,
                                   const SkPaint& paint) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::drawTextOnPath(text, byteLength, path, matrix, paint);
+    this->handleBBox(offset);
+#else
     SkRect bbox = path.getBounds();
     SkPaint::FontMetrics metrics;
     paint.getFontMetrics(&metrics);
 
     // pad out all sides by the max glyph height above baseline
     SkScalar pad = metrics.fTop;
     bbox.fLeft += pad;
     bbox.fRight -= pad;
     bbox.fTop += pad;
     bbox.fBottom -= pad;
 
     if (this->transformBounds(bbox, &paint)) {
         INHERITED::drawTextOnPath(text, byteLength, path, matrix, paint);
     }
+#endif
 }
 
 void SkBBoxRecord::drawVertices(VertexMode mode, int vertexCount,
                                 const SkPoint vertices[], const SkPoint texs[],
                                 const SkColor colors[], SkXfermode* xfer,
                                 const uint16_t indices[], int indexCount,
                                 const SkPaint& paint) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::drawVertices(mode, vertexCount, vertices, texs,
+                            colors, xfer, indices, indexCount, paint);
+    this->handleBBox(offset);
+#else
     SkRect bbox;
     bbox.set(vertices, vertexCount);
     if (this->transformBounds(bbox, &paint)) {
         INHERITED::drawVertices(mode, vertexCount, vertices, texs,
                                 colors, xfer, indices, indexCount, paint);
     }
+#endif
 }
 
 void SkBBoxRecord::drawPicture(SkPicture& picture) {
+#if SK_RECORD_BOUNDS_IN_PICTURE
+    uint32_t offset = this->writeStream().size();
+    INHERITED::drawPicture(picture);
+    this->handleBBox(offset);
+#else
     if (picture.width() > 0 && picture.height() > 0 &&
         this->transformBounds(SkRect::MakeWH(picture.width(), picture.height()), NULL)) {
         INHERITED::drawPicture(picture);
     }
+#endif
 }
 
 bool SkBBoxRecord::transformBounds(const SkRect& bounds, const SkPaint* paint) {
+#if !(SK_RECORD_BOUNDS_IN_PICTURE)
     SkRect outBounds = bounds;
     outBounds.sort();
 
     if (paint) {
         // account for stroking, path effects, shadows, etc
         if (paint->canComputeFastBounds()) {
             SkRect temp;
             outBounds = paint->computeFastBounds(outBounds, &temp);
         } else {
             // set bounds to current clip
             if (!this->getClipBounds(&outBounds)) {
                 // current clip is empty
                 return false;
             }
         }
     }
 
     if (!outBounds.isEmpty() && !this->quickReject(outBounds)) {
         this->getTotalMatrix().mapRect(&outBounds);
         this->handleBBox(outBounds);
         return true;
     }
-
+#else
+    SkASSERT(0);
+#endif
     return false;
 }