SkBitmap and SkPixelRef no longer need lock/unlock

third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.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.
 
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/PaintCanvas.h"
 #include "public/platform/WebDisplayItemList.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 65 matching lines @@
 }
 
 static bool BitmapsEqual(sk_sp<const PaintRecord> record1,
                          sk_sp<const PaintRecord> record2) {
   SkRect rect = record1->cullRect();
   if (rect != record2->cullRect())
     return false;
 
   SkBitmap bitmap1 = RecordToBitmap(record1);
   SkBitmap bitmap2 = RecordToBitmap(record2);
-  bitmap1.lockPixels();
-  bitmap2.lockPixels();
   int mismatch_count = 0;
   const int kMaxMismatches = 10;
   for (int y = 0; y < rect.height() && mismatch_count < kMaxMismatches; ++y) {
     for (int x = 0; x < rect.width() && mismatch_count < kMaxMismatches; ++x) {
       SkColor pixel1 = bitmap1.getColor(x, y);
       SkColor pixel2 = bitmap2.getColor(x, y);
       if (pixel1 != pixel2) {
         LOG(ERROR) << "x=" << x << " y=" << y << " " << std::hex << pixel1
                    << " vs " << std::hex << pixel2;
         ++mismatch_count;
       }
     }
   }
-  bitmap1.unlockPixels();
-  bitmap2.unlockPixels();
   return !mismatch_count;
 }
 
 bool DrawingDisplayItem::Equals(const DisplayItem& other) const {
   if (!DisplayItem::Equals(other))
     return false;
 
   const sk_sp<const PaintRecord>& record = this->GetPaintRecord();
   const sk_sp<const PaintRecord>& other_record =
       static_cast<const DrawingDisplayItem&>(other).GetPaintRecord();
 
   if (!record && !other_record)
     return true;
   if (!record || !other_record)
     return false;
 
   if (RecordsEqual(record, other_record))
     return true;
 
   // Sometimes the client may produce different records for the same visual
   // result, which should be treated as equal.
   return BitmapsEqual(std::move(record), std::move(other_record));
 }
 
 }  // namespace blink