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

skia/ext/vector_canvas_unittest.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 "build/build_config.h"
 
 #if !defined(OS_WIN)
 #include <unistd.h>
 #endif
 
@@ skipping 830 matching lines @@
   SkPath path;
   path.addCircle(20, 20, 10);
   vcanvas_->clipPath(path);
   pcanvas_->clipPath(path);
 
   vcanvas_->drawBitmap(bitmap, 14, 3, NULL);
   pcanvas_->drawBitmap(bitmap, 14, 3, NULL);
   EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("path")));
 }
 
-TEST_F(VectorCanvasTest, ClippingCombined) {
-  SkBitmap bitmap;
-  LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap,
-                        true);
-
-  SkRect rect;
-  rect.fLeft = 2;
-  rect.fTop = 2;
-  rect.fRight = 30.5f;
-  rect.fBottom = 30.5f;
-  vcanvas_->clipRect(rect);
-  pcanvas_->clipRect(rect);
-  SkPath path;
-  path.addCircle(20, 20, 10);
-  vcanvas_->clipPath(path, SkRegion::kUnion_Op);
-  pcanvas_->clipPath(path, SkRegion::kUnion_Op);
-
-  vcanvas_->drawBitmap(bitmap, 15, 3, NULL);
-  pcanvas_->drawBitmap(bitmap, 15, 3, NULL);
-  EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("combined")));
-}
-
 TEST_F(VectorCanvasTest, ClippingIntersect) {
   SkBitmap bitmap;
   LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap,
                         true);
 
   SkRect rect;
   rect.fLeft = 2;
   rect.fTop = 2;
   rect.fRight = 30.5f;
   rect.fBottom = 30.5f;
@@ skipping 78 matching lines @@
     pcanvas_->rotate(67);
     vcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     pcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("rotate")));
   }
 }
 
 #endif  // !defined(USE_AURA)
 
 }  // namespace skia