| Index: src/core/SkScan.h
|
| diff --git a/src/core/SkScan.h b/src/core/SkScan.h
|
| index 5989435d298489a11cbc04a9f4f45e606920b6da..0780e332a3b73195dbab49f594a405722566a381 100644
|
| --- a/src/core/SkScan.h
|
| +++ b/src/core/SkScan.h
|
| @@ -31,19 +31,8 @@ public:
|
|
|
| static void FillIRect(const SkIRect&, const SkRasterClip&, SkBlitter*);
|
| static void FillXRect(const SkXRect&, const SkRasterClip&, SkBlitter*);
|
| -#ifdef SK_SCALAR_IS_FIXED
|
| - static void FillRect(const SkRect& rect, const SkRasterClip& clip,
|
| - SkBlitter* blitter) {
|
| - SkScan::FillXRect(*(const SkXRect*)&rect, clip, blitter);
|
| - }
|
| - static void AntiFillRect(const SkRect& rect, const SkRasterClip& clip,
|
| - SkBlitter* blitter) {
|
| - SkScan::AntiFillXRect(*(const SkXRect*)&rect, clip, blitter);
|
| - }
|
| -#else
|
| static void FillRect(const SkRect&, const SkRasterClip&, SkBlitter*);
|
| static void AntiFillRect(const SkRect&, const SkRasterClip&, SkBlitter*);
|
| -#endif
|
| static void AntiFillXRect(const SkXRect&, const SkRasterClip&, SkBlitter*);
|
| static void FillPath(const SkPath&, const SkRasterClip&, SkBlitter*);
|
| static void AntiFillPath(const SkPath&, const SkRasterClip&, SkBlitter*);
|
| @@ -67,19 +56,8 @@ private:
|
|
|
| static void FillIRect(const SkIRect&, const SkRegion* clip, SkBlitter*);
|
| static void FillXRect(const SkXRect&, const SkRegion* clip, SkBlitter*);
|
| -#ifdef SK_SCALAR_IS_FIXED
|
| - static void FillRect(const SkRect& rect, const SkRegion* clip,
|
| - SkBlitter* blitter) {
|
| - SkScan::FillXRect(*(const SkXRect*)&rect, clip, blitter);
|
| - }
|
| - static void AntiFillRect(const SkRect& rect, const SkRegion* clip,
|
| - SkBlitter* blitter) {
|
| - SkScan::AntiFillXRect(*(const SkXRect*)&rect, clip, blitter);
|
| - }
|
| -#else
|
| static void FillRect(const SkRect&, const SkRegion* clip, SkBlitter*);
|
| static void AntiFillRect(const SkRect&, const SkRegion* clip, SkBlitter*);
|
| -#endif
|
| static void AntiFillXRect(const SkXRect&, const SkRegion*, SkBlitter*);
|
| static void FillPath(const SkPath&, const SkRegion& clip, SkBlitter*);
|
| static void AntiFillPath(const SkPath&, const SkRegion& clip, SkBlitter*,
|
|
|