SkRecord bug fixes

src/record/SkRecordDraw.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkRecordDraw.h"
 
 namespace {
@@ skipping 58 matching lines @@
 #define CAN_SKIP(T) template <> bool Draw::canSkip(const SkRecords::T& r) const \
     { return fClipEmpty && SkRegion::kIntersect_Op == r.op; }
 CAN_SKIP(ClipPath);
 CAN_SKIP(ClipRRect);
 CAN_SKIP(ClipRect);
 CAN_SKIP(ClipRegion);
 #undef CAN_SKIP
 
 static bool can_skip_text(const SkCanvas& c, const SkPaint& p, SkScalar minY, SkScalar maxY) {
     // If we're drawing vertical text, none of the checks we're about to do make any sense.
-    // We use canComputeFastBounds as a proxy for "is this text going to be rectangular?".
+    // We'll need to call SkPaint::computeFastBounds() later, so bail out if that's not possible.
     if (p.isVerticalText() || !p.canComputeFastBounds()) {
         return false;
     }
 
     // Rather than checking the top and bottom font metrics, we guess.  Actually looking up the top
     // and bottom metrics is slow, and this overapproximation should be good enough.
     const SkScalar buffer = p.getTextSize() * 1.5f;
     SkDEBUGCODE(SkPaint::FontMetrics metrics;)
     SkDEBUGCODE(p.getFontMetrics(&metrics);)
     SkASSERT(-buffer <= metrics.fTop);
     SkASSERT(+buffer >= metrics.fBottom);
-    return c.quickRejectY(minY - buffer, maxY + buffer);
+
+    // Let the paint adjust the text bounds.  We don't care about left and right here, so we use
+    // 0 and 1 respectively just so the bounds rectangle isn't empty.
+    SkRect bounds;
+    bounds.set(0, -buffer, SK_Scalar1, buffer);
+    SkRect adjusted = p.computeFastBounds(bounds, &bounds);
+    return c.quickRejectY(minY + adjusted.fTop, maxY + adjusted.fBottom);
 }
 
 template <> bool Draw::canSkip(const SkRecords::DrawPosTextH& r) const {
     return fClipEmpty || can_skip_text(*fCanvas, r.paint, r.y, r.y);
 }
 
 template <> bool Draw::canSkip(const SkRecords::DrawPosText& r) const {
     if (fClipEmpty) {
         return true;
     }
@@ skipping 55 matching lines @@
     }
 }
 
 }  // namespace
 
 void SkRecordDraw(const SkRecord& record, SkCanvas* canvas) {
     for (Draw draw(canvas); draw.index() < record.count(); draw.next()) {
         record.visit(draw.index(), draw);
     }
 }