Clean up calls to ToSkPicture

cc/paint/display_item_list.cc

Index: cc/paint/display_item_list.cc
diff --git a/cc/paint/display_item_list.cc b/cc/paint/display_item_list.cc
index 4745dcef193743a10c1df5882e773da4e853b026..830b3fbb15ffed9066378c28404c6e5b35aaf8d4 100644
--- a/cc/paint/display_item_list.cc
+++ b/cc/paint/display_item_list.cc
@@ -102,12 +102,7 @@ NOINLINE DISABLE_CFI_PERF void RasterItem(const DisplayItem& base_item,
 
       // 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);
       break;
     }
     case DisplayItem::FLOAT_CLIP: {
@@ -407,7 +402,7 @@ DisplayItemList::CreateTracedValue(bool include_items) const {
           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();