use SkClipOps where we can, legacyClip where we need to rework

ui/gfx/canvas.cc

 // Copyright (c) 2012 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 "ui/gfx/canvas.h"
 
 #include <cmath>
 #include <limits>
 
 #include "base/i18n/rtl.h"
@@ skipping 185 matching lines @@
 
 void Canvas::Restore() {
   canvas_->restore();
 }
 
 void Canvas::ClipRect(const Rect& rect) {
   canvas_->clipRect(RectToSkRect(rect));
 }
 
 void Canvas::ClipPath(const SkPath& path, bool do_anti_alias) {
-  canvas_->clipPath(path, SkRegion::kIntersect_Op, do_anti_alias);
+  canvas_->clipPath(path, kIntersect_SkClipOp, do_anti_alias);
 }
 
 bool Canvas::IsClipEmpty() const {
   return canvas_->isClipEmpty();
 }
 
 bool Canvas::GetClipBounds(Rect* bounds) {
   SkRect out;
   if (canvas_->getClipBounds(&out)) {
     *bounds = ToEnclosingRect(SkRectToRectF(out));
@@ skipping 417 matching lines @@
   SkPaint p(paint);
   p.setFilterLevel(filter ? SkPaint::kLow_FilterLevel
                           : SkPaint::kNone_FilterLevel);
   p.setShader(shader.get());
 
   // The rect will be filled by the bitmap.
   canvas_->drawRect(dest_rect, p);
 }
 
 }  // namespace gfx