Revert of Add nine patch type to SkRRect.

tests/RoundRectTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkMatrix.h"
 #include "SkRRect.h"
 #include "Test.h"
@@ skipping 42 matching lines @@
 
     SkRRect rr1;
     rr1.setRect(rect);
 
     REPORTER_ASSERT(reporter, SkRRect::kRect_Type == rr1.type());
     REPORTER_ASSERT(reporter, rr1.rect() == rect);
 
     for (int i = 0; i < 4; ++i) {
         REPORTER_ASSERT(reporter, zeroPt == rr1.radii((SkRRect::Corner) i));
     }
-    SkRRect rr1_2; // construct the same RR using the most general set function
-    SkVector rr1_2_radii[4] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
-    rr1_2.setRectRadii(rect, rr1_2_radii);
-    REPORTER_ASSERT(reporter, rr1_2 == rr1 && rr1_2.getType() == rr1.getType());
-    SkRRect rr1_3;  // construct the same RR using the nine patch set function
-    rr1_3.setNinePatch(rect, 0, 0, 0, 0);
-    REPORTER_ASSERT(reporter, rr1_3 == rr1 && rr1_3.getType() == rr1.getType());
 
     //----
     SkPoint halfPoint = { SkScalarHalf(kWidth), SkScalarHalf(kHeight) };
     SkRRect rr2;
     rr2.setOval(rect);
 
     REPORTER_ASSERT(reporter, SkRRect::kOval_Type == rr2.type());
     REPORTER_ASSERT(reporter, rr2.rect() == rect);
 
     for (int i = 0; i < 4; ++i) {
         REPORTER_ASSERT(reporter,
                         rr2.radii((SkRRect::Corner) i).equalsWithinTolerance(halfPoint));
     }
-    SkRRect rr2_2;  // construct the same RR using the most general set function
-    SkVector rr2_2_radii[4] = { { halfPoint.fX, halfPoint.fY }, { halfPoint.fX, halfPoint.fY },
-                                { halfPoint.fX, halfPoint.fY }, { halfPoint.fX, halfPoint.fY } };
-    rr2_2.setRectRadii(rect, rr2_2_radii);
-    REPORTER_ASSERT(reporter, rr2_2 == rr2 && rr2_2.getType() == rr2.getType());
-    SkRRect rr2_3;  // construct the same RR using the nine patch set function
-    rr2_3.setNinePatch(rect, halfPoint.fX, halfPoint.fY, halfPoint.fX, halfPoint.fY);
-    REPORTER_ASSERT(reporter, rr2_3 == rr2 && rr2_3.getType() == rr2.getType());
 
     //----
     SkPoint p = { 5, 5 };
     SkRRect rr3;
     rr3.setRectXY(rect, p.fX, p.fY);
 
     REPORTER_ASSERT(reporter, SkRRect::kSimple_Type == rr3.type());
     REPORTER_ASSERT(reporter, rr3.rect() == rect);
 
     for (int i = 0; i < 4; ++i) {
         REPORTER_ASSERT(reporter, p == rr3.radii((SkRRect::Corner) i));
     }
-    SkRRect rr3_2; // construct the same RR using the most general set function
-    SkVector rr3_2_radii[4] = { { 5, 5 }, { 5, 5 }, { 5, 5 }, { 5, 5 } };
-    rr3_2.setRectRadii(rect, rr3_2_radii);
-    REPORTER_ASSERT(reporter, rr3_2 == rr3 && rr3_2.getType() == rr3.getType());
-    SkRRect rr3_3;  // construct the same RR using the nine patch set function
-    rr3_3.setNinePatch(rect, 5, 5, 5, 5);
-    REPORTER_ASSERT(reporter, rr3_3 == rr3 && rr3_3.getType() == rr3.getType());
 
     //----
-    SkRect ninePatchRadii = { 10, 9, 8, 7 };
+    SkPoint radii[4] = { { 5, 5 }, { 5, 5 }, { 5, 5 }, { 5, 5 } };
 
     SkRRect rr4;
-    rr4.setNinePatch(rect, ninePatchRadii.fLeft, ninePatchRadii.fTop, ninePatchRadii.fRight,
-                     ninePatchRadii.fBottom);
+    rr4.setRectRadii(rect, radii);
 
-    REPORTER_ASSERT(reporter, SkRRect::kNinePatch_Type == rr4.type());
+    REPORTER_ASSERT(reporter, SkRRect::kSimple_Type == rr4.type());
     REPORTER_ASSERT(reporter, rr4.rect() == rect);
 
-    SkPoint rquad[4];
-    ninePatchRadii.toQuad(rquad);
     for (int i = 0; i < 4; ++i) {
-        REPORTER_ASSERT(reporter, rquad[i] == rr4.radii((SkRRect::Corner) i));
+        REPORTER_ASSERT(reporter, radii[i] == rr4.radii((SkRRect::Corner) i));
     }
-    SkRRect rr4_2; // construct the same RR using the most general set function
-    SkVector rr4_2_radii[4] = { { 10, 9 }, { 8, 9 }, {8, 7 }, { 10, 7 } };
-    rr4_2.setRectRadii(rect, rr4_2_radii);
-    REPORTER_ASSERT(reporter, rr4_2 == rr4 && rr4_2.getType() == rr4.getType());
 
     //----
     SkPoint radii2[4] = { { 0, 0 }, { 0, 0 }, { 50, 50 }, { 20, 50 } };
 
     SkRRect rr5;
     rr5.setRectRadii(rect, radii2);
 
     REPORTER_ASSERT(reporter, SkRRect::kComplex_Type == rr5.type());
     REPORTER_ASSERT(reporter, rr5.rect() == rect);
 
     for (int i = 0; i < 4; ++i) {
         REPORTER_ASSERT(reporter, radii2[i] == rr5.radii((SkRRect::Corner) i));
     }
 
     // Test out == & !=
     REPORTER_ASSERT(reporter, empty != rr3);
-    REPORTER_ASSERT(reporter, rr3 != rr4);
+    REPORTER_ASSERT(reporter, rr3 == rr4);
     REPORTER_ASSERT(reporter, rr4 != rr5);
 }
 
 // Test out the cases when the RR degenerates to a rect
 static void test_round_rect_rects(skiatest::Reporter* reporter) {
     SkRect r;
 
     //----
     SkRRect empty;
 
@@ skipping 428 matching lines @@
 DEF_TEST(RoundRect, reporter) {
     test_round_rect_basic(reporter);
     test_round_rect_rects(reporter);
     test_round_rect_ovals(reporter);
     test_round_rect_general(reporter);
     test_round_rect_iffy_parameters(reporter);
     test_inset(reporter);
     test_round_rect_contains_rect(reporter);
     test_round_rect_transform(reporter);
 }