AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hide bitmap rowbyes assert when LEGACY_ONLOCKPIXELS

Browse Source 
Motivation:  without this, we break Blink.

BUG=skia:

NOTREECHECKS=true
NOTRY=true
R=robertphillips@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13107 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-01-16 15:47:06 +00:00
parent 3aa7a02b65
commit f7ba41321b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/SkBitmap.cpp
View File

@ -1601,12 +1601,16 @@ void SkBitmap::validate() const {
SkASSERT(fPixelRef);
SkASSERT(fPixelLockCount > 0);
SkASSERT(fPixelRef->isLocked());
#if !defined(SK_SUPPORT_LEGACY_ONLOCKPIXELS)
SkASSERT(fPixelRef->rowBytes() == fRowBytes);
#endif
SkASSERT(fPixelRefOrigin.fX >= 0);
SkASSERT(fPixelRefOrigin.fY >= 0);
SkASSERT(fPixelRef->info().fWidth >= (int)fWidth + fPixelRefOrigin.fX);
SkASSERT(fPixelRef->info().fHeight >= (int)fHeight + fPixelRefOrigin.fY);
#if !defined(SK_SUPPORT_LEGACY_ONLOCKPIXELS)
SkASSERT(fPixelRef->rowBytes() >= fWidth * fBytesPerPixel);
#endif
} else {
SkASSERT(NULL == fColorTable);
}