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

skia/ext/image_operations_unittest.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.
 
 #include <stdlib.h>
 
 #include "skia/ext/image_operations.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
@@ skipping 184 matching lines @@
 TEST(ImageOperations, CreateMaskedBitmap) {
   int src_w = 16, src_h = 16;
 
   SkBitmap src;
   FillDataToBitmap(src_w, src_h, &src);
 
   // Generate alpha mask
   SkBitmap alpha;
   alpha.setConfig(SkBitmap::kARGB_8888_Config, src_w, src_h);
   alpha.allocPixels();
-
-  unsigned char* src_data =
-      reinterpret_cast<unsigned char*>(alpha.getAddr32(0, 0));
-  for (int i = 0; i < src_w * src_h; i++) {
-    src_data[i * 4] = SkColorSetARGB(i + 128 % 255,
-                                     i + 128 % 255,
-                                     i + 64 % 255,
-                                     i + 0 % 255);
+  for (int y = 0, i = 0; y < src_h; y++) {
+    for (int x = 0; x < src_w; x++) {
+      *alpha.getAddr32(x, y) = SkColorSetARGB(i + 128 % 255,
+                                              i + 128 % 255,
+                                              i + 64 % 255,
+                                              i + 0 % 255);
+      i++;
+    }
   }
 
   SkBitmap masked = skia::ImageOperations::CreateMaskedBitmap(src, alpha);
 
   SkAutoLockPixels src_lock(src);
+  SkAutoLockPixels alpha_lock(alpha);
   SkAutoLockPixels masked_lock(masked);
   for (int y = 0; y < src_h; y++) {
     for (int x = 0; x < src_w; x++) {
       // Test that the alpha is equal.
       SkColor src_pixel = SkUnPreMultiply::PMColorToColor(*src.getAddr32(x, y));
       SkColor alpha_pixel =
           SkUnPreMultiply::PMColorToColor(*alpha.getAddr32(x, y));
       SkColor masked_pixel = *masked.getAddr32(x, y);
 
       int alpha_value = SkAlphaMul(SkColorGetA(src_pixel),
@@ skipping 280 matching lines @@
   // Test multiple steps of downsampling.
   SkBitmap large;
   large.setConfig(SkBitmap::kARGB_8888_Config, 100, 43);
   large.allocPixels();
   result = skia::ImageOperations::DownsampleByTwoUntilSize(large, 6, 6);
 
   // The result should be divided in half 100x43 -> 50x22 -> 25x11
   EXPECT_EQ(25, result.width());
   EXPECT_EQ(11, result.height());
 }