Use sk_sp-based picture recording APIs in Blink

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 645 matching lines @@
     ASSERT(!m_haveRecordedDrawCommands);
     // call write pixels on the surface, not the recording canvas.
     // No need to call beginDirectSurfaceAccessModeIfNeeded() because writePixels
     // ignores the matrix and clip state.
     return getOrCreateSurface()->getCanvas()->writePixels(origInfo, pixels, rowBytes, x, y);
 }
 
 void Canvas2DLayerBridge::skipQueuedDrawCommands()
 {
     if (m_haveRecordedDrawCommands) {
-        adoptRef(m_recorder->endRecording());
+        m_recorder->finishRecordingAsPicture();
         startRecording();
         m_haveRecordedDrawCommands = false;
     }
 
     if (m_isDeferralEnabled) {
         unregisterTaskObserver();
         if (m_rateLimiter)
             m_rateLimiter->reset();
     }
 }
 
 void Canvas2DLayerBridge::flushRecordingOnly()
 {
     ASSERT(!m_destructionInProgress);
 
     if (m_haveRecordedDrawCommands && getOrCreateSurface()) {
         TRACE_EVENT0("cc", "Canvas2DLayerBridge::flushRecordingOnly");
-        RefPtr<SkPicture> picture = adoptRef(m_recorder->endRecording());
-        picture->playback(getOrCreateSurface()->getCanvas());
+        m_recorder->finishRecordingAsPicture()->playback(getOrCreateSurface()->getCanvas());
         if (m_isDeferralEnabled)
             startRecording();
         m_haveRecordedDrawCommands = false;
     }
 }
 
 void Canvas2DLayerBridge::flush()
 {
     if (!getOrCreateSurface())
         return;
@@ skipping 305 matching lines @@
 #endif // USE_IOSURFACE_FOR_2D_CANVAS
 }
 
 void Canvas2DLayerBridge::Logger::reportHibernationEvent(HibernationEvent event)
 {
     DEFINE_STATIC_LOCAL(EnumerationHistogram, hibernationHistogram, ("Canvas.HibernationEvents", HibernationEventCount));
     hibernationHistogram.count(event);
 }
 
 } // namespace blink