mac: Use NSWidth() and friends in a few more places.

No intended behavior change.

BUG=none
TEST=none
TBR=owners

Review URL: https://chromiumcodereview.appspot.com/10545050

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141084 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 9 deletions

diff --git a/skia/ext/canvas_paint_mac.h b/skia/ext/canvas_paint_mac.h
index 1f5ff03..441af82 100644
--- a/skia/ext/canvas_paint_mac.h
+++ b/skia/ext/canvas_paint_mac.h
@@ -74,7 +74,7 @@ class CanvasPaintT : public T {
   // Returns true if the invalid region is empty. The caller should call this
   // function to determine if anything needs painting.
   bool is_empty() const {
-    return rectangle_.size.width == 0 || rectangle_.size.height == 0;
+    return NSIsEmptyRect(rectangle_);
   }
 
   const NSRect& rectangle() const {
@@ -84,8 +84,8 @@ class CanvasPaintT : public T {
  private:
   void init(bool opaque) {
     PlatformCanvas* canvas = GetPlatformCanvas(this);
-    if (!canvas->initialize(rectangle_.size.width,
-                            rectangle_.size.height,
+    if (!canvas->initialize(NSWidth(rectangle_),
+                            NSHeight(rectangle_),
                             opaque, NULL)) {
       // Cause a deliberate crash;
       *(volatile char*) 0 = 0;
@@ -94,8 +94,8 @@ class CanvasPaintT : public T {
 
     // Need to translate so that the dirty region appears at the origin of the
     // surface.
-    canvas->translate(-SkDoubleToScalar(rectangle_.origin.x),
-                      -SkDoubleToScalar(rectangle_.origin.y));
+    canvas->translate(-SkDoubleToScalar(NSMinX(rectangle_)),
+                      -SkDoubleToScalar(NSMinY(rectangle_)));
 
     context_ = GetBitmapContext(GetTopDevice(*canvas));
   }
diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm
index d8af9d0..0d0eb1e 100644
--- a/skia/ext/skia_utils_mac.mm
+++ b/skia/ext/skia_utils_mac.mm
@@ -138,10 +138,7 @@ CGAffineTransform SkMatrixToCGAffineTransform(const SkMatrix& matrix) {
 
 SkRect CGRectToSkRect(const CGRect& rect) {
   SkRect sk_rect = {
-    rect.origin.x,
-    rect.origin.y,
-    rect.origin.x + rect.size.width,
-    rect.origin.y + rect.size.height,
+    rect.origin.x, rect.origin.y, CGRectGetMaxX(rect), CGRectGetMaxY(rect)
   };
   return sk_rect;
 }