| Index: third_party/WebKit/Source/core/paint/ThemePainterMac.mm
|
| diff --git a/third_party/WebKit/Source/core/paint/ThemePainterMac.mm b/third_party/WebKit/Source/core/paint/ThemePainterMac.mm
|
| index 45af2658e0aed00a95dc3d03b09243da822abfaf..ee83e53f18bcc2cb10a16881c5bc042d19ac869f 100644
|
| --- a/third_party/WebKit/Source/core/paint/ThemePainterMac.mm
|
| +++ b/third_party/WebKit/Source/core/paint/ThemePainterMac.mm
|
| @@ -35,6 +35,7 @@
|
| #import "platform/mac/LocalCurrentGraphicsContext.h"
|
| #import "platform/mac/ThemeMac.h"
|
| #import "platform/mac/WebCoreNSCellExtras.h"
|
| +#import "skia/ext/cdl_canvas.h"
|
| #import <AvailabilityMacros.h>
|
| #import <Carbon/Carbon.h>
|
| #import <Cocoa/Cocoa.h>
|
| @@ -292,7 +293,7 @@ bool ThemePainterMac::paintMenuListButton(const LayoutObject& o,
|
| return false;
|
|
|
| Color color = o.styleRef().visitedDependentColor(CSSPropertyColor);
|
| - SkPaint paint = paintInfo.context.fillPaint();
|
| + CdlPaint paint = paintInfo.context.fillPaint();
|
| paint.setAntiAlias(true);
|
| paint.setColor(color.rgb());
|
|
|
| @@ -398,7 +399,7 @@ bool ThemePainterMac::paintSliderTrack(const LayoutObject& o,
|
| FloatRoundedRect borderRRect(borderRect, borderRadius, borderRadius,
|
| borderRadius, borderRadius);
|
| paintInfo.context.setStrokeThickness(LayoutThemeMac::sliderTrackBorderWidth);
|
| - SkPaint borderPaint(paintInfo.context.strokePaint());
|
| + CdlPaint borderPaint(paintInfo.context.strokePaint());
|
| borderGradient->applyToPaint(borderPaint, SkMatrix::I());
|
| paintInfo.context.drawRRect(borderRRect, borderPaint);
|
|
|
| @@ -469,7 +470,7 @@ bool ThemePainterMac::paintSliderThumb(const LayoutObject& o,
|
| fillGradient->addColorStop(0.52, fillGradientUpperMiddleColor);
|
| fillGradient->addColorStop(0.52, fillGradientLowerMiddleColor);
|
| fillGradient->addColorStop(1.0, fillGradientBottomColor);
|
| - SkPaint fillPaint(paintInfo.context.fillPaint());
|
| + CdlPaint fillPaint(paintInfo.context.fillPaint());
|
| fillGradient->applyToPaint(fillPaint, SkMatrix::I());
|
| paintInfo.context.drawOval(borderBounds, fillPaint);
|
|
|
| @@ -478,7 +479,7 @@ bool ThemePainterMac::paintSliderThumb(const LayoutObject& o,
|
| borderGradient->addColorStop(0.0, borderGradientTopColor);
|
| borderGradient->addColorStop(1.0, borderGradientBottomColor);
|
| paintInfo.context.setStrokeThickness(LayoutThemeMac::sliderThumbBorderWidth);
|
| - SkPaint borderPaint(paintInfo.context.strokePaint());
|
| + CdlPaint borderPaint(paintInfo.context.strokePaint());
|
| borderGradient->applyToPaint(borderPaint, SkMatrix::I());
|
| paintInfo.context.drawOval(borderBounds, borderPaint);
|
|
|
|
|