Fix a DCHECK ordering problem in ImageOperations.

skia/ext/image_operations.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #define _USE_MATH_DEFINES
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 327 matching lines @@
                dest_width * dest_height);
   // Ensure that the ResizeMethod enumeration is sound.
   SkASSERT(((RESIZE_FIRST_QUALITY_METHOD <= method) &&
             (method <= RESIZE_LAST_QUALITY_METHOD)) ||
            ((RESIZE_FIRST_ALGORITHM_METHOD <= method) &&
             (method <= RESIZE_LAST_ALGORITHM_METHOD)));
 
   // Time how long this takes to see if it's a problem for users.
   base::TimeTicks resize_start = base::TimeTicks::Now();
 
-  SkIRect dest = { 0, 0, dest_width, dest_height };
-  DCHECK(dest.contains(dest_subset)) <<
-      "The supplied subset does not fall within the destination image.";
-
   // If the size of source or destination is 0, i.e. 0x0, 0xN or Nx0, just
   // return empty.
   if (source.width() < 1 || source.height() < 1 ||
       dest_width < 1 || dest_height < 1)
     return SkBitmap();
 
+  SkIRect dest = {0, 0, dest_width, dest_height};
+  DCHECK(dest.contains(dest_subset))
+      << "The supplied subset does not fall within the destination image.";
+
   method = ResizeMethodToAlgorithmMethod(method);
   // Check that we deal with an "algorithm methods" from this point onward.
   SkASSERT((ImageOperations::RESIZE_FIRST_ALGORITHM_METHOD <= method) &&
            (method <= ImageOperations::RESIZE_LAST_ALGORITHM_METHOD));
 
   if (!source.readyToDraw() || source.colorType() != kN32_SkColorType)
     return SkBitmap();
 
   ResizeFilter filter(method, source.width(), source.height(),
                       dest_width, dest_height, dest_subset);
@@ skipping 27 matching lines @@
 SkBitmap ImageOperations::Resize(const SkBitmap& source,
                                  ResizeMethod method,
                                  int dest_width, int dest_height,
                                  SkBitmap::Allocator* allocator) {
   SkIRect dest_subset = { 0, 0, dest_width, dest_height };
   return Resize(source, method, dest_width, dest_height, dest_subset,
                 allocator);
 }
 
 }  // namespace skia