From 2ebc10dd12a6fe55fda37a9bd5b1e0c1c1e08232 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 6 Dec 2013 21:43:05 +0000 Subject: Revert "Revert "Revert "PixelRef now returns (nearly) everything that is currently in SkBitmap. The goal is to refactor bitmap later to remove redundancy, and more interestingly, remove the chance for a disconnect between the actual (pixelref) rowbytes and config, and the one claimed by the bitmap.""" This reverts commit 5f035e90d6dea0139a4f204b634e7b7b3b4976d7. Reverting because it breaks chrome/blink due to new SkPixelRef constructor arg. BUG= Review URL: https://codereview.chromium.org/108993002 git-svn-id: http://skia.googlecode.com/svn/trunk@12551 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/core/SkMaskFilter.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/core/SkMaskFilter.cpp') diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp index adfed41098..f062f135fd 100644 --- a/src/core/SkMaskFilter.cpp +++ b/src/core/SkMaskFilter.cpp @@ -349,14 +349,10 @@ bool SkMaskFilter::filterMaskGPU(GrContext* context, if (!result) { return false; } - SkAutoUnref aur(dst); - SkImageInfo info; resultBM->setConfig(srcBM.config(), dst->width(), dst->height()); - if (resultBM->asImageInfo(&info)) { - return false; - } - resultBM->setPixelRef(SkNEW_ARGS(SkGrPixelRef, (info, dst)))->unref(); + resultBM->setPixelRef(SkNEW_ARGS(SkGrPixelRef, (dst)))->unref(); + dst->unref(); return true; } -- cgit v1.2.3