Revert of Convert BBH APIs to use SkRect.

tests/RTreeTest.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 "SkRTree.h"
 #include "SkRandom.h"
 #include "SkTSort.h"
 #include "Test.h"
 
 static const size_t MIN_CHILDREN = 6;
 static const size_t MAX_CHILDREN = 11;
 
 static const int NUM_RECTS = 200;
 static const size_t NUM_ITERATIONS = 100;
 static const size_t NUM_QUERIES = 50;
 
 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, 1000);
-        rect.fRight  = rand.nextRangeF(0, 1000);
-        rect.fTop    = rand.nextRangeF(0, 1000);
-        rect.fBottom = rand.nextRangeF(0, 1000);
+        rect.fLeft   = rand.nextS() % 1000;
+        rect.fRight  = rand.nextS() % 1000;
+        rect.fTop    = rand.nextS() % 1000;
+        rect.fBottom = rand.nextS() % 1000;
         rect.sort();
     }
     return rect;
 }
 
 static void random_data_rects(SkRandom& rand, DataRect out[], int n) {
     for (int i = 0; i < n; ++i) {
         out[i].rect = random_rect(rand);
         out[i].data = reinterpret_cast<void*>(i);
     }
 }
 
-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);
         }
     }
 
     if (expected.count() != found.count()) {
         return false;
     }
 
     if (0 == expected.count()) {
         return true;
     }
 
     // Just cast to long since sorting by the value of the void*'s was being problematic...
     SkTQSort(reinterpret_cast<long*>(expected.begin()),
              reinterpret_cast<long*>(expected.end() - 1));
     SkTQSort(reinterpret_cast<long*>(found.begin()),
              reinterpret_cast<long*>(found.end() - 1));
     return found == expected;
 }
 
 static void run_queries(skiatest::Reporter* reporter, SkRandom& rand, DataRect rects[],
                        SkRTree& 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));
     }
 }
 
 static void rtree_test_main(SkRTree* rtree, skiatest::Reporter* reporter) {
     DataRect rects[NUM_RECTS];
     SkRandom rand;
     REPORTER_ASSERT(reporter, NULL != rtree);
 
@@ skipping 56 matching lines @@
 DEF_TEST(RTree, reporter) {
     SkRTree* rtree = SkRTree::Create(MIN_CHILDREN, MAX_CHILDREN);
     SkAutoUnref au(rtree);
     rtree_test_main(rtree, reporter);
 
     // Rtree that orders input rectangles on deferred insert.
     SkRTree* unsortedRtree = SkRTree::Create(MIN_CHILDREN, MAX_CHILDREN, 1, false);
     SkAutoUnref auo(unsortedRtree);
     rtree_test_main(unsortedRtree, reporter);
 }