Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Unified Diff: third_party/WebKit/Source/web/tests/WebImageTest.cpp

Issue 2823003002: SkBitmap and SkPixelRef no longer need lock/unlock (Closed)
Patch Set: win fix after rebase Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/web/tests/WebFrameTest.cpp ('k') | ui/base/clipboard/clipboard_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/tests/WebImageTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebImageTest.cpp b/third_party/WebKit/Source/web/tests/WebImageTest.cpp
index dc938eab4ffd607f87b245395e48c6e49f8ff95a..adb7140a6ab882d9ecafb06b790db0257431540e 100644
--- a/third_party/WebKit/Source/web/tests/WebImageTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebImageTest.cpp
@@ -50,7 +50,6 @@ TEST(WebImageTest, PNGImage) {
WebImage image = WebImage::FromData(WebData(data), WebSize());
EXPECT_TRUE(image.Size() == WebSize(1, 1));
- SkAutoLockPixels auto_lock(image.GetSkBitmap());
EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255),
image.GetSkBitmap().getColor(0, 0));
}
@@ -63,10 +62,8 @@ TEST(WebImageTest, ICOImage) {
ASSERT_EQ(2u, images.size());
EXPECT_TRUE(images[0].Size() == WebSize(2, 2));
EXPECT_TRUE(images[1].Size() == WebSize(1, 1));
- SkAutoLockPixels auto_lock1(images[0].GetSkBitmap());
EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255),
images[0].GetSkBitmap().getColor(0, 0));
- SkAutoLockPixels auto_lock2(images[1].GetSkBitmap());
EXPECT_EQ(SkColorSetARGB(255, 0, 0, 0),
images[1].GetSkBitmap().getColor(0, 0));
}
« no previous file with comments | « third_party/WebKit/Source/web/tests/WebFrameTest.cpp ('k') | ui/base/clipboard/clipboard_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698