Chromium Code Reviews| Index: src/core/SkCanvas.cpp |
| diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp |
| index 2b08a94c85e603a434d35dece267c3ab96bb0498..19ba3346cfbe1e61150b93ea9ce632a9f4f32428 100644 |
| --- a/src/core/SkCanvas.cpp |
| +++ b/src/core/SkCanvas.cpp |
| @@ -22,6 +22,7 @@ |
| #include "SkSmallAllocator.h" |
| #include "SkSurface_Base.h" |
| #include "SkTemplates.h" |
| +#include "SkTextBlob.h" |
| #include "SkTextFormatParams.h" |
| #include "SkTLazy.h" |
| #include "SkUtils.h" |
| @@ -2217,6 +2218,23 @@ void SkCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const SkPat |
| void SkCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, |
| const SkPaint& paint) { |
| + |
| + // FIXME: temporarily disable quickreject for empty bounds, |
| + // pending implicit blob bounds implementation. |
| + if (!blob->bounds().isEmpty() && paint.canComputeFastBounds()) { |
| + SkRect storage; |
| + const SkRect *bounds = &blob->bounds(); |
|
reed1
2014/08/29 16:22:56
Do we need local "bounds" or the if (x || y)?
com
f(malita)
2014/08/29 16:32:01
Only if we want to avoid initializing a "translate
|
| + |
| + if (x || y) { |
| + storage = bounds->makeOffset(x, y); |
| + bounds = &storage; |
| + } |
| + |
| + if (this->quickReject(paint.computeFastBounds(*bounds, &storage))) { |
| + return; |
| + } |
| + } |
| + |
| LOOPER_BEGIN(paint, SkDrawFilter::kText_Type, NULL) |
| while (iter.next()) { |