ui: Add SkIRectToRect() function to convert from SkIRect type to gfx::Rect.

cc/region.h

 // 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.
 
 #ifndef CC_REGION_H_
 #define CC_REGION_H_
 
 #include <string>
 
 #include "base/logging.h"
 #include "cc/cc_export.h"
 #include "third_party/skia/include/core/SkRegion.h"
+#include "ui/gfx/skia_util.h"

[danakj, 2012/11/11 18:57:02]

sort order

[tfarina, 2012/11/11 19:58:15]

Done.

 #include "ui/gfx/rect.h"
 
 namespace cc {
 
 class CC_EXPORT Region {
  public:
   Region();
   Region(const Region& region);
   Region(gfx::Rect rect);
   ~Region();
@@ skipping 12 matching lines @@
   bool Intersects(gfx::Rect rect) const;
   bool Intersects(const Region& region) const;
 
   void Subtract(gfx::Rect rect);
   void Subtract(const Region& region);
   void Union(gfx::Rect rect);
   void Union(const Region& region);
   void Intersect(gfx::Rect rect);
   void Intersect(const Region& region);
 
-  bool Equals(const Region& other) const { return skregion_ == other.skregion_; }
+  bool Equals(const Region& other) const;

[danakj, 2012/11/11 18:57:02]

Why moved?

[tfarina, 2012/11/11 19:43:25]

For two reasons:

- To be consistent with the above method declarations
- Because it was using more than 80 columns, ok, that is not a good reason
because I could have wrapped as:
bool Equals(const Region& other) const {
  return skregion_ == other.skregion_;
}

But I felt it would be nicer to have everything declared in the header and
everything defined/implemented in the source.

I can revert if you are strong about this though.

[danakj, 2012/11/11 19:45:45]

Ya, I'd rather keep simple methods like that in the header.

[tfarina, 2012/11/11 19:58:15]

Done.

 
   gfx::Rect bounds() const {
-    SkIRect r = skregion_.getBounds();
-    // TODO(danakj) Use method from ui/gfx/skia_utils.h when it exists.
-    return gfx::Rect(r.x(), r.y(), r.width(), r.height());
+    return gfx::SkIRectToRect(skregion_.getBounds());
   }
 
   std::string ToString() const;
 
   class CC_EXPORT Iterator {
    public:
     Iterator(const Region& region);
     ~Iterator();
 
     gfx::Rect rect() const {
-      SkIRect r = it_.rect();
-      // TODO(danakj) Use method from ui/gfx/skia_utils.h when it exists.
-      return gfx::Rect(r.x(), r.y(), r.width(), r.height());
+      return gfx::SkIRectToRect(it_.rect());
     }
 
     void next() {
       it_.next();
     }
+
     bool has_rect() const {
       return !it_.done();
     }
 
    private:
     SkRegion::Iterator it_;
   };
 
  private:
   SkRegion skregion_;
@@ skipping 39 matching lines @@
 
 inline Region UnionRegions(const Region& a, gfx::Rect b) {
   Region result = a;
   result.Union(b);
   return result;
 }
 
 }  // namespace cc
 
 #endif  // CC_REGION_H_