blink: Fix cc/paint skia type mismatches

third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.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/RecordingImageBufferSurface.h"
 
 #include "platform/WebTaskRunner.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/ImageBufferClient.h"
@@ skipping 50 matching lines @@
     // We create an ImageBuffer in order for the testSurface to be
     // properly initialized with a GraphicsContext
     m_imageBuffer = ImageBuffer::create(std::move(testSurface));
     EXPECT_FALSE(!m_imageBuffer);
     m_testSurface->initializeCurrentFrame();
   }
 
  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());
     EXPECT_EQ(!displayListEnabled,
               (bool)m_testSurface->m_fallbackSurface.get());
     int expectedSurfaceCreationCount = displayListEnabled ? 0 : 1;
     EXPECT_EQ(expectedSurfaceCreationCount,
               m_surfaceFactory->createSurfaceCount());
   }
 
  private:
   MockSurfaceFactory* m_surfaceFactory;
   RecordingImageBufferSurface* m_testSurface;
   std::unique_ptr<ImageBuffer> m_imageBuffer;
 };
 
 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);
 }
 
 TEST_F(RecordingImageBufferSurfaceTest, testNoFallbackWithClear) {
   testSurface()->willOverwriteCanvas();
   testSurface()->getRecord();
   expectDisplayListEnabled(true);
 }
 
 TEST_F(RecordingImageBufferSurfaceTest, testNonAnimatedCanvasUpdate) {
@@ skipping 23 matching lines @@
   expectDisplayListEnabled(true);
   // clear after use
   testSurface()->didDraw(FloatRect(0, 0, 1, 1));
   testSurface()->willOverwriteCanvas();
   testSurface()->getRecord();
   expectDisplayListEnabled(true);
 }
 
 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);
 }
 
 }  // namespace blink