remove 'deprecated' region from SkDraw

tests/AAClipTest.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 "SkAAClip.h"
 #include "SkCanvas.h"
 #include "SkMask.h"
 #include "SkPath.h"
 #include "SkRandom.h"
+#include "SkRasterClip.h"
 #include "SkRRect.h"
 #include "Test.h"
 
 static bool operator==(const SkMask& a, const SkMask& b) {
     if (a.fFormat != b.fFormat || a.fBounds != b.fBounds) {
         return false;
     }
     if (!a.fImage && !b.fImage) {
         return true;
     }
@@ skipping 312 matching lines @@
     // leaving just a rect.
     const SkIRect ir = SkIRect::MakeLTRB(10, -10, 50, 90);
 
     clip.op(ir, SkRegion::kIntersect_Op);
 
     REPORTER_ASSERT(reporter, clip.getBounds() == SkIRect::MakeLTRB(10, 0, 50, 90));
     // the clip recognized that that it is just a rect!
     REPORTER_ASSERT(reporter, clip.isRect());
 }
 
-#include "SkRasterClip.h"
-
-static void copyToMask(const SkRasterClip& rc, SkMask* mask) {
-    if (rc.isAA()) {
-        rc.aaRgn().copyToMask(mask);
-    } else {
-        copyToMask(rc.bwRgn(), mask);
-    }
-}
-
-static bool operator==(const SkRasterClip& a, const SkRasterClip& b) {
-    if (a.isEmpty()) {
-        return b.isEmpty();
-    }
-    if (b.isEmpty()) {
-        return false;
-    }
-
-    SkMask ma, mb;
-    copyToMask(a, &ma);
-    copyToMask(b, &mb);
-    SkAutoMaskFreeImage aCleanUp(ma.fImage);
-    SkAutoMaskFreeImage bCleanUp(mb.fImage);
-
-    return ma == mb;
-}
-
 static void did_dx_affect(skiatest::Reporter* reporter, const SkScalar dx[],
                           size_t count, bool changed) {
     const SkIRect baseBounds = SkIRect::MakeXYWH(0, 0, 10, 10);
     SkIRect ir = { 0, 0, 10, 10 };
 
     for (size_t i = 0; i < count; ++i) {
         SkRect r;
         r.set(ir);
 
         SkRasterClip rc0(ir);
@@ skipping 57 matching lines @@
     test_empty(reporter);
     test_path_bounds(reporter);
     test_irect(reporter);
     test_rgn(reporter);
     test_path_with_hole(reporter);
     test_regressions();
     test_nearly_integral(reporter);
     test_really_a_rect(reporter);
     test_crbug_422693(reporter);
 }