Hide bitmap rowbyes assert when LEGACY_ONLOCKPIXELS

src/core/SkBitmap.cpp

Index: src/core/SkBitmap.cpp
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 9a5f1f26dcacaf6faa8310b4424ef83640491426..8c512711f8e5ca609ff2aa28c64e8ecdb8087c6c 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -1601,12 +1601,16 @@ void SkBitmap::validate() const {
         SkASSERT(fPixelRef);
         SkASSERT(fPixelLockCount > 0);
         SkASSERT(fPixelRef->isLocked());

[robertphillips, 2014/01/16 15:09:44]

left align?

+        #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);
     }