commit 514b922236aa9308827e50ec32b1ee6102deff60
author senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jan 18 21:53:12 2013 +0000
committer senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jan 18 21:53:12 2013 +0000
tree 9f94a48821cd9749480ab0502f9b2baf7b99a2f1
parent 9ef89ce8b7eb270b37941553099654129f2e0a04

Partial revert of r7287 to green up the bots.

git-svn-id: http://skia.googlecode.com/svn/trunk@7290 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 8390164..0cf3b35 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -1428,8 +1428,6 @@
         if (filteredTexture) {
             grPaint.colorStage(kBitmapTextureIdx)->setEffect(
                 GrSimpleTextureEffect::Create(filteredTexture, SkMatrix::I()))->unref();
-            w = filteredTexture->width();
-            h = filteredTexture->height();
             texture = filteredTexture;
             filteredTexture->unref();
         }
@@ -1493,10 +1491,6 @@
         return;
     }
 
-    const SkBitmap& bm = dev->accessBitmap(false);
-    int w = bm.width();
-    int h = bm.height();
-
     GrTexture* devTex = grPaint.getColorStage(kBitmapTextureIdx).getEffect()->texture(0);
     SkASSERT(NULL != devTex);
 
@@ -1509,12 +1503,14 @@
             grPaint.colorStage(kBitmapTextureIdx)->setEffect(
                 GrSimpleTextureEffect::Create(filteredTexture, SkMatrix::I()))->unref();
             devTex = filteredTexture;
-            w = devTex->width();
-            h = devTex->height();
             filteredTexture->unref();
         }
     }
 
+    const SkBitmap& bm = dev->accessBitmap(false);
+    int w = bm.width();
+    int h = bm.height();
+
     GrRect dstRect = GrRect::MakeXYWH(SkIntToScalar(x),
                                       SkIntToScalar(y),
                                       SkIntToScalar(w),