SkBitmap and SkPixelRef no longer need lock/unlock

chrome/browser/themes/browser_theme_pack_unittest.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.
 
 #include "chrome/browser/themes/browser_theme_pack.h"
 
 #include <stddef.h>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 269 matching lines @@
     int idr = IDR_THEME_FRAME;
     gfx::Image image = pack->GetImageNamed(idr);
     EXPECT_FALSE(image.IsEmpty());
     const gfx::ImageSkia* image_skia = image.ToImageSkia();
     ASSERT_TRUE(image_skia);
     // Scale 100%.
     const gfx::ImageSkiaRep& rep1 = image_skia->GetRepresentation(1.0f);
     ASSERT_FALSE(rep1.is_null());
     EXPECT_EQ(80, rep1.sk_bitmap().width());
     EXPECT_EQ(80, rep1.sk_bitmap().height());
-    rep1.sk_bitmap().lockPixels();
     EXPECT_EQ(SkColorSetRGB(255, 255, 255), rep1.sk_bitmap().getColor(4, 4));
     EXPECT_EQ(SkColorSetRGB(255, 255, 255), rep1.sk_bitmap().getColor(8, 8));
     EXPECT_EQ(SkColorSetRGB(0, 241, 237), rep1.sk_bitmap().getColor(16, 16));
     EXPECT_EQ(SkColorSetRGB(255, 255, 255), rep1.sk_bitmap().getColor(24, 24));
     EXPECT_EQ(SkColorSetRGB(0, 241, 237), rep1.sk_bitmap().getColor(32, 32));
-    rep1.sk_bitmap().unlockPixels();
     // Scale 200%.
     const gfx::ImageSkiaRep& rep2 = image_skia->GetRepresentation(2.0f);
     ASSERT_FALSE(rep2.is_null());
     EXPECT_EQ(160, rep2.sk_bitmap().width());
     EXPECT_EQ(160, rep2.sk_bitmap().height());
-    rep2.sk_bitmap().lockPixels();
     EXPECT_EQ(SkColorSetRGB(255, 255, 255), rep2.sk_bitmap().getColor(4, 4));
     EXPECT_EQ(SkColorSetRGB(223, 42, 0), rep2.sk_bitmap().getColor(8, 8));
     EXPECT_EQ(SkColorSetRGB(223, 42, 0), rep2.sk_bitmap().getColor(16, 16));
     EXPECT_EQ(SkColorSetRGB(223, 42, 0), rep2.sk_bitmap().getColor(24, 24));
     EXPECT_EQ(SkColorSetRGB(255, 255, 255), rep2.sk_bitmap().getColor(32, 32));
-    rep2.sk_bitmap().unlockPixels();
 
     // TODO(sschmitz): I plan to remove the following (to the end of the fct)
     // Reason: this test may be brittle. It depends on details of how we scale
     // an 100% image to an 200% image. If there's filtering etc, this test would
     // break. Also High DPI is new, but scaling from 100% to 200% is not new
     // and need not be tested here. But in the interrim it is useful to verify
     // that this image was scaled and did not appear in the input.
 
     // Compare pixel colors and locations for a theme image that had
     // only one PNG file specified (for scale 100%). The representation
     // for scale of 200% was computed.
     idr = IDR_THEME_FRAME_INCOGNITO_INACTIVE;
     image = pack->GetImageNamed(idr);
     EXPECT_FALSE(image.IsEmpty());
     image_skia = image.ToImageSkia();
     ASSERT_TRUE(image_skia);
     // Scale 100%.
     const gfx::ImageSkiaRep& rep3 = image_skia->GetRepresentation(1.0f);
     ASSERT_FALSE(rep3.is_null());
     EXPECT_EQ(80, rep3.sk_bitmap().width());
     EXPECT_EQ(80, rep3.sk_bitmap().height());
-    rep3.sk_bitmap().lockPixels();
     // We take samples of colors and locations along the diagonal whenever
     // the color changes. Note these colors are slightly different from
     // the input PNG file due to input processing.
     std::vector<std::pair<int, SkColor> > normal;
     int xy = 0;
     SkColor color = rep3.sk_bitmap().getColor(xy, xy);
     normal.push_back(std::make_pair(xy, color));
     for (int xy = 0; xy < 40; ++xy) {
       SkColor next_color = rep3.sk_bitmap().getColor(xy, xy);
       if (next_color != color) {
         color = next_color;
         normal.push_back(std::make_pair(xy, color));
       }
     }
     EXPECT_EQ(static_cast<size_t>(9), normal.size());
-    rep3.sk_bitmap().unlockPixels();
     // Scale 200%.
     const gfx::ImageSkiaRep& rep4 = image_skia->GetRepresentation(2.0f);
     ASSERT_FALSE(rep4.is_null());
     EXPECT_EQ(160, rep4.sk_bitmap().width());
     EXPECT_EQ(160, rep4.sk_bitmap().height());
-    rep4.sk_bitmap().lockPixels();
     // We expect the same colors and at locations scaled by 2
     // since this bitmap was scaled by 2.
     for (size_t i = 0; i < normal.size(); ++i) {
       int xy = 2 * normal[i].first;
       SkColor color = normal[i].second;
       EXPECT_EQ(color, rep4.sk_bitmap().getColor(xy, xy));
     }
-    rep4.sk_bitmap().unlockPixels();
   }
 
   base::MessageLoop message_loop;
   content::TestBrowserThread fake_ui_thread;
   content::TestBrowserThread fake_file_thread;
 
   typedef std::unique_ptr<ui::test::ScopedSetSupportedScaleFactors>
       ScopedSetSupportedScaleFactors;
   ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
   scoped_refptr<BrowserThemePack> theme_pack_;
@@ skipping 243 matching lines @@
   }
 
   // Part 2: Try to read back the data pack that we just wrote to disk.
   {
     scoped_refptr<BrowserThemePack> pack =
         BrowserThemePack::BuildFromDataPack(file, "gllekhaobjnhgeag");
     ASSERT_TRUE(pack.get());
     VerifyHiDpiTheme(pack.get());
   }
 }