rename getBounds to getGlobalBounds, since it now takes the device's origin

into account. Remove unused intersects().



git-svn-id: http://skia.googlecode.com/svn/trunk@2193 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 3 insertions, 9 deletions

diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp
index 97722316db..69f86ccf52 100644
--- a/src/core/SkDevice.cpp
+++ b/src/core/SkDevice.cpp
@@ -83,19 +83,13 @@ const SkBitmap& SkDevice::accessBitmap(bool changePixels) {
     return fBitmap;
 }
 
-void SkDevice::getBounds(SkIRect* bounds) const {
+void SkDevice::getGlobalBounds(SkIRect* bounds) const {
     if (bounds) {
-        bounds->set(0, 0, fBitmap.width(), fBitmap.height());
+        bounds->setXYWH(fOrigin.x(), fOrigin.y(),
+                        fBitmap.width(), fBitmap.height());
     }
 }
 
-bool SkDevice::intersects(const SkIRect& r, SkIRect* sect) const {
-    SkIRect bounds;
-
-    this->getBounds(&bounds);
-    return sect ? sect->intersect(r, bounds) : SkIRect::Intersects(r, bounds);
-}
-
 void SkDevice::clear(SkColor color) {
     fBitmap.eraseColor(color);
 }