commit c240e719b2bebd3711ade4e6fe056921aa7b0521
author reed <reed@chromium.org> Sat May 23 12:26:41 2015 -0700
committer Commit bot <commit-bot@chromium.org> Sat May 23 12:26:41 2015 -0700
tree e16d5f179eb9305398774ead2eb8203f9e5e675a
parent c33db93d1b285923b5deef97ecb04d4d01e05dd5

remove bitmaps entirely from sprite blits (as source)

BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/1156713004

src/core/SkBlitter_Sprite.cpp

diff --git a/src/core/SkBlitter_Sprite.cpp b/src/core/SkBlitter_Sprite.cpp
index ab70222..46cd0a8 100644
--- a/src/core/SkBlitter_Sprite.cpp
+++ b/src/core/SkBlitter_Sprite.cpp
@@ -8,21 +8,13 @@
 #include "SkSmallAllocator.h"
 #include "SkSpriteBlitter.h"
 
-SkSpriteBlitter::SkSpriteBlitter(const SkBitmap& source) : fSource(NULL) {
-    if (source.requestLock(&fUnlocker)) {
-        fSource = &fUnlocker.pixmap();
-    }
-}
+SkSpriteBlitter::SkSpriteBlitter(const SkPixmap& source) : fSource(source) {}
 
-bool SkSpriteBlitter::setup(const SkBitmap& device, int left, int top, const SkPaint& paint) {
-    if (NULL == fSource) {
-        return false;
-    }
+void SkSpriteBlitter::setup(const SkBitmap& device, int left, int top, const SkPaint& paint) {
     fDevice = &device;
     fLeft = left;
     fTop = top;
     fPaint = &paint;
-    return true;
 }
 
 #ifdef SK_DEBUG
@@ -49,7 +41,7 @@
 // returning null means the caller will call SkBlitter::Choose() and
 // have wrapped the source bitmap inside a shader
 SkBlitter* SkBlitter::ChooseSprite(const SkBitmap& device, const SkPaint& paint,
-        const SkBitmap& source, int left, int top, SkTBlitterAllocator* allocator) {
+        const SkPixmap& source, int left, int top, SkTBlitterAllocator* allocator) {
     /*  We currently ignore antialiasing and filtertype, meaning we will take our
         special blitters regardless of these settings. Ignoring filtertype seems fine
         since by definition there is no scale in the matrix. Ignoring antialiasing is
@@ -76,11 +68,7 @@
     }
 
     if (blitter) {
-        if (!blitter->setup(device, left, top, paint)) {
-            // blitter was allocated by allocator, so we have to manually call its destructor
-            blitter->~SkSpriteBlitter();
-            blitter = NULL;
-        }
+        blitter->setup(device, left, top, paint);
     }
     return blitter;
 }