SkBitmap and SkPixelRef no longer need lock/unlock

chrome/browser/chromeos/login/screenshot_testing/SkDiffPixelsMetric_cpu.cpp

 // Copyright 2014 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.
 
 // WARNING! This file is copied from third_party/skia/tools/skpdiff and slightly
 // modified to be compilable outside Skia and suit chromium style. Some comments
 // can make no sense.
 // TODO(elizavetai): remove this file and reuse the original one in Skia
 
 #include <stdint.h>
@@ skipping 35 matching lines @@
     result->rgbDiffBitmap.eraseARGB(SK_AlphaTRANSPARENT, 0, 0, 0);
   }
   if (bitmapsToCreate.whiteDiff) {
     result->whiteDiffBitmap.allocPixels(
         SkImageInfo::MakeN32Premul(width, height));
     result->whiteDiffBitmap.eraseARGB(SK_AlphaOPAQUE, 0, 0, 0);
   }
 
   // Prepare the pixels for comparison
   result->poiCount = 0;
-  baseline->lockPixels();
-  test->lockPixels();
   for (int y = 0; y < height; y++) {
     // Grab a row from each image for easy comparison
     // TODO(epoger): The code below already assumes 4 bytes per pixel, so I
     // think
     // we could just call getAddr32() to save a little time.
     // OR, if we want to play it safe, call ComputeBytesPerPixel instead
     // of assuming 4 bytes per pixel.
     uint32_t* baselineRow = static_cast<uint32_t*>(baseline->getAddr(0, y));
     uint32_t* testRow = static_cast<uint32_t*>(test->getAddr(0, y));
     for (int x = 0; x < width; x++) {
@@ skipping 27 matching lines @@
         if (bitmapsToCreate.rgbDiff) {
           *result->rgbDiffBitmap.getAddr32(x, y) =
               SkColorSetRGB(redDiff, greenDiff, blueDiff);
         }
         if (bitmapsToCreate.whiteDiff) {
           *result->whiteDiffBitmap.getAddr32(x, y) = SK_ColorWHITE;
         }
       }
     }
   }
-  test->unlockPixels();
-  baseline->unlockPixels();
 
   result->maxRedDiff = maxRedDiff;
   result->maxGreenDiff = maxGreenDiff;
   result->maxBlueDiff = maxBlueDiff;
 
-  if (bitmapsToCreate.alphaMask) {
-    result->poiAlphaMask.unlockPixels();
-  }
-  if (bitmapsToCreate.rgbDiff) {
-    result->rgbDiffBitmap.unlockPixels();
-  }
-  if (bitmapsToCreate.whiteDiff) {
-    result->whiteDiffBitmap.unlockPixels();
-  }
-
   // Calculates the percentage of identical pixels
   result->result = 1.0 - ((double)result->poiCount / (width * height));
 
   return true;
 }