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

Unified Diff: third_party/WebKit/Source/web/tests/WebFrameTest.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
Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
index 321d99f7cc8bf22774ff843140c98d5e3bf230bb..f1ac2847fec12285ee726bc1a280d7139a269a92 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -7483,7 +7483,6 @@ TEST_P(ParameterizedWebFrameTest, WebNodeImageContents) {
EXPECT_EQ(image.Size().width, 10);
EXPECT_EQ(image.Size().height, 10);
SkBitmap bitmap = image.GetSkBitmap();
- SkAutoLockPixels locker(bitmap);
EXPECT_EQ(bitmap.getColor(0, 0), SK_ColorBLUE);
}
@@ -8584,7 +8583,6 @@ static void NodeImageTestValidation(const IntSize& reference_bitmap_size,
EXPECT_EQ(reference_bitmap_size.Width(), drag_image->Size().Width());
EXPECT_EQ(reference_bitmap_size.Height(), drag_image->Size().Height());
const SkBitmap& drag_bitmap = drag_image->Bitmap();
- SkAutoLockPixels lock_pixel(drag_bitmap);
EXPECT_EQ(
0, memcmp(bitmap.getPixels(), drag_bitmap.getPixels(), bitmap.getSize()));
}
@@ -10626,7 +10624,6 @@ TEST_F(WebFrameTest, CopyImageAt) {
static_cast<WebMockClipboard*>(Platform::Current()->Clipboard())
->ReadRawImage(WebClipboard::Buffer());
- SkAutoLockPixels auto_lock(image.GetSkBitmap());
EXPECT_EQ(SkColorSetARGB(255, 255, 0, 0), image.GetSkBitmap().getColor(0, 0));
};
@@ -10654,7 +10651,6 @@ TEST_F(WebFrameTest, CopyImageAtWithPinchZoom) {
static_cast<WebMockClipboard*>(Platform::Current()->Clipboard())
->ReadRawImage(WebClipboard::Buffer());
- SkAutoLockPixels auto_lock(image.GetSkBitmap());
EXPECT_EQ(SkColorSetARGB(255, 255, 0, 0), image.GetSkBitmap().getColor(0, 0));
};
« no previous file with comments | « third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp ('k') | third_party/WebKit/Source/web/tests/WebImageTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698