aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2014-12-03 08:48:57 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2014-12-03 08:48:57 -0800
commit4bfd58723b6efca37077f05c1ab92a3e85f97eb4 (patch)
treee92ac02ce9929ad7e85784eb5b9ff99bc54c7b1d /src
parent43c79b9c64d517b5f74429e13d1057e9f7d7f0a2 (diff)
Decompose a weird assert.
I got my hands on a list of new warnings coming out of MSVC when run with /analyze. I scanned over them and didn't see any bugs, but I did notice this is just a weird way to write this expression. (MSVC /analyze was wary of '=' in a boolean expression.) BUG=skia: Review URL: https://codereview.chromium.org/776033002
Diffstat (limited to 'src')
-rw-r--r--src/utils/SkTextureCompressor_Blitter.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/utils/SkTextureCompressor_Blitter.h b/src/utils/SkTextureCompressor_Blitter.h
index 3d305017e2..0c26a7a7eb 100644
--- a/src/utils/SkTextureCompressor_Blitter.h
+++ b/src/utils/SkTextureCompressor_Blitter.h
@@ -309,7 +309,8 @@ public:
virtual void blitMask(const SkMask& mask, const SkIRect& clip) SK_OVERRIDE {
// Assumptions:
- SkASSERT(!fBlitMaskCalled && (fBlitMaskCalled = true));
+ SkASSERT(!fBlitMaskCalled);
+ SkDEBUGCODE(fBlitMaskCalled = true);
SkASSERT(SkMask::kA8_Format == mask.fFormat);
SkASSERT(mask.fBounds.contains(clip));