| Index: src/core/SkRTree.cpp
|
| diff --git a/src/core/SkRTree.cpp b/src/core/SkRTree.cpp
|
| index 77f94e2eed68fe1cdd622158ce1a9b80390d17ee..3985fb12859280f187774764df704ba1d0d51e07 100644
|
| --- a/src/core/SkRTree.cpp
|
| +++ b/src/core/SkRTree.cpp
|
| @@ -44,14 +44,7 @@
|
| this->clear();
|
| }
|
|
|
| -void SkRTree::insert(void* data, const SkRect& fbounds, bool defer) {
|
| - SkIRect bounds;
|
| - if (fbounds.isLargest()) {
|
| - bounds.setLargest();
|
| - } else {
|
| - fbounds.roundOut(&bounds);
|
| - }
|
| -
|
| +void SkRTree::insert(void* data, const SkIRect& bounds, bool defer) {
|
| this->validate();
|
| if (bounds.isEmpty()) {
|
| SkASSERT(false);
|
| @@ -109,9 +102,7 @@
|
| this->validate();
|
| }
|
|
|
| -void SkRTree::search(const SkRect& fquery, SkTDArray<void*>* results) const {
|
| - SkIRect query;
|
| - fquery.roundOut(&query);
|
| +void SkRTree::search(const SkIRect& query, SkTDArray<void*>* results) const {
|
| this->validate();
|
| SkASSERT(0 == fDeferredInserts.count()); // If this fails, you should have flushed.
|
| if (!this->isEmpty() && SkIRect::IntersectsNoEmptyCheck(fRoot.fBounds, query)) {
|
|
|