Use sk_sp-based picture recording APIs in Blink

android_webview/browser/browser_view_renderer.cc

 // 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 "android_webview/browser/browser_view_renderer.h"
 
 #include <utility>
 
 #include "android_webview/browser/browser_view_renderer_client.h"
 #include "android_webview/browser/child_frame.h"
@@ skipping 311 matching lines @@
 }
 
 skia::RefPtr<SkPicture> BrowserViewRenderer::CapturePicture(int width,
                                                             int height) {
   TRACE_EVENT0("android_webview", "BrowserViewRenderer::CapturePicture");
 
   // Return empty Picture objects for empty SkPictures.
   if (width <= 0 || height <= 0) {
     SkPictureRecorder emptyRecorder;
     emptyRecorder.beginRecording(0, 0);
-    return skia::AdoptRef(emptyRecorder.endRecording());
+    return skia::AdoptRef(emptyRecorder.finishRecordingAsPicture());

[Stephen White, 2016/03/24 19:05:57]

Out of curiosity, are there plans to place skia::RefPtr<> with something else at
some point (sk_sp<>)? Or are we going to keep it?

[f(malita), 2016/03/24 19:17:10]

Now that we have sk_sp I think it makes perfect sense to retire skia::RefPtr: no
reason to maintain a Skia-specific smart ptr when Skia provides one with
equivalent semantics.

(the process has already started - as we update Chromium to the new APIs, we're
also pushing sk_sp as replacement, e.g.
https://codereview.chromium.org/1819683002)

[Stephen White, 2016/03/24 19:42:54]

In that case, should this function be returning an sk_sp<SkPicture>?

[f(malita), 2016/03/24 20:22:41]

It should, but I would rather not pull on this particular thread atm because a)
sk_sp is not assignable to skia::RefPtr (we should prolly add that to ease the
migration), and b) I'm hesitant to touch webview interfaces since I don't have a
good way to test locally (and am suspicious of bot coverage).

   }
 
   SkPictureRecorder recorder;
   SkCanvas* rec_canvas = recorder.beginRecording(width, height, NULL, 0);
   if (compositor_) {
     {
       // Reset scroll back to the origin, will go back to the old
       // value when scroll_reset is out of scope.
       compositor_->DidChangeRootLayerScrollOffset(gfx::ScrollOffset());
       CompositeSW(rec_canvas);
     }
     compositor_->DidChangeRootLayerScrollOffset(
         gfx::ScrollOffset(scroll_offset_dip_));
   }
-  return skia::AdoptRef(recorder.endRecording());
+  return skia::AdoptRef(recorder.finishRecordingAsPicture());
 }
 
 void BrowserViewRenderer::EnableOnNewPicture(bool enabled) {
   on_new_picture_enable_ = enabled;
 }
 
 void BrowserViewRenderer::ClearView() {
   TRACE_EVENT_INSTANT0("android_webview",
                        "BrowserViewRenderer::ClearView",
                        TRACE_EVENT_SCOPE_THREAD);
@@ skipping 368 matching lines @@
   base::StringAppendF(&str,
                       "overscroll_rounding_error_: %s ",
                       overscroll_rounding_error_.ToString().c_str());
   base::StringAppendF(
       &str, "on_new_picture_enable: %d ", on_new_picture_enable_);
   base::StringAppendF(&str, "clear_view: %d ", clear_view_);
   return str;
 }
 
 }  // namespace android_webview