Clean up calls to ToSkPicture

cc/paint/display_item_list.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 "cc/paint/display_item_list.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 84 matching lines @@
     case DisplayItem::END_COMPOSITING:
       canvas->restore();
       break;
     case DisplayItem::DRAWING: {
       const auto& item = static_cast<const DrawingDisplayItem&>(base_item);
       if (canvas->quickReject(item.picture->cullRect()))
         break;
 
       // SkPicture always does a wrapping save/restore on the canvas, so it is
       // not necessary here.
-      if (callback) {
-        item.picture->playback(canvas, callback);
-      } else {
-        // TODO(enne): switch this to playback once PaintRecord is real.
-        canvas->drawPicture(ToSkPicture(item.picture.get()));
-      }
+      item.picture->playback(canvas, callback);

[vmpstr, 2017/03/22 21:00:11]

IIRC this was there as a performance optimization, so look out for any possible
regressions. But, tbh, I don't think this would make much difference.

[enne (OOO), 2017/03/23 16:43:12]

I think it does when the SkCanvas is recording or intercepting things.  However,
for raster, as far as I can tell SkCanvas::onDrawPicture just calls
SkPicture::playback.

       break;
     }
     case DisplayItem::FLOAT_CLIP: {
       const auto& item = static_cast<const FloatClipDisplayItem&>(base_item);
       canvas->save();
       canvas->clipRect(gfx::RectFToSkRect(item.clip_rect));
       break;
     }
     case DisplayItem::END_FLOAT_CLIP:
       canvas->restore();
@@ skipping 279 matching lines @@
           state->EndArray();
 
           state->BeginArray("cullRect");
           state->AppendInteger(item.picture->cullRect().x());
           state->AppendInteger(item.picture->cullRect().y());
           state->AppendInteger(item.picture->cullRect().width());
           state->AppendInteger(item.picture->cullRect().height());
           state->EndArray();
 
           std::string b64_picture;
-          PictureDebugUtil::SerializeAsBase64(ToSkPicture(item.picture.get()),
+          PictureDebugUtil::SerializeAsBase64(ToSkPicture(item.picture).get(),
                                               &b64_picture);
           state->SetString("skp64", b64_picture);
           state->EndDictionary();
           break;
         }
         case DisplayItem::FILTER: {
           const auto& item = static_cast<const FilterDisplayItem&>(base_item);
           state->AppendString(base::StringPrintf(
               "FilterDisplayItem bounds: [%s] visualRect: [%s]",
               item.bounds.ToString().c_str(), visual_rect.ToString().c_str()));
@@ skipping 74 matching lines @@
     float contents_scale,
     std::vector<DrawImage>* images) {
   image_map_.GetDiscardableImagesInRect(rect, contents_scale, images);
 }
 
 gfx::Rect DisplayItemList::GetRectForImage(ImageId image_id) const {
   return image_map_.GetRectForImage(image_id);
 }
 
 }  // namespace cc