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

skia/ext/canvas_paint_mac.h

 
 // Copyright (c) 2011 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.
 
 #ifndef SKIA_EXT_CANVAS_PAINT_MAC_H_
 #define SKIA_EXT_CANVAS_PAINT_MAC_H_
 #pragma once
 
 #include "skia/ext/canvas_paint_common.h"
@@ skipping 56 matching lines @@
 
   // If true, the data painted into the CanvasPaintT is blended onto the current
   // context, else it is copied.
   void set_composite_alpha(bool composite_alpha) {
     composite_alpha_ = composite_alpha;
   }
 
   // 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 {
     return rectangle_;
   }
 
  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;
     }
     canvas->clear(SkColorSetARGB(0, 0, 0, 0));
 
     // 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));
   }
 
   CGContext* context_;
   NSRect rectangle_;
   // See description above setter.
   bool composite_alpha_;
 
   // Disallow copy and assign.
   CanvasPaintT(const CanvasPaintT&);
   CanvasPaintT& operator=(const CanvasPaintT&);
 };
 
 typedef CanvasPaintT<PlatformCanvas> PlatformCanvasPaint;
 
 }  // namespace skia
 
 
 #endif  // SKIA_EXT_CANVAS_PAINT_MAC_H_