blink: Fix cc/paint skia type mismatches

third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp

Index: third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp
index 47f063bda8b60d09343eff4baa91d493782e8e96..792cae60eba5991accacfa3e376c05084c984df5 100644
--- a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp
@@ -68,7 +68,7 @@ class RecordingImageBufferSurfaceTest : public Test {
  public:
   RecordingImageBufferSurface* testSurface() { return m_testSurface; }
   int createSurfaceCount() { return m_surfaceFactory->createSurfaceCount(); }
-  SkCanvas* canvas() { return m_imageBuffer->canvas(); }
+  PaintCanvas* canvas() { return m_imageBuffer->canvas(); }
 
   void expectDisplayListEnabled(bool displayListEnabled) {
     EXPECT_EQ(displayListEnabled, (bool)m_testSurface->m_currentFrame.get());
@@ -86,8 +86,8 @@ class RecordingImageBufferSurfaceTest : public Test {
 };
 
 TEST_F(RecordingImageBufferSurfaceTest, testEmptyPicture) {
-  sk_sp<SkPicture> picture = testSurface()->getRecord();
-  EXPECT_TRUE((bool)picture.get());
+  sk_sp<PaintRecord> record = testSurface()->getRecord();
+  EXPECT_TRUE(record.get());
   expectDisplayListEnabled(true);
 }
 
@@ -131,11 +131,11 @@ TEST_F(RecordingImageBufferSurfaceTest, testAnimatedWithClear) {
 
 TEST_F(RecordingImageBufferSurfaceTest, testClearRect) {
   testSurface()->getRecord();
-  SkPaint clearPaint;
-  clearPaint.setBlendMode(SkBlendMode::kClear);
+  PaintFlags clearFlags;
+  clearFlags.setBlendMode(SkBlendMode::kClear);
   canvas()->drawRect(SkRect::MakeWH(testSurface()->size().width(),
                                     testSurface()->size().height()),
-                     clearPaint);
+                     clearFlags);
   testSurface()->didDraw(FloatRect(0, 0, 1, 1));
   testSurface()->getRecord();
   expectDisplayListEnabled(true);