Rename paint data structures

third_party/WebKit/Source/core/paint/ThemePainterMac.mm

 /*
  * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Google, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 12 matching lines @@
 #import "core/frame/FrameView.h"
 #import "core/layout/LayoutProgress.h"
 #import "core/layout/LayoutThemeMac.h"
 #import "core/layout/LayoutView.h"
 #import "core/paint/PaintInfo.h"
 #import "platform/geometry/FloatRoundedRect.h"
 #import "platform/graphics/BitmapImage.h"
 #import "platform/graphics/GraphicsContextStateSaver.h"
 #import "platform/graphics/Image.h"
 #import "platform/graphics/ImageBuffer.h"
+#import "platform/graphics/paint/PaintCanvas.h"
 #import "platform/mac/BlockExceptions.h"
 #import "platform/mac/ColorMac.h"
 #import "platform/mac/LocalCurrentGraphicsContext.h"
 #import "platform/mac/ThemeMac.h"
 #import "platform/mac/WebCoreNSCellExtras.h"
 #import <AvailabilityMacros.h>
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 #import <math.h>
 
@@ skipping 242 matching lines @@
   float leftEdge;
   if (o.styleRef().direction() == TextDirection::kLtr) {
     leftEdge = bounds.maxX() - scaledPaddingEnd - arrowWidth;
   } else {
     leftEdge = bounds.x() + scaledPaddingEnd;
   }
   if (bounds.width() < arrowWidth + scaledPaddingEnd)
     return false;
 
   Color color = o.styleRef().visitedDependentColor(CSSPropertyColor);
-  SkPaint paint = paintInfo.context.fillPaint();
+  PaintFlags paint = paintInfo.context.fillPaint();
   paint.setAntiAlias(true);
   paint.setColor(color.rgb());
 
   SkPath arrow1;
   arrow1.moveTo(leftEdge, centerY - spaceBetweenArrows / 2.0f);
   arrow1.lineTo(leftEdge + arrowWidth, centerY - spaceBetweenArrows / 2.0f);
   arrow1.lineTo(leftEdge + arrowWidth / 2.0f,
                 centerY - spaceBetweenArrows / 2.0f - arrowHeight);
 
   // Draw the top arrow.
@@ skipping 85 matching lines @@
   borderGradient->addColorStop(1.0, borderGradientBottomColor);
 
   FloatRect borderRect(unzoomedRect);
   borderRect.inflate(-LayoutThemeMac::sliderTrackBorderWidth / 2.0);
   float borderRadiusSize =
       (isVerticalSlider ? borderRect.width() : borderRect.height()) / 2;
   FloatSize borderRadius(borderRadiusSize, borderRadiusSize);
   FloatRoundedRect borderRRect(borderRect, borderRadius, borderRadius,
                                borderRadius, borderRadius);
   paintInfo.context.setStrokeThickness(LayoutThemeMac::sliderTrackBorderWidth);
-  SkPaint borderPaint(paintInfo.context.strokePaint());
+  PaintFlags borderPaint(paintInfo.context.strokePaint());
   borderGradient->applyToPaint(borderPaint, SkMatrix::I());
   paintInfo.context.drawRRect(borderRRect, borderPaint);
 
   return false;
 }
 
 bool ThemePainterMac::paintSliderThumb(const LayoutObject& o,
                                        const PaintInfo& paintInfo,
                                        const IntRect& r) {
   GraphicsContextStateSaver stateSaver(paintInfo.context);
@@ skipping 50 matching lines @@
   paintInfo.context.fillEllipse(borderBounds);
   paintInfo.context.setDrawLooper(nullptr);
 
   IntRect fillBounds = enclosedIntRect(unzoomedRect);
   RefPtr<Gradient> fillGradient = Gradient::create(fillBounds.minXMinYCorner(),
                                                    fillBounds.minXMaxYCorner());
   fillGradient->addColorStop(0.0, fillGradientTopColor);
   fillGradient->addColorStop(0.52, fillGradientUpperMiddleColor);
   fillGradient->addColorStop(0.52, fillGradientLowerMiddleColor);
   fillGradient->addColorStop(1.0, fillGradientBottomColor);
-  SkPaint fillPaint(paintInfo.context.fillPaint());
+  PaintFlags fillPaint(paintInfo.context.fillPaint());
   fillGradient->applyToPaint(fillPaint, SkMatrix::I());
   paintInfo.context.drawOval(borderBounds, fillPaint);
 
   RefPtr<Gradient> borderGradient = Gradient::create(
       fillBounds.minXMinYCorner(), fillBounds.minXMaxYCorner());
   borderGradient->addColorStop(0.0, borderGradientTopColor);
   borderGradient->addColorStop(1.0, borderGradientBottomColor);
   paintInfo.context.setStrokeThickness(LayoutThemeMac::sliderThumbBorderWidth);
-  SkPaint borderPaint(paintInfo.context.strokePaint());
+  PaintFlags borderPaint(paintInfo.context.strokePaint());
   borderGradient->applyToPaint(borderPaint, SkMatrix::I());
   paintInfo.context.drawOval(borderBounds, borderPaint);
 
   if (LayoutTheme::isFocused(o)) {
     Path borderPath;
     borderPath.addEllipse(borderBounds);
     paintInfo.context.drawFocusRing(borderPath, 5, -2,
                                     m_layoutTheme.focusRingColor());
   }
 
@@ skipping 310 matching lines @@
     backgroundBounds.origin.y = bounds.origin.y + (heightDiff / 2) + 1;
   }
 
   LocalCurrentGraphicsContext localContext(paintInfo.context, rect);
   HIThemeDrawButton(&backgroundBounds, &drawInfo, localContext.cgContext(),
                     kHIThemeOrientationNormal, 0);
   return false;
 }
 
 }  // namespace blink