Revert of Convert BBH APIs to use SkRect.

tests/BBoxHierarchyTest.cpp

Index: tests/BBoxHierarchyTest.cpp
diff --git a/tests/BBoxHierarchyTest.cpp b/tests/BBoxHierarchyTest.cpp
index b9cbbc4f9a14957a15d90b4bee9991beabefcafa..305543b7eb8f7c9803dfff7d9a5a31ac0e20ccea 100644
--- a/tests/BBoxHierarchyTest.cpp
+++ b/tests/BBoxHierarchyTest.cpp
@@ -17,20 +17,20 @@
 static const size_t NUM_ITERATIONS = 100;
 static const size_t NUM_QUERIES = 50;
 
-static const SkScalar MAX_SIZE = 1000.0f;
+static const int MAX_SIZE = 1000;
 
 struct DataRect {
-    SkRect rect;
+    SkIRect rect;
     void* data;
 };
 
-static SkRect random_rect(SkRandom& rand) {
-    SkRect rect = {0,0,0,0};
+static SkIRect random_rect(SkRandom& rand) {
+    SkIRect rect = {0,0,0,0};
     while (rect.isEmpty()) {
-        rect.fLeft   = rand.nextRangeF(0, MAX_SIZE);
-        rect.fRight  = rand.nextRangeF(0, MAX_SIZE);
-        rect.fTop    = rand.nextRangeF(0, MAX_SIZE);
-        rect.fBottom = rand.nextRangeF(0, MAX_SIZE);
+        rect.fLeft   = rand.nextS() % MAX_SIZE;
+        rect.fRight  = rand.nextS() % MAX_SIZE;
+        rect.fTop    = rand.nextS() % MAX_SIZE;
+        rect.fBottom = rand.nextS() % MAX_SIZE;
         rect.sort();
     }
     return rect;
@@ -43,15 +43,12 @@
     }
 }
 
-static bool verify_query(SkRect query, DataRect rects[],
+static bool verify_query(SkIRect query, DataRect rects[],
                          SkTDArray<void*>& found) {
-    // TODO(mtklein): no need to do this after everything's SkRects
-    query.roundOut();
-
     SkTDArray<void*> expected;
     // manually intersect with every rectangle
     for (int i = 0; i < NUM_RECTS; ++i) {
-        if (SkRect::Intersects(query, rects[i].rect)) {
+        if (SkIRect::IntersectsNoEmptyCheck(query, rects[i].rect)) {
             expected.push(rects[i].data);
         }
     }
@@ -76,7 +73,7 @@
                         SkBBoxHierarchy& tree) {
     for (size_t i = 0; i < NUM_QUERIES; ++i) {
         SkTDArray<void*> hits;
-        SkRect query = random_rect(rand);
+        SkIRect query = random_rect(rand);
         tree.search(query, &hits);
         REPORTER_ASSERT(reporter, verify_query(query, rects, hits));
     }