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

skia/ext/skia_utils_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "skia/ext/skia_utils_mac.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
@@ skipping 120 matching lines @@
   return CGAffineTransformMake(matrix[SkMatrix::kMScaleX],
                                matrix[SkMatrix::kMSkewY],
                                matrix[SkMatrix::kMSkewX],
                                matrix[SkMatrix::kMScaleY],
                                matrix[SkMatrix::kMTransX],
                                matrix[SkMatrix::kMTransY]);
 }
 
 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;
 }
 
 CGRect SkIRectToCGRect(const SkIRect& rect) {
   CGRect cg_rect = {
     { rect.fLeft, rect.fTop },
     { rect.fRight - rect.fLeft, rect.fBottom - rect.fTop }
   };
   return cg_rect;
@@ skipping 291 matching lines @@
   // Apply content matrix.
   SkMatrix skMatrix = canvas_->getTotalMatrix();
   skMatrix.postTranslate(-SkIntToScalar(pt.fX), -SkIntToScalar(pt.fY));
   CGAffineTransform affine = SkMatrixToCGAffineTransform(skMatrix);
   CGContextConcatCTM(cgContext_, affine);
   
   return cgContext_;
 }
 
 }  // namespace gfx