BBHs: void* data -> unsigned data

tests/RecordDrawTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 #include "RecordTestUtils.h"
 
@@ skipping 80 matching lines @@
     setMatrix = assert_type<SkRecords::SetMatrix>(r, translateRecord, 0);
     REPORTER_ASSERT(r, setMatrix->matrix == translate);
 
     setMatrix = assert_type<SkRecords::SetMatrix>(r, translateRecord, 2);
     SkMatrix expected = scale;
     expected.postConcat(translate);
     REPORTER_ASSERT(r, setMatrix->matrix == expected);
 }
 
 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;
 };
 
 // Like a==b, with a little slop recognizing that float equality can be weird.
 static bool sloppy_rect_eq(SkRect a, SkRect b) {
     SkRect inset(a), outset(a);
     inset.inset(1, 1);
     outset.outset(1, 1);
     return outset.contains(b) && !inset.contains(b);
 }
 
 // This test is not meant to make total sense yet.  It's testing the status quo
 // of SkRecordFillBounds(), which itself doesn't make total sense yet.
 DEF_TEST(RecordDraw_BBH, r) {
     SkRecord record;
     SkRecorder recorder(&record, W, H);
     recorder.save();
         recorder.clipRect(SkRect::MakeWH(400, 500));
         recorder.scale(2, 2);
         recorder.drawRect(SkRect::MakeWH(320, 240), SkPaint());
     recorder.restore();
 
     TestBBH bbh;
     SkRecordFillBounds(record, &bbh);
 
     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));
     }
 }
 
 // A regression test for crbug.com/409110.
 DEF_TEST(RecordDraw_TextBounds, r) {
     SkRecord record;
     SkRecorder recorder(&record, W, H);
 
@@ skipping 95 matching lines @@
     // The second bug showed up as adjusting the picture bounds (0,0,50,50) by the drop shadow too.
     // The saveLayer, clipRect, and restore bounds were incorrectly (0,0,70,50).
     TestBBH bbh;
     SkRecordFillBounds(record, &bbh);
     REPORTER_ASSERT(r, bbh.entries.count() == 4);
     REPORTER_ASSERT(r, sloppy_rect_eq(bbh.entries[0].bounds, SkRect::MakeLTRB(0, 0, 50, 50)));
     REPORTER_ASSERT(r, sloppy_rect_eq(bbh.entries[1].bounds, SkRect::MakeLTRB(0, 0, 50, 50)));
     REPORTER_ASSERT(r, sloppy_rect_eq(bbh.entries[2].bounds, SkRect::MakeLTRB(0, 0, 40, 40)));
     REPORTER_ASSERT(r, sloppy_rect_eq(bbh.entries[3].bounds, SkRect::MakeLTRB(0, 0, 50, 50)));
 }