blink: Fix cc/paint skia type mismatches

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/graphics/DeferredImageDecoder.h"
 
+#include <memory>
 #include "platform/CrossThreadFunctional.h"
 #include "platform/SharedBuffer.h"
 #include "platform/WebTaskRunner.h"
 #include "platform/graphics/ImageDecodingStore.h"
 #include "platform/graphics/ImageFrameGenerator.h"
 #include "platform/graphics/paint/PaintCanvas.h"
 #include "platform/graphics/paint/PaintRecord.h"
 #include "platform/graphics/paint/PaintRecorder.h"
+#include "platform/graphics/paint/PaintSurface.h"
 #include "platform/graphics/test/MockImageDecoder.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebTraceLocation.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkPixmap.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/RefPtr.h"
-#include <memory>
 
 namespace blink {
 
 namespace {
 
 // Raw data for a PNG file with 1x1 white pixels.
 const unsigned char whitePNG[] = {
     0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
     0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
     0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00,
@@ skipping 30 matching lines @@
                                  public MockImageDecoderClient {
  public:
   void SetUp() override {
     ImageDecodingStore::instance().setCacheLimitInBytes(1024 * 1024);
     m_data = SharedBuffer::create(whitePNG, sizeof(whitePNG));
     m_frameCount = 1;
     std::unique_ptr<MockImageDecoder> decoder = MockImageDecoder::create(this);
     m_actualDecoder = decoder.get();
     m_actualDecoder->setSize(1, 1);
     m_lazyDecoder = DeferredImageDecoder::createForTesting(std::move(decoder));
-    m_surface = SkSurface::MakeRasterN32Premul(100, 100);
+    m_surface = PaintSurface::MakeRasterN32Premul(100, 100);
     ASSERT_TRUE(m_surface.get());
     m_decodeRequestCount = 0;
     m_repetitionCount = cAnimationNone;
     m_status = ImageFrame::FrameComplete;
     m_frameDuration = 0;
     m_decodedSize = m_actualDecoder->size();
   }
 
   void TearDown() override { ImageDecodingStore::instance().clear(); }
 
@@ skipping 13 matching lines @@
 
  protected:
   void useMockImageDecoderFactory() {
     m_lazyDecoder->frameGenerator()->setImageDecoderFactory(
         MockImageDecoderFactory::create(this, m_decodedSize));
   }
 
   // Don't own this but saves the pointer to query states.
   MockImageDecoder* m_actualDecoder;
   std::unique_ptr<DeferredImageDecoder> m_lazyDecoder;
-  sk_sp<SkSurface> m_surface;
+  sk_sp<PaintSurface> m_surface;
   int m_decodeRequestCount;
   RefPtr<SharedBuffer> m_data;
   size_t m_frameCount;
   int m_repetitionCount;
   ImageFrame::Status m_status;
   float m_frameDuration;
   IntSize m_decodedSize;
 };
 
 TEST_F(DeferredImageDecoderTest, drawIntoPaintRecord) {
@@ skipping 232 matching lines @@
       SharedBuffer::create(m_data->data(), m_data->size());
   EXPECT_EQ(originalData->size(), m_data->size());
   m_lazyDecoder->setData(originalData, false);
   RefPtr<SharedBuffer> newData = m_lazyDecoder->data();
   EXPECT_EQ(originalData->size(), newData->size());
   EXPECT_EQ(
       0, std::memcmp(originalData->data(), newData->data(), newData->size()));
 }
 
 }  // namespace blink