From ea8e113b1935e822af9a28721e208a73d5acd045 Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Tue, 8 Aug 2017 16:38:04 +0300 Subject: [PATCH] SkBitmap and SkPixelRef no longer need lock/unlock https://codereview.chromium.org/2823003002 --- atom/browser/api/frame_subscriber.cc | 1 - atom/browser/osr/osr_output_device.cc | 1 - atom/browser/osr/osr_render_widget_host_view.cc | 3 --- brightray/browser/win/win32_notification.cc | 4 ---- .../chrome/browser/media/native_desktop_media_list.cc | 3 --- 5 files changed, 12 deletions(-) diff --git a/atom/browser/api/frame_subscriber.cc b/atom/browser/api/frame_subscriber.cc index e497c2968e56..76ed89b8f1ad 100644 --- a/atom/browser/api/frame_subscriber.cc +++ b/atom/browser/api/frame_subscriber.cc @@ -89,7 +89,6 @@ void FrameSubscriber::OnFrameDelivered(const FrameCaptureCallback& callback, auto local_buffer = buffer.ToLocalChecked(); { - SkAutoLockPixels lock(bitmap); auto source = static_cast(bitmap.getPixels()); auto target = node::Buffer::Data(local_buffer); diff --git a/atom/browser/osr/osr_output_device.cc b/atom/browser/osr/osr_output_device.cc index 1234a17b8420..b08732c488f1 100644 --- a/atom/browser/osr/osr_output_device.cc +++ b/atom/browser/osr/osr_output_device.cc @@ -95,7 +95,6 @@ void OffScreenOutputDevice::OnPaint(const gfx::Rect& damage_rect) { if (rect.IsEmpty()) return; - SkAutoLockPixels bitmap_pixels_lock(*bitmap_); callback_.Run(rect, *bitmap_); } diff --git a/atom/browser/osr/osr_render_widget_host_view.cc b/atom/browser/osr/osr_render_widget_host_view.cc index b8b879d78eba..bf2763406106 100644 --- a/atom/browser/osr/osr_render_widget_host_view.cc +++ b/atom/browser/osr/osr_render_widget_host_view.cc @@ -943,9 +943,6 @@ void CopyBitmapTo( const SkBitmap& destination, const SkBitmap& source, const gfx::Rect& pos) { - SkAutoLockPixels source_pixels_lock(source); - SkAutoLockPixels destination_pixels_lock(destination); - char* src = static_cast(source.getPixels()); char* dest = static_cast(destination.getPixels()); int pixelsize = source.bytesPerPixel(); diff --git a/brightray/browser/win/win32_notification.cc b/brightray/browser/win/win32_notification.cc index 9c9cd623f487..f2ae9e8fc80b 100644 --- a/brightray/browser/win/win32_notification.cc +++ b/brightray/browser/win/win32_notification.cc @@ -18,8 +18,6 @@ void Win32Notification::Show(const NotificationOptions& options) { if (!options.icon.drawsNothing()) { if (options.icon.colorType() == kBGRA_8888_SkColorType) { - options.icon.lockPixels(); - BITMAPINFOHEADER bmi = { sizeof(BITMAPINFOHEADER) }; bmi.biWidth = options.icon.width(); bmi.biHeight = -options.icon.height(); @@ -33,8 +31,6 @@ void Win32Notification::Show(const NotificationOptions& options) { reinterpret_cast(&bmi), DIB_RGB_COLORS); ReleaseDC(NULL, hdcScreen); - - options.icon.unlockPixels(); } } diff --git a/chromium_src/chrome/browser/media/native_desktop_media_list.cc b/chromium_src/chrome/browser/media/native_desktop_media_list.cc index d71a794054f8..f0eb075eba94 100644 --- a/chromium_src/chrome/browser/media/native_desktop_media_list.cc +++ b/chromium_src/chrome/browser/media/native_desktop_media_list.cc @@ -48,7 +48,6 @@ gfx::ImageSkia ScaleDesktopFrame(std::unique_ptr frame, SkBitmap result; result.allocN32Pixels(scaled_rect.width(), scaled_rect.height(), true); - result.lockPixels(); uint8* pixels_data = reinterpret_cast(result.getPixels()); libyuv::ARGBScale(frame->data(), frame->stride(), @@ -69,8 +68,6 @@ gfx::ImageSkia ScaleDesktopFrame(std::unique_ptr frame, } } - result.unlockPixels(); - return gfx::ImageSkia::CreateFrom1xBitmap(result); }