Quick-reject draw text blob calls.

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"
 #include "SkCanvasPriv.h"
@@ skipping 2202 matching lines @@
                                      matrix, looper.paint());
     }
 
     LOOPER_END
 }
 
 void SkCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
                               const SkPaint& paint) {
     SkASSERT(blob);
 
-    // FIXME: dispatch to the device instead
-
     if (x || y) {
         this->translate(x, y);
     }
 
-    SkPaint runPaint = paint;
-    SkTextBlob::RunIterator it(blob);
-    while (!it.done()) {
-        size_t textLen = it.glyphCount() * sizeof(uint16_t);
-        const SkPoint& offset = it.offset();
-        // applyFontToPaint() always overwrites the exact same attributes,
-        // so it is safe to not re-seed the paint.
-        it.applyFontToPaint(&runPaint);
+    if (!this->quickReject(blob->bounds())) {
+        // FIXME: dispatch to the device instead

[reed1, 2014/08/27 17:16:22]

I don't think the device needs to do this.

However, I think we do need to invoke the paint in the rejecting process (e.g.
computeFastBounds). See other sites like path.

[robertphillips, 2014/08/27 17:25:30]

The GPU device wants this.

[f(malita), 2014/08/27 17:55:44]

Done.

 
-        switch (it.positioning()) {
-        case SkTextBlob::kDefault_Positioning:
-            this->drawText(it.glyphs(), textLen, offset.x(), offset.y(), runPaint);
-            break;
-        case SkTextBlob::kHorizontal_Positioning:
-            this->drawPosTextH(it.glyphs(), textLen, it.pos(), offset.y(), runPaint);
-            break;
-        case SkTextBlob::kFull_Positioning:
-            this->drawPosText(it.glyphs(), textLen, (const SkPoint*)it.pos(), runPaint);
-            break;
-        default:
-            SkFAIL("unhandled positioning mode");
+        SkPaint runPaint = paint;
+        SkTextBlob::RunIterator it(blob);
+        while (!it.done()) {
+            size_t textLen = it.glyphCount() * sizeof(uint16_t);
+            const SkPoint& offset = it.offset();
+            // applyFontToPaint() always overwrites the exact same attributes,
+            // so it is safe to not re-seed the paint.
+            it.applyFontToPaint(&runPaint);
+
+            switch (it.positioning()) {
+            case SkTextBlob::kDefault_Positioning:
+                this->drawText(it.glyphs(), textLen, offset.x(), offset.y(), runPaint);
+                break;
+            case SkTextBlob::kHorizontal_Positioning:
+                this->drawPosTextH(it.glyphs(), textLen, it.pos(), offset.y(), runPaint);
+                break;
+            case SkTextBlob::kFull_Positioning:
+                this->drawPosText(it.glyphs(), textLen, (const SkPoint*)it.pos(), runPaint);
+                break;
+            default:
+                SkFAIL("unhandled positioning mode");
+            }
+
+            it.next();
         }
-
-        it.next();
     }
 
     if (x || y) {
         this->translate(-x, -y);
     }
 }
 
 // These will become non-virtual, so they always call the (virtual) onDraw... method
 void SkCanvas::drawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
                         const SkPaint& paint) {
@@ skipping 331 matching lines @@
     }
 
     if (NULL != matrix) {
         canvas->concat(*matrix);
     }
 }
 
 SkAutoCanvasMatrixPaint::~SkAutoCanvasMatrixPaint() {
     fCanvas->restoreToCount(fSaveCount);
 }