cc: Fix up code to work with concrete cc paint types

cc/playback/drawing_display_item.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/playback/drawing_display_item.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 28 matching lines @@
 }
 
 DISABLE_CFI_PERF
 void DrawingDisplayItem::Raster(SkCanvas* canvas,
                                 SkPicture::AbortCallback* callback) const {
   if (canvas->quickReject(picture_->cullRect()))
     return;
 
   // SkPicture always does a wrapping save/restore on the canvas, so it is not
   // necessary here.
-  if (callback)
+  if (callback) {
     picture_->playback(canvas, callback);
-  else
-    canvas->drawPicture(picture_.get());
+  } else {
+    // TODO(enne): switch this to playback once PaintRecord is real.
+    canvas->drawPicture(ToSkPicture(picture_.get()));
+  }
 }
 
 void DrawingDisplayItem::AsValueInto(
     const gfx::Rect& visual_rect,
     base::trace_event::TracedValue* array) const {
   array->BeginDictionary();
   array->SetString("name", "DrawingDisplayItem");
 
   array->BeginArray("visualRect");
   array->AppendInteger(visual_rect.x());
   array->AppendInteger(visual_rect.y());
   array->AppendInteger(visual_rect.width());
   array->AppendInteger(visual_rect.height());
   array->EndArray();
 
   array->BeginArray("cullRect");
   array->AppendInteger(picture_->cullRect().x());
   array->AppendInteger(picture_->cullRect().y());
   array->AppendInteger(picture_->cullRect().width());
   array->AppendInteger(picture_->cullRect().height());
   array->EndArray();
 
   std::string b64_picture;
-  PictureDebugUtil::SerializeAsBase64(picture_.get(), &b64_picture);
+  PictureDebugUtil::SerializeAsBase64(ToSkPicture(picture_.get()),
+                                      &b64_picture);
   array->SetString("skp64", b64_picture);
   array->EndDictionary();
 }
 
 void DrawingDisplayItem::CloneTo(DrawingDisplayItem* item) const {
   item->SetNew(picture_);
 }
 
 size_t DrawingDisplayItem::ExternalMemoryUsage() const {
-  return SkPictureUtils::ApproximateBytesUsed(ToSkPicture(picture_.get()));
+  return picture_->approximateBytesUsed();
 }
 
 DISABLE_CFI_PERF
 int DrawingDisplayItem::ApproximateOpCount() const {
   return picture_->approximateOpCount();
 }
 
 }  // namespace cc