Attempt to fix the ImageOperations::CreateMaskedBitmap UMR by bringing the un...

skia/ext/image_operations.cc

 // Copyright (c) 2006-2008 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 <cmath>
 #include <limits>
 #include <vector>
 
 #include "skia/ext/image_operations.h"
@@ skipping 370 matching lines @@
 
   SkBitmap masked;
   masked.setConfig(SkBitmap::kARGB_8888_Config, rgb.width(), rgb.height(), 0);
   masked.allocPixels();
   masked.eraseARGB(0, 0, 0, 0);
 
   SkAutoLockPixels lock_rgb(rgb);
   SkAutoLockPixels lock_alpha(alpha);
   SkAutoLockPixels lock_masked(masked);
 
-  for (int y = 0; y < rgb.height(); y++) {
+  for (int y = 0; y < masked.height(); y++) {
     uint32* rgb_row = rgb.getAddr32(0, y);
     uint32* alpha_row = alpha.getAddr32(0, y);
     uint32* dst_row = masked.getAddr32(0, y);
 
-    for (int x = 0; x < rgb.width(); x++) {
+    for (int x = 0; x < masked.width(); x++) {
       uint32 alpha_pixel = alpha_row[x];
       SkColor rgb_pixel = SkUnPreMultiply::PMColorToColor(rgb_row[x]);
 
       int alpha = SkAlphaMul(SkColorGetA(rgb_pixel), SkColorGetA(alpha_pixel));
       dst_row[x] = SkColorSetARGB(alpha,
                                   SkAlphaMul(SkColorGetR(rgb_pixel), alpha),
                                   SkAlphaMul(SkColorGetG(rgb_pixel), alpha),
                                   SkAlphaMul(SkColorGetB(rgb_pixel), alpha));
     }
   }
@@ skipping 252 matching lines @@
   // Since bitmaps are refcounted, this copy will be fast.
   SkBitmap current = bitmap;
   while (current.width() >= min_w * 2 && current.height() >= min_h * 2 &&
          current.width() > 1 && current.height() > 1)
     current = DownsampleByTwo(current);
   return current;
 }
 
 }  // namespace skia