cc/paint: Remove PaintCanvas::peekPixels.

content/renderer/media/webmediaplayer_ms_compositor.cc

 // Copyright 2015 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 "content/renderer/media/webmediaplayer_ms_compositor.h"
 
 #include <stdint.h>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 30 matching lines @@
   if (frame->HasTextures()) {
     DCHECK(frame->format() == media::PIXEL_FORMAT_ARGB ||
            frame->format() == media::PIXEL_FORMAT_XRGB ||
            frame->format() == media::PIXEL_FORMAT_I420 ||
            frame->format() == media::PIXEL_FORMAT_UYVY ||
            frame->format() == media::PIXEL_FORMAT_NV12);
     new_frame = media::VideoFrame::CreateFrame(
         media::PIXEL_FORMAT_I420, frame->coded_size(), frame->visible_rect(),
         frame->natural_size(), frame->timestamp());
 
-    sk_sp<cc::PaintSurface> surface = cc::PaintSurface::MakeRasterN32Premul(
-        frame->visible_rect().width(), frame->visible_rect().height());
-
     ui::ContextProviderCommandBuffer* const provider =
         RenderThreadImpl::current()->SharedMainThreadContextProvider().get();
-    if (surface && provider) {
-      DCHECK(provider->ContextGL());
-      video_renderer->Copy(
-          frame.get(), surface->getCanvas(),
-          media::Context3D(provider->ContextGL(), provider->GrContext()));
-    } else {
+    if (!provider) {
       // Return a black frame (yuv = {0, 0x80, 0x80}).
       return media::VideoFrame::CreateColorFrame(
           frame->visible_rect().size(), 0u, 0x80, 0x80, frame->timestamp());
     }
 
+    SkBitmap bitmap;
+    bitmap.allocPixels(SkImageInfo::MakeN32Premul(
+        frame->visible_rect().width(), frame->visible_rect().height()));
+    cc::SkiaPaintCanvas paint_canvas(bitmap);
+
+    DCHECK(provider->ContextGL());
+    video_renderer->Copy(

[enne (OOO), 2017/03/20 21:45:14]

TIL: drawImage(gpu image) into a bitmap backed canvas just does a readback
implicitly.  Who knew.

+        frame.get(), &paint_canvas,
+        media::Context3D(provider->ContextGL(), provider->GrContext()));
+
     SkPixmap pixmap;
-    const bool result = surface->getCanvas()->peekPixels(&pixmap);
-    DCHECK(result) << "Error trying to access PaintSurface's pixels";
+    const bool result = bitmap.peekPixels(&pixmap);
+    DCHECK(result) << "Error trying to access SkBitmap's pixels";
 
     const uint32 source_pixel_format =
         (kN32_SkColorType == kRGBA_8888_SkColorType) ? libyuv::FOURCC_ABGR
                                                      : libyuv::FOURCC_ARGB;
     libyuv::ConvertToI420(
         static_cast<const uint8*>(pixmap.addr(0, 0)),
         pixmap.getSafeSize64(),
         new_frame->visible_data(media::VideoFrame::kYPlane),
         new_frame->stride(media::VideoFrame::kYPlane),
         new_frame->visible_data(media::VideoFrame::kUPlane),
@@ skipping 371 matching lines @@
   }
 
   if (!rendering_frame_buffer_) {
     rendering_frame_buffer_.reset(new media::VideoRendererAlgorithm(
         base::Bind(&WebMediaPlayerMSCompositor::MapTimestampsToRenderTimeTicks,
                    base::Unretained(this))));
   }
 }
 
 }  // namespace content