| Index: src/core/SkRTree.cpp
|
| diff --git a/src/core/SkRTree.cpp b/src/core/SkRTree.cpp
|
| index 77f94e2eed68fe1cdd622158ce1a9b80390d17ee..17872badc398e34c1f46f3061f44100ddb468ace 100644
|
| --- a/src/core/SkRTree.cpp
|
| +++ b/src/core/SkRTree.cpp
|
| @@ -75,7 +75,7 @@ void SkRTree::insert(void* data, const SkRect& fbounds, bool defer) {
|
| Branch* newSibling = insert(fRoot.fChild.subtree, &newBranch);
|
| fRoot.fBounds = this->computeBounds(fRoot.fChild.subtree);
|
|
|
| - if (NULL != newSibling) {
|
| + if (newSibling) {
|
| Node* oldRoot = fRoot.fChild.subtree;
|
| Node* newRoot = this->allocateNode(oldRoot->fLevel + 1);
|
| newRoot->fNumChildren = 2;
|
| @@ -143,7 +143,7 @@ SkRTree::Branch* SkRTree::insert(Node* root, Branch* branch, uint16_t level) {
|
| root->child(childIndex)->fBounds = this->computeBounds(
|
| root->child(childIndex)->fChild.subtree);
|
| }
|
| - if (NULL != toInsert) {
|
| + if (toInsert) {
|
| if (root->fNumChildren == fMaxChildren) {
|
| // handle overflow by splitting. TODO: opportunistic reinsertion
|
|
|
|
|