Use sk_sp-based picture recording APIs in Blink

third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp

 // Copyright 2014 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 "platform/graphics/RecordingImageBufferSurface.h"
 
 #include "platform/Histogram.h"
 #include "platform/graphics/CanvasMetrics.h"
 #include "platform/graphics/ExpensiveCanvasHeuristicParameters.h"
 #include "platform/graphics/GraphicsContext.h"
@@ skipping 69 matching lines @@
 
     m_fallbackSurface = m_fallbackFactory->createSurface(size(), getOpacityMode());
     m_fallbackSurface->setImageBuffer(m_imageBuffer);
 
     if (m_previousFrame) {
         m_previousFrame->playback(m_fallbackSurface->canvas());
         m_previousFrame.clear();
     }
 
     if (m_currentFrame) {
-        RefPtr<SkPicture> currentPicture = adoptRef(m_currentFrame->endRecording());
-        currentPicture->playback(m_fallbackSurface->canvas());
+        m_currentFrame->finishRecordingAsPicture()->playback(m_fallbackSurface->canvas());
         m_currentFrame.clear();
     }
 
     if (m_imageBuffer) {
         m_imageBuffer->resetCanvas(m_fallbackSurface->canvas());
     }
 
     CanvasMetrics::countCanvasContextUsage(CanvasMetrics::DisplayList2DCanvasFallbackToRaster);
 }
 
@@ skipping 120 matching lines @@
 }
 
 void RecordingImageBufferSurface::willOverwriteCanvas()
 {
     m_frameWasCleared = true;
     m_previousFrame.clear();
     m_previousFrameHasExpensiveOp = false;
     m_previousFramePixelCount = 0;
     if (m_didRecordDrawCommandsInCurrentFrame) {
         // Discard previous draw commands
-        adoptRef(m_currentFrame->endRecording());
+        m_currentFrame->finishRecordingAsPicture();
         initializeCurrentFrame();
     }
 }
 
 void RecordingImageBufferSurface::didDraw(const FloatRect& rect)
 {
     m_didRecordDrawCommandsInCurrentFrame = true;
     IntRect pixelBounds = enclosingIntRect(rect);
     m_currentFramePixelCount += pixelBounds.width() * pixelBounds.height();
 }
 
 bool RecordingImageBufferSurface::finalizeFrameInternal(FallbackReason* fallbackReason)
 {
     ASSERT(!m_fallbackSurface);
     ASSERT(m_currentFrame);
     ASSERT(m_currentFrame->getRecordingCanvas());
     ASSERT(fallbackReason);
     ASSERT(*fallbackReason == FallbackReasonUnknown);
 
     if (!m_imageBuffer->isDirty()) {
         if (!m_previousFrame) {
             // Create an initial blank frame
-            m_previousFrame = adoptRef(m_currentFrame->endRecording());
+            m_previousFrame = fromSkSp(m_currentFrame->finishRecordingAsPicture());
             initializeCurrentFrame();
         }
         return m_currentFrame;
     }
 
     if (!m_frameWasCleared) {
         *fallbackReason = FallbackReasonCanvasNotClearedBetweenFrames;
         return false;
     }
 
     if (m_currentFrame->getRecordingCanvas()->getSaveCount() > ExpensiveCanvasHeuristicParameters::ExpensiveRecordingStackDepth) {
         *fallbackReason = FallbackReasonRunawayStateStack;
         return false;
     }
 
-    m_previousFrame = adoptRef(m_currentFrame->endRecording());
+    m_previousFrame = fromSkSp(m_currentFrame->finishRecordingAsPicture());
     m_previousFrameHasExpensiveOp = m_currentFrameHasExpensiveOp;
     m_previousFramePixelCount = m_currentFramePixelCount;
     initializeCurrentFrame();
 
     m_frameWasCleared = false;
     return true;
 }
 
 void RecordingImageBufferSurface::draw(GraphicsContext& context, const FloatRect& destRect, const FloatRect& srcRect, SkXfermode::Mode op)
 {
@@ skipping 62 matching lines @@
 
 void RecordingImageBufferSurface::setIsHidden(bool hidden)
 {
     if (m_fallbackSurface)
         m_fallbackSurface->setIsHidden(hidden);
     else
         ImageBufferSurface::setIsHidden(hidden);
 }
 
 } // namespace blink