commit e93393b311ce88a15f64bdde58c05ea874f881f4
author reed <reed@google.com> Tue Jul 26 12:21:10 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jul 26 12:21:10 2016 -0700
tree ba1f70a210cb36774d3f58f12b6829df2de94cf2
parent d1bdd1fcbd308afb9903f39d231742f5c951cf07

don't specialize drawBitmapRect for minirecorder; no longer called by blink

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2183193002

Review-Url: https://codereview.chromium.org/2183193002

include/private/SkMiniRecorder.h

diff --git a/include/private/SkMiniRecorder.h b/include/private/SkMiniRecorder.h
index 2f5612c..6365ebc 100644
--- a/include/private/SkMiniRecorder.h
+++ b/include/private/SkMiniRecorder.h
@@ -20,8 +20,6 @@
     ~SkMiniRecorder();
 
     // Try to record an op.  Returns false on failure.
-    bool drawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst,
-                        const SkPaint*, SkCanvas::SrcRectConstraint);
     bool drawPath(const SkPath&, const SkPaint&);
     bool drawRect(const SkRect&, const SkPaint&);
     bool drawTextBlob(const SkTextBlob*, SkScalar x, SkScalar y, const SkPaint&);
@@ -38,7 +36,6 @@
 private:
     enum class State {
         kEmpty,
-        kDrawBitmapRectFixedSize,
         kDrawPath,
         kDrawRect,
         kDrawTextBlob,
@@ -50,10 +47,9 @@
     struct Max { static const size_t val = A > B ? A : B; };
 
     static const size_t kInlineStorage =
-        Max<sizeof(SkRecords::DrawBitmapRectFixedSize),
         Max<sizeof(SkRecords::DrawPath),
         Max<sizeof(SkRecords::DrawRect),
-            sizeof(SkRecords::DrawTextBlob)>::val>::val>::val;
+            sizeof(SkRecords::DrawTextBlob)>::val>::val;
     SkAlignedSStorage<kInlineStorage> fBuffer;
 };
 

src/core/SkMiniRecorder.cpp

diff --git a/src/core/SkMiniRecorder.cpp b/src/core/SkMiniRecorder.cpp
index ea1866e..a5d676a 100644
--- a/src/core/SkMiniRecorder.cpp
+++ b/src/core/SkMiniRecorder.cpp
@@ -70,20 +70,6 @@
     new (fBuffer.get()) Type{__VA_ARGS__};         \
     return true
 
-bool SkMiniRecorder::drawBitmapRect(const SkBitmap& bm, const SkRect* src, const SkRect& dst,
-                                    const SkPaint* p, SkCanvas::SrcRectConstraint constraint) {
-    SkRect bounds;
-    if (!src) {
-        bm.getBounds(&bounds);
-        src = &bounds;
-    }
-    SkTLazy<SkPaint> defaultPaint;
-    if (!p) {
-        p = defaultPaint.init();
-    }
-    TRY_TO_STORE(DrawBitmapRectFixedSize, *p, bm, *src, dst, constraint);
-}
-
 bool SkMiniRecorder::drawRect(const SkRect& rect, const SkPaint& paint) {
     TRY_TO_STORE(DrawRect, paint, rect);
 }
@@ -111,7 +97,6 @@
         case State::kEmpty:
             once([]{ empty = new SkEmptyPicture; });
             return sk_ref_sp(empty);
-        CASE(DrawBitmapRectFixedSize);
         CASE(DrawPath);
         CASE(DrawRect);
         CASE(DrawTextBlob);
@@ -132,7 +117,6 @@
 
     switch (fState) {
         case State::kEmpty: return;
-        CASE(DrawBitmapRectFixedSize);
         CASE(DrawPath);
         CASE(DrawRect);
         CASE(DrawTextBlob);

src/core/SkRecorder.cpp

diff --git a/src/core/SkRecorder.cpp b/src/core/SkRecorder.cpp
index 76fd3b8..b620b37 100644
--- a/src/core/SkRecorder.cpp
+++ b/src/core/SkRecorder.cpp
@@ -202,7 +202,6 @@
         this->onDrawImageRect(image, src, dst, paint);
     }
 #else
-    TRY_MINIRECORDER(drawBitmapRect, bitmap, src, dst, paint, constraint);
     if (kFast_SrcRectConstraint == constraint) {
         APPEND(DrawBitmapRectFast, this->copy(paint), bitmap, this->copy(src), dst);
         return;