Rename paint data structures

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

 /*
  * Copyright (C) 2011 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
@@ skipping 17 matching lines @@
 #include "cc/resources/single_release_callback.h"
 #include "cc/resources/texture_mailbox.h"
 #include "cc/test/test_gpu_memory_buffer_manager.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/common/capabilities.h"
 #include "platform/CrossThreadFunctional.h"
 #include "platform/WaitableEvent.h"
 #include "platform/WebTaskRunner.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/UnacceleratedImageBufferSurface.h"
+#include "platform/graphics/paint/PaintFlags.h"
+#include "platform/graphics/paint/PaintSurface.h"
 #include "platform/graphics/test/FakeGLES2Interface.h"
 #include "platform/graphics/test/FakeWebGraphicsContext3DProvider.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebExternalBitmap.h"
 #include "public/platform/WebScheduler.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebTraceLocation.h"
 #include "skia/ext/texture_handle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/platform/testing/TestingPlatformSupport.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/gl/GrGLTypes.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/RefPtr.h"
 
 #include <memory>
 
 using testing::AnyNumber;
 using testing::AtLeast;
 using testing::InSequence;
 using testing::Return;
@@ skipping 142 matching lines @@
   void noDrawOnContextLostTest() {
     FakeGLES2Interface gl;
     std::unique_ptr<FakeWebGraphicsContext3DProvider> contextProvider =
         WTF::wrapUnique(new FakeWebGraphicsContext3DProvider(&gl));
 
     Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(
         std::move(contextProvider), IntSize(300, 150), 0, NonOpaque,
         Canvas2DLayerBridge::ForceAccelerationForTesting, nullptr,
         kN32_SkColorType)));
     EXPECT_TRUE(bridge->checkSurfaceValid());
-    SkPaint paint;
+    PaintFlags paint;
     uint32_t genID = bridge->getOrCreateSurface()->generationID();
     bridge->canvas()->drawRect(SkRect::MakeXYWH(0, 0, 1, 1), paint);
     EXPECT_EQ(genID, bridge->getOrCreateSurface()->generationID());
     gl.setIsContextLost(true);
     EXPECT_EQ(genID, bridge->getOrCreateSurface()->generationID());
     bridge->canvas()->drawRect(SkRect::MakeXYWH(0, 0, 1, 1), paint);
     EXPECT_EQ(genID, bridge->getOrCreateSurface()->generationID());
     // This results in the internal surface being torn down in response to the
     // context loss.
     EXPECT_FALSE(bridge->checkSurfaceValid());
@@ skipping 106 matching lines @@
   }
 
   void accelerationHintTest() {
     {
       FakeGLES2Interface gl;
       std::unique_ptr<FakeWebGraphicsContext3DProvider> contextProvider =
           WTF::wrapUnique(new FakeWebGraphicsContext3DProvider(&gl));
       Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(
           std::move(contextProvider), IntSize(300, 300), 0, NonOpaque,
           Canvas2DLayerBridge::EnableAcceleration, nullptr, kN32_SkColorType)));
-      SkPaint paint;
+      PaintFlags paint;
       bridge->canvas()->drawRect(SkRect::MakeXYWH(0, 0, 1, 1), paint);
       sk_sp<SkImage> image =
           bridge->newImageSnapshot(PreferAcceleration, SnapshotReasonUnitTests);
       EXPECT_TRUE(bridge->checkSurfaceValid());
       EXPECT_TRUE(bridge->isAccelerated());
     }
 
     {
       FakeGLES2Interface gl;
       std::unique_ptr<FakeWebGraphicsContext3DProvider> contextProvider =
           WTF::wrapUnique(new FakeWebGraphicsContext3DProvider(&gl));
       Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(
           std::move(contextProvider), IntSize(300, 300), 0, NonOpaque,
           Canvas2DLayerBridge::EnableAcceleration, nullptr, kN32_SkColorType)));
-      SkPaint paint;
+      PaintFlags paint;
       bridge->canvas()->drawRect(SkRect::MakeXYWH(0, 0, 1, 1), paint);
       sk_sp<SkImage> image = bridge->newImageSnapshot(PreferNoAcceleration,
                                                       SnapshotReasonUnitTests);
       EXPECT_TRUE(bridge->checkSurfaceValid());
       EXPECT_FALSE(bridge->isAccelerated());
     }
   }
 };
 
 TEST_F(Canvas2DLayerBridgeTest, FullLifecycleSingleThreaded) {
@@ skipping 122 matching lines @@
   postSetIsHiddenTask(location, testThread, bridge, value, doneEvent.get());
   doneEvent->wait();
 }
 
 class MockImageBuffer : public ImageBuffer {
  public:
   MockImageBuffer()
       : ImageBuffer(WTF::wrapUnique(
             new UnacceleratedImageBufferSurface(IntSize(1, 1)))) {}
 
-  MOCK_CONST_METHOD1(resetCanvas, void(SkCanvas*));
+  MOCK_CONST_METHOD1(resetCanvas, void(PaintCanvas*));
 
   virtual ~MockImageBuffer() {}
 };
 
 #if CANVAS2D_HIBERNATION_ENABLED
 TEST_F(Canvas2DLayerBridgeTest, HibernationLifeCycle)
 #else
 TEST_F(Canvas2DLayerBridgeTest, DISABLED_HibernationLifeCycle)
 #endif
 {
@@ skipping 857 matching lines @@
   EXPECT_FALSE(bridge->hasRecordedDrawCommands());
   ::testing::Mock::VerifyAndClearExpectations(&gl);
 
   EXPECT_CALL(gl, Flush()).Times(1);
   bridge->flushGpu();
   EXPECT_FALSE(bridge->hasRecordedDrawCommands());
   ::testing::Mock::VerifyAndClearExpectations(&gl);
 }
 
 }  // namespace blink