remove SK_SUPPORT_LEGACY_ONLOCKPIXELS completely

src/core/SkBitmap.cpp

 
 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkBitmap.h"
@@ skipping 1659 matching lines @@
     allFlags |= kHasHardwareMipMap_Flag;
 #endif
     SkASSERT(fFlags <= allFlags);
     SkASSERT(fPixelLockCount >= 0);
     SkASSERT((uint8_t)ComputeBytesPerPixel((Config)fConfig) == fBytesPerPixel);
 
     if (fPixels) {
         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);
     }
 }
 #endif
 
 #ifdef SK_DEVELOPER
 void SkBitmap::toString(SkString* str) const {
 
     static const char* gConfigNames[kConfigCount] = {
@@ skipping 25 matching lines @@
         if (NULL != uri) {
             str->appendf(" uri:\"%s\"", uri);
         } else {
             str->appendf(" pixelref:%p", pr);
         }
     }
 
     str->append(")");
 }
 #endif