Rename paint data structures

third_party/WebKit/Source/core/svg/graphics/SVGImageTest.cpp

 // Copyright 2016 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 "core/svg/graphics/SVGImage.h"
 
 #include "core/svg/graphics/SVGImageChromeClient.h"
 #include "platform/SharedBuffer.h"
 #include "platform/Timer.h"
 #include "platform/geometry/FloatRect.h"
+#include "platform/graphics/paint/PaintCanvas.h"
+#include "platform/graphics/paint/PaintFlags.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/utils/SkNullCanvas.h"
 #include "wtf/PtrUtil.h"
 
 namespace blink {
 class SVGImageTest : public ::testing::Test {
  public:
   SVGImage& image() { return *m_image; }
 
   void load(const char* data, bool shouldPause) {
     m_observer = new PauseControlImageObserver(shouldPause);
     m_image = SVGImage::create(m_observer);
     m_image->setData(SharedBuffer::create(data, strlen(data)), true);
   }
 
   void pumpFrame() {
     Image* image = m_image.get();
     std::unique_ptr<SkCanvas> nullCanvas = SkMakeNullCanvas();
-    SkPaint paint;
+    PaintCanvasPassThrough canvas(nullCanvas.get());
+    PaintFlags paint;
     FloatRect dummyRect(0, 0, 100, 100);
-    image->draw(nullCanvas.get(), paint, dummyRect, dummyRect,
+    image->draw(&canvas, paint, dummyRect, dummyRect,
                 DoNotRespectImageOrientation,
                 Image::DoNotClampImageToSourceRect,
                 ColorBehavior::transformToGlobalTarget());
   }
 
  private:
   class PauseControlImageObserver
       : public GarbageCollectedFinalized<PauseControlImageObserver>,
         public ImageObserver {
     USING_GARBAGE_COLLECTED_MIXIN(PauseControlImageObserver);
@@ skipping 90 matching lines @@
   EXPECT_TRUE(chromeClient.isSuspended());
   EXPECT_FALSE(timer->isActive());
 
   // Simulate a draw. This should resume the animation again.
   pumpFrame();
   EXPECT_FALSE(chromeClient.isSuspended());
   EXPECT_TRUE(timer->isActive());
 }
 
 }  // namespace blink