Removing GraphicsContext from ImageBuffer

Source/core/frame/ImageBitmap.cpp

 // Copyright 2013 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 "config.h"
 #include "core/frame/ImageBitmap.h"
 
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
 #include "platform/graphics/BitmapImage.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/ImageBuffer.h"
-#include "platform/graphics/paint/DisplayItemListContextRecorder.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
+#include "platform/graphics/paint/SkPictureBuilder.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 static inline IntRect normalizeRect(const IntRect& rect)
 {
     return IntRect(std::min(rect.x(), rect.maxX()),
         std::min(rect.y(), rect.maxY()),
         std::max(rect.width(), -rect.width()),
         std::max(rect.height(), -rect.height()));
@@ skipping 40 matching lines @@
         playerSize = video->webMediaPlayer()->naturalSize();
 
     IntRect videoRect = IntRect(IntPoint(), playerSize);
     IntRect srcRect = intersection(cropRect, videoRect);
     IntRect dstRect(IntPoint(), srcRect.size());
 
     OwnPtr<ImageBuffer> buffer = ImageBuffer::create(videoRect.size());
     if (!buffer)
         return;
 
+    SkPictureBuilder pictureBuilder(videoRect);
     {
-        DisplayItemListContextRecorder contextRecorder(*buffer->context());
-        GraphicsContext& paintContext = contextRecorder.context();
+        GraphicsContext& paintContext = pictureBuilder.context();
 
         DrawingRecorder recorder(paintContext, *buffer, DisplayItem::VideoBitmap, videoRect);
         if (!recorder.canUseCachedDrawing()) {
             paintContext.clip(dstRect);
             paintContext.translate(-srcRect.x(), -srcRect.y());
         }
     }
+    RefPtr<const SkPicture> recording = pictureBuilder.endRecording();
+    buffer->canvas()->drawPicture(recording.get());

[Stephen White, 2015/06/04 18:33:10]

chrishtr@: Not new to this patch, but why are we going through the record path
here? It looks like we always record, then immediately play back the recorded
commands. Why not just draw?

[chrishtr, 2015/06/04 19:58:00]

Agree that this looks wrong and we should just draw here. Justin could you fix
that? Just remove the picture builder and sub-context and drawing recorder, and
simply call clip and translate on buffer->context().

 
     video->paintCurrentFrame(buffer->canvas(), videoRect, nullptr);
     m_bitmap = buffer->copyImage(DontCopyBackingStore);
     m_bitmapRect = IntRect(IntPoint(std::max(0, -cropRect.x()), std::max(0, -cropRect.y())), srcRect.size());
 }
 
 ImageBitmap::ImageBitmap(HTMLCanvasElement* canvas, const IntRect& cropRect)
     : m_imageElement(nullptr)
     , m_cropRect(cropRect)
     , m_bitmapOffset(IntPoint())
@@ skipping 132 matching lines @@
     return FloatSize(width(), height());
 }
 
 DEFINE_TRACE(ImageBitmap)
 {
     visitor->trace(m_imageElement);
     ImageLoaderClient::trace(visitor);
 }
 
 } // namespace blink