| Index: src/core/SkBBHFactory.cpp
|
| diff --git a/src/core/SkBBHFactory.cpp b/src/core/SkBBHFactory.cpp
|
| index 4b9ae558e2c4317c077620cb3ece471c28513382..22f816c4d9570b7760d64c198bde853f470320c7 100644
|
| --- a/src/core/SkBBHFactory.cpp
|
| +++ b/src/core/SkBBHFactory.cpp
|
| @@ -9,20 +9,15 @@
|
| #include "SkRTree.h"
|
| #include "SkTileGrid.h"
|
|
|
| -SkBBoxHierarchy* SkRTreeFactory::operator()(const SkRect& bounds) const {
|
| - SkScalar aspectRatio = bounds.width() / bounds.height();
|
| +
|
| +SkBBoxHierarchy* SkRTreeFactory::operator()(int width, int height) const {
|
| + SkScalar aspectRatio = SkScalarDiv(SkIntToScalar(width), SkIntToScalar(height));
|
| return SkNEW_ARGS(SkRTree, (aspectRatio));
|
| }
|
|
|
| -SkBBoxHierarchy* SkTileGridFactory::operator()(const SkRect& bounds) const {
|
| +SkBBoxHierarchy* SkTileGridFactory::operator()(int width, int height) const {
|
| SkASSERT(fInfo.fMargin.width() >= 0);
|
| SkASSERT(fInfo.fMargin.height() >= 0);
|
| -
|
| - // We want a conservative answer for the size...
|
| - const SkIRect ibounds = bounds.roundOut();
|
| - const int width = ibounds.width();
|
| - const int height = ibounds.height();
|
| -
|
| // Note: SkIRects are non-inclusive of the right() column and bottom() row.
|
| // For example, an SkIRect at 0,0 with a size of (1,1) will only have
|
| // content at pixel (0,0) and will report left=0 and right=1, hence the
|
|
|