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

cc/resources/content_layer_updater.cc

 // Copyright 2011 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 "cc/resources/content_layer_updater.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/resources/layer_painter.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkRect.h"
@@ skipping 45 matching lines @@
     const gfx::Rect layer_content_rect = gfx::Rect(layer_content_size);
     gfx::Rect deflated_layer_content_rect = layer_content_rect;
     deflated_layer_content_rect.Inset(0, 0, 1, 1);
 
     if (!layer_content_rect.Contains(deflated_layer_content_rect)) {
       // Drawing at most 1 x 1 x (canvas width + canvas height) texels is 2-3X
       // faster than clearing, so special case this.
       DCHECK_LE(paint_rect.right(), layer_content_rect.right());
       DCHECK_LE(paint_rect.bottom(), layer_content_rect.bottom());
       canvas->save();
-      canvas->clipRect(gfx::RectToSkRect(layer_content_rect),
-                       SkRegion::kReplace_Op);
+      canvas->legacyClipRect(gfx::RectToSkRect(layer_content_rect),
+                             SkRegion::kReplace_Op);
       canvas->clipRect(gfx::RectToSkRect(deflated_layer_content_rect),
-                       SkRegion::kDifference_Op);
+                       kDifference_SkClipOp);
       canvas->drawColor(background_color_, SkXfermode::kSrc_Mode);
       canvas->restore();
     }
   }
 
   gfx::Rect layer_rect;
   if (is_scaled) {
     canvas->scale(SkFloatToScalar(contents_width_scale),
                   SkFloatToScalar(contents_height_scale));
 
@@ skipping 29 matching lines @@
 
 void ContentLayerUpdater::SetFillsBoundsCompletely(bool fills_bounds) {
   layer_fills_bounds_completely_ = fills_bounds;
 }
 
 void ContentLayerUpdater::SetBackgroundColor(SkColor background_color) {
   background_color_ = background_color;
 }
 
 }  // namespace cc