BBHs: void* data -> unsigned data

tests/RecordDrawTest.cpp

Index: tests/RecordDrawTest.cpp
diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp
index 33efbd83adc9e352972b35cf47698aeafe2dc797..ff721394fd244e6b577b067b00ddabc18529fc5f 100644
--- a/tests/RecordDrawTest.cpp
+++ b/tests/RecordDrawTest.cpp
@@ -98,21 +98,20 @@ DEF_TEST(RecordDraw_SetMatrixClobber, r) {
 }
 
 struct TestBBH : public SkBBoxHierarchy {
-    virtual void insert(void* data, const SkRect& bounds, bool defer) SK_OVERRIDE {
-        Entry e = { (uintptr_t)data, bounds };
+    virtual void insert(unsigned data, const SkRect& bounds, bool defer) SK_OVERRIDE {
+        Entry e = { data, bounds };
         entries.push(e);
     }
     virtual int getCount() const SK_OVERRIDE { return entries.count(); }
 
     virtual void flushDeferredInserts() SK_OVERRIDE {}
 
-    virtual void search(const SkRect& query, SkTDArray<void*>* results) const SK_OVERRIDE {}
+    virtual void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE {}
     virtual void clear() SK_OVERRIDE {}
-    virtual void rewindInserts() SK_OVERRIDE {}
     virtual int getDepth() const SK_OVERRIDE { return -1; }
 
     struct Entry {
-        uintptr_t data;
+        unsigned data;
         SkRect bounds;
     };

[robertphillips, 2014/10/02 12:27:35]

fEntries ?

[mtklein, 2014/10/02 14:32:09]

Done.

     SkTDArray<Entry> entries;
@@ -142,7 +141,7 @@ DEF_TEST(RecordDraw_BBH, r) {
 
     REPORTER_ASSERT(r, bbh.entries.count() == 5);
     for (int i = 0; i < bbh.entries.count(); i++) {
-        REPORTER_ASSERT(r, bbh.entries[i].data == (uintptr_t)i);
+        REPORTER_ASSERT(r, bbh.entries[i].data == (unsigned)i);
 
         REPORTER_ASSERT(r, sloppy_rect_eq(SkRect::MakeWH(400, 480), bbh.entries[i].bounds));
     }