use ClipOp instead of SkRegion for clipping

gm/complexclip.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "gm.h"
 #include "SkCanvas.h"
 //#include "SkParsePath.h"
@@ skipping 113 matching lines @@
                 this->drawHairlines(canvas, path, clipA, clipB);
 
                 bool doInvA = SkToBool(invBits & 1);
                 bool doInvB = SkToBool(invBits & 2);
                 canvas->save();
                     // set clip
                     clipA.setFillType(doInvA ? SkPath::kInverseEvenOdd_FillType :
                                       SkPath::kEvenOdd_FillType);
                     clipB.setFillType(doInvB ? SkPath::kInverseEvenOdd_FillType :
                                       SkPath::kEvenOdd_FillType);
-                    canvas->clipPath(clipA, SkRegion::kIntersect_Op, fDoAAClip);
-                    canvas->clipPath(clipB, gOps[op].fOp, fDoAAClip);
+                    canvas->clipPath(clipA, kIntersect_SkClipOp, fDoAAClip);
+                    canvas->legacyClipPath(clipB, gOps[op].fOp, fDoAAClip);
 
                     // draw path clipped
                     canvas->drawPath(path, pathPaint);
                 canvas->restore();
 
 
                 SkScalar txtX = SkIntToScalar(45);
                 paint.setColor(gClipAColor);
                 const char* aTxt = doInvA ? "InvA " : "A ";
                 canvas->drawText(aTxt, strlen(aTxt), txtX, SkIntToScalar(220), paint);
@@ skipping 47 matching lines @@
 // aliased and anti-aliased w/ a layer
 static GM* gFact2(void*) { return new ComplexClipGM(false, true); }
 static GM* gFact3(void*) { return new ComplexClipGM(true, true); }
 
 static GMRegistry gReg0(gFact0);
 static GMRegistry gReg1(gFact1);
 static GMRegistry gReg2(gFact2);
 static GMRegistry gReg3(gFact3);
 
 }