Rename paint data structures

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

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2008 Apple 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
@@ skipping 16 matching lines @@
 #include "platform/graphics/BitmapImage.h"
 
 #include "platform/PlatformInstrumentation.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/Timer.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/graphics/BitmapImageMetrics.h"
 #include "platform/graphics/DeferredImageDecoder.h"
 #include "platform/graphics/ImageObserver.h"
 #include "platform/graphics/StaticBitmapImage.h"
+#include "platform/graphics/paint/PaintCanvas.h"
+#include "platform/graphics/paint/PaintFlags.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 namespace {
 
 ColorBehavior defaultColorBehavior() {
   // TODO(ccameron): ColorBehavior should be specified by the caller requesting
@@ skipping 203 matching lines @@
 
 bool BitmapImage::hasColorProfile() const {
   return m_source.hasColorProfile();
 }
 
 String BitmapImage::filenameExtension() const {
   return m_source.filenameExtension();
 }
 
 void BitmapImage::draw(
-    SkCanvas* canvas,
-    const SkPaint& paint,
+    PaintCanvas* canvas,
+    const PaintFlags& paint,
     const FloatRect& dstRect,
     const FloatRect& srcRect,
     RespectImageOrientationEnum shouldRespectImageOrientation,
     ImageClampingMode clampMode,
     const ColorBehavior& colorBehavior) {
   TRACE_EVENT0("skia", "BitmapImage::draw");
 
   sk_sp<SkImage> image = imageForCurrentFrame(colorBehavior);
   if (!image)
     return;  // It's too early and we don't have an image yet.
 
   FloatRect adjustedSrcRect = srcRect;
   adjustedSrcRect.intersect(SkRect::Make(image->bounds()));
 
   if (adjustedSrcRect.isEmpty() || dstRect.isEmpty())
     return;  // Nothing to draw.
 
   ImageOrientation orientation = DefaultImageOrientation;
   if (shouldRespectImageOrientation == RespectImageOrientation)
     orientation = frameOrientationAtIndex(m_currentFrame);
 
-  SkAutoCanvasRestore autoRestore(canvas, false);
+  PaintCanvasAutoRestore autoRestore(canvas, false);
   FloatRect adjustedDstRect = dstRect;
   if (orientation != DefaultImageOrientation) {
     canvas->save();
 
     // ImageOrientation expects the origin to be at (0, 0)
     canvas->translate(adjustedDstRect.x(), adjustedDstRect.y());
     adjustedDstRect.setLocation(FloatPoint());
 
     canvas->concat(affineTransformToSkMatrix(
         orientation.transformFromDefault(adjustedDstRect.size())));
@@ skipping 355 matching lines @@
     getImageObserver()->animationAdvanced(this);
 
   return true;
 }
 
 void BitmapImage::notifyObserversOfAnimationAdvance(TimerBase*) {
   getImageObserver()->animationAdvanced(this);
 }
 
 }  // namespace blink