commit ceb441476e1712861e87a9bb428f119349ef6bb5
author senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Mar 05 20:53:36 2012 +0000
committer senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Mar 05 20:53:36 2012 +0000
tree 4f721fe2d20f1e4484d6618649b2a2eafcc6190e
parent af90f7f142a3939ca34f55b39460688e8eb5dc6b

Fix debug build:  move assertions to GrContext callers, not static callees.

Debug build fix; unreviewed.



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

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 038f953..7ea36da 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -262,7 +262,6 @@
                       int radius,
                       GrSamplerState::Filter filter,
                       GrSamplerState::FilterDirection direction) {
-    ASSERT_OWNED_RESOURCE(texture);
     GrAssert(filter == GrSamplerState::kErode_Filter ||
              filter == GrSamplerState::kDilate_Filter);
 
@@ -287,8 +286,6 @@
               const float* kernel,
               int kernelWidth,
               GrSamplerState::FilterDirection direction) {
-    ASSERT_OWNED_RESOURCE(texture);
-
     GrDrawTarget::AutoStateRestore asr(gpu);
     GrDrawState* drawState = gpu->drawState();
     GrRenderTarget* target = drawState->getRenderTarget();
@@ -2097,6 +2094,7 @@
                                    GrAutoScratchTexture* temp2,
                                    const SkRect& rect,
                                    float sigmaX, float sigmaY) {
+    ASSERT_OWNED_RESOURCE(srcTexture);
     GrRenderTarget* oldRenderTarget = this->getRenderTarget();
     GrClip oldClip = this->getClip();
     GrTexture* origTexture = srcTexture;
@@ -2215,6 +2213,7 @@
                                       GrTexture* temp1, GrTexture* temp2,
                                       GrSamplerState::Filter filter,
                                       SkISize radius) {
+    ASSERT_OWNED_RESOURCE(srcTexture);
     GrRenderTarget* oldRenderTarget = this->getRenderTarget();
     GrAutoMatrix avm(this, GrMatrix::I());
     GrClip oldClip = this->getClip();