[NOT FOR COMMIT] Fully replace SkCanvas uses.

ui/views/animation/ink_drop_painted_layer_delegates.cc

Index: ui/views/animation/ink_drop_painted_layer_delegates.cc
diff --git a/ui/views/animation/ink_drop_painted_layer_delegates.cc b/ui/views/animation/ink_drop_painted_layer_delegates.cc
index eec5798001095a469b53249201ffb1e72e9b0356..2a65cbe656e56e8a1b6084aa5853b6601e6eaa14 100644
--- a/ui/views/animation/ink_drop_painted_layer_delegates.cc
+++ b/ui/views/animation/ink_drop_painted_layer_delegates.cc
@@ -4,6 +4,8 @@
 
 #include "ui/views/animation/ink_drop_painted_layer_delegates.h"
 
+#include "skia/ext/cdl_canvas.h"
+#include "skia/ext/cdl_paint.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkRRect.h"
@@ -56,10 +58,10 @@ gfx::Rect CircleLayerDelegate::GetPaintedBounds() const {
 }
 
 void CircleLayerDelegate::OnPaintLayer(const ui::PaintContext& context) {
-  SkPaint paint;
+  CdlPaint paint;
   paint.setColor(color());
-  paint.setFlags(SkPaint::kAntiAlias_Flag);
-  paint.setStyle(SkPaint::kFill_Style);
+  paint.setAntiAlias(true);
+  paint.setStyle(CdlPaint::kFill_Style);
 
   ui::PaintRecorder recorder(context, GetPaintedBounds().size());
   gfx::Canvas* canvas = recorder.canvas();
@@ -82,10 +84,10 @@ gfx::Rect RectangleLayerDelegate::GetPaintedBounds() const {
 }
 
 void RectangleLayerDelegate::OnPaintLayer(const ui::PaintContext& context) {
-  SkPaint paint;
+  CdlPaint paint;
   paint.setColor(color());
-  paint.setFlags(SkPaint::kAntiAlias_Flag);
-  paint.setStyle(SkPaint::kFill_Style);
+  paint.setAntiAlias(true);
+  paint.setStyle(CdlPaint::kFill_Style);
 
   ui::PaintRecorder recorder(context, size_);
   gfx::Canvas* canvas = recorder.canvas();
@@ -113,10 +115,10 @@ gfx::Rect RoundedRectangleLayerDelegate::GetPaintedBounds() const {
 
 void RoundedRectangleLayerDelegate::OnPaintLayer(
     const ui::PaintContext& context) {
-  SkPaint paint;
+  CdlPaint paint;
   paint.setColor(color());
-  paint.setFlags(SkPaint::kAntiAlias_Flag);
-  paint.setStyle(SkPaint::kFill_Style);
+  paint.setAntiAlias(true);
+  paint.setStyle(CdlPaint::kFill_Style);
 
   ui::PaintRecorder recorder(context, size_);
   recorder.canvas()->DrawRoundRect(GetPaintedBounds(), corner_radius_, paint);
@@ -151,8 +153,8 @@ gfx::Vector2dF BorderShadowLayerDelegate::GetCenteringOffset() const {
 }
 
 void BorderShadowLayerDelegate::OnPaintLayer(const ui::PaintContext& context) {
-  SkPaint paint;
-  paint.setStyle(SkPaint::kFill_Style);
+  CdlPaint paint;
+  paint.setStyle(CdlPaint::kFill_Style);
   paint.setAntiAlias(true);
   paint.setColor(fill_color_);