blink: Fix cc/paint skia type mismatches

third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.cpp

 // 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 "platform/graphics/paint/DrawingDisplayItem.h"
 
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/PaintCanvas.h"
 #include "public/platform/WebDisplayItemList.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 14 matching lines @@
   if (m_record)
     list->appendDrawingItem(visualRect, m_record);
 }
 
 bool DrawingDisplayItem::drawsContent() const {
   return m_record.get();
 }
 
 void DrawingDisplayItem::analyzeForGpuRasterization(
     SkPictureGpuAnalyzer& analyzer) const {
-  analyzer.analyzePicture(m_record.get());
+  // TODO(enne): Need an SkPictureGpuAnalyzer on PictureRecord.
+  // This is a bit overkill to ToSkPicture a record just to get
+  // numSlowPaths.
+  if (!m_record)
+    return;
+  analyzer.analyzePicture(ToSkPicture(m_record.get()));
 }
 
 #ifndef NDEBUG
 void DrawingDisplayItem::dumpPropertiesAsDebugString(
     StringBuilder& stringBuilder) const {
   DisplayItem::dumpPropertiesAsDebugString(stringBuilder);
   if (m_record) {
     stringBuilder.append(
         String::format(", rect: [%f,%f %fx%f]", m_record->cullRect().x(),
                        m_record->cullRect().y(), m_record->cullRect().width(),
@@ skipping 10 matching lines @@
   // TODO(enne): PaintRecord should have an operator==
   sk_sp<SkData> data1 = ToSkPicture(record1)->serialize();
   sk_sp<SkData> data2 = ToSkPicture(record2)->serialize();
   return data1->equals(data2.get());
 }
 
 static SkBitmap recordToBitmap(const PaintRecord* record) {
   SkBitmap bitmap;
   SkRect rect = record->cullRect();
   bitmap.allocPixels(SkImageInfo::MakeN32Premul(rect.width(), rect.height()));
-  SkCanvas bitmapCanvas(bitmap);
-  PaintCanvasPassThrough canvas(&bitmapCanvas);
+  PaintCanvas canvas(bitmap);
   canvas.clear(SK_ColorTRANSPARENT);
   canvas.translate(-rect.x(), -rect.y());
-  canvas.drawPicture(ToSkPicture(record));
+  canvas.drawPicture(record);
   return bitmap;
 }
 
 static bool bitmapsEqual(const PaintRecord* record1,
                          const PaintRecord* record2) {
   SkRect rect = record1->cullRect();
   if (rect != record2->cullRect())
     return false;
 
   SkBitmap bitmap1 = recordToBitmap(record1);
@@ skipping 33 matching lines @@
 
   if (recordsEqual(record, otherRecord))
     return true;
 
   // Sometimes the client may produce different records for the same visual
   // result, which should be treated as equal.
   return bitmapsEqual(record, otherRecord);
 }
 
 }  // namespace blink