aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-02-10 13:44:27 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-02-10 13:44:27 -0800
commitbfd5bff75c0ce27a70f02e4b5578d66aa9d6e306 (patch)
treeb4da5ee57719399580225ca5c37c8a390f1c9373 /tests
parenta0921f2563701d54e4e022de99f2705f4ada8a6e (diff)
Simplify SkBBH::insert API
No one's exploiting the ability to take ownership of the array anymore. BUG=skia: Review URL: https://codereview.chromium.org/913833002
Diffstat (limited to 'tests')
-rw-r--r--tests/PictureTest.cpp2
-rw-r--r--tests/RTreeTest.cpp2
-rw-r--r--tests/RecordDrawTest.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 18af979954..33e058cc2e 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -1255,7 +1255,7 @@ struct CountingBBH : public SkBBoxHierarchy {
this->searchCalls++;
}
- void insert(SkAutoTMalloc<SkRect>*, int) SK_OVERRIDE {}
+ void insert(const SkRect[], int) SK_OVERRIDE {}
virtual size_t bytesUsed() const SK_OVERRIDE { return 0; }
};
diff --git a/tests/RTreeTest.cpp b/tests/RTreeTest.cpp
index 50eaacb603..16ccb4f508 100644
--- a/tests/RTreeTest.cpp
+++ b/tests/RTreeTest.cpp
@@ -80,7 +80,7 @@ DEF_TEST(RTree, reporter) {
rects[j] = random_rect(rand);
}
- rtree.insert(&rects, NUM_RECTS);
+ rtree.insert(rects.get(), NUM_RECTS);
SkASSERT(rects); // SkRTree doesn't take ownership of rects.
run_queries(reporter, rand, rects, rtree);
diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp
index 4e1ad15bf4..cf138b8d4e 100644
--- a/tests/RecordDrawTest.cpp
+++ b/tests/RecordDrawTest.cpp
@@ -123,10 +123,10 @@ DEF_TEST(RecordDraw_SetMatrixClobber, r) {
}
struct TestBBH : public SkBBoxHierarchy {
- void insert(SkAutoTMalloc<SkRect>* boundsArray, int N) SK_OVERRIDE {
+ void insert(const SkRect boundsArray[], int N) SK_OVERRIDE {
fEntries.setCount(N);
for (int i = 0; i < N; i++) {
- Entry e = { (unsigned)i, (*boundsArray)[i] };
+ Entry e = { (unsigned)i, boundsArray[i] };
fEntries[i] = e;
}
}