From: commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Thu, 16 Jan 2014 15:47:06 +0000 (+0000)
Subject: Hide bitmap rowbyes assert when LEGACY_ONLOCKPIXELS
X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~9350
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7ba41321b16ad8df611fa07e9ae48fe8a30a0bb;p=platform%2Fupstream%2FlibSkiaSharp.git

Hide bitmap rowbyes assert when LEGACY_ONLOCKPIXELS

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
---

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 9a5f1f2..2464d5d 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());
+#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);
     }