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

Unified Diff: media/blink/webmediaplayer_cast_android.cc

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: media/blink/webmediaplayer_cast_android.cc
diff --git a/media/blink/webmediaplayer_cast_android.cc b/media/blink/webmediaplayer_cast_android.cc
index 06429514434fad58978d775f49474237e3b61fe4..20df504d7251db24df6f2baee1a9ec089443632f 100644
--- a/media/blink/webmediaplayer_cast_android.cc
+++ b/media/blink/webmediaplayer_cast_android.cc
@@ -124,13 +124,10 @@ scoped_refptr<VideoFrame> MakeTextFrameForCast(
gl->TexParameteri(texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
gl->TexParameteri(texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- {
- SkAutoLockPixels lock(bitmap);
- gl->TexImage2D(texture_target, 0 /* level */, GL_RGBA /* internalformat */,
- bitmap.width(), bitmap.height(), 0 /* border */,
- GL_RGBA /* format */, GL_UNSIGNED_BYTE /* type */,
- bitmap.getPixels());
- }
+ gl->TexImage2D(texture_target, 0 /* level */, GL_RGBA /* internalformat */,
+ bitmap.width(), bitmap.height(), 0 /* border */,
+ GL_RGBA /* format */, GL_UNSIGNED_BYTE /* type */,
+ bitmap.getPixels());
gpu::Mailbox texture_mailbox;
gl->GenMailboxCHROMIUM(texture_mailbox.name);
« no previous file with comments | « extensions/browser/api/web_contents_capture_client.cc ('k') | media/renderers/skcanvas_video_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698