Mozart: The great RectF-ication.

mojo/skia/type_converters.h

Index: mojo/skia/type_converters.h
diff --git a/mojo/skia/type_converters.h b/mojo/skia/type_converters.h
index 6f18878b68f2c2f4bf2acfae5cff0591754d7faa..1532f13334ac26ffc9ad5c1215f75eed04b14682 100644
--- a/mojo/skia/type_converters.h
+++ b/mojo/skia/type_converters.h
@@ -14,30 +14,48 @@
 namespace mojo {
 
 template <>
-struct TypeConverter<SkPoint, mojo::Point> {
-  static SkPoint Convert(const mojo::Point& input);
+struct TypeConverter<SkIPoint, mojo::Point> {
+  static SkIPoint Convert(const mojo::Point& input);
 };
 template <>
-struct TypeConverter<mojo::Point, SkPoint> {
-  static mojo::Point Convert(const SkPoint& input);
+struct TypeConverter<mojo::Point, SkIPoint> {
+  static mojo::Point Convert(const SkIPoint& input);
 };
 
 template <>
-struct TypeConverter<SkRect, mojo::Rect> {
-  static SkRect Convert(const mojo::Rect& input);
+struct TypeConverter<SkPoint, mojo::PointF> {
+  static SkPoint Convert(const mojo::PointF& input);
 };
 template <>
-struct TypeConverter<mojo::Rect, SkRect> {
-  static mojo::Rect Convert(const SkRect& input);
+struct TypeConverter<mojo::PointF, SkPoint> {
+  static mojo::PointF Convert(const SkPoint& input);
 };
 
 template <>
-struct TypeConverter<SkRRect, mojo::RRect> {
-  static SkRRect Convert(const mojo::RRect& input);
+struct TypeConverter<SkIRect, mojo::Rect> {
+  static SkIRect Convert(const mojo::Rect& input);
 };
 template <>
-struct TypeConverter<mojo::RRect, SkRRect> {
-  static mojo::RRect Convert(const SkRRect& input);
+struct TypeConverter<mojo::Rect, SkIRect> {
+  static mojo::Rect Convert(const SkIRect& input);
+};
+
+template <>
+struct TypeConverter<SkRect, mojo::RectF> {
+  static SkRect Convert(const mojo::RectF& input);
+};
+template <>
+struct TypeConverter<mojo::RectF, SkRect> {
+  static mojo::RectF Convert(const SkRect& input);
+};
+
+template <>
+struct TypeConverter<SkRRect, mojo::RRectF> {
+  static SkRRect Convert(const mojo::RRectF& input);
+};
+template <>
+struct TypeConverter<mojo::RRectF, SkRRect> {
+  static mojo::RRectF Convert(const SkRRect& input);
 };
 
 // Note: This transformation is lossy since Transform is 4x4 whereas