Reverse dependency between SkScalar.h and SkFixed.h

include/private/SkFixed.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkFixed_DEFINED
 #define SkFixed_DEFINED
 
+#include "SkScalar.h"
 #include "SkTypes.h"
 
 /** \file SkFixed.h
 
     Types and macros for 16.16 fixed point
 */
 
 /** 32 bit signed integer used to represent fractions values with 16 bits to the right of the decimal point
 */
 typedef int32_t             SkFixed;
@@ skipping 114 matching lines @@
     }
     #undef SkFixedMul
     #define SkFixedMul(x, y)        SkFixedMul_arm(x, y)
 
     #undef SkFloatToFixed
     #define SkFloatToFixed(x)  SkFloatToFixed_arm(x)
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
+#if SK_SCALAR_IS_FLOAT
+
+#define SkFixedToScalar(x)          SkFixedToFloat(x)
+#define SkScalarToFixed(x)          SkFloatToFixed(x)
+
+#else   // SK_SCALAR_IS_DOUBLE
+
+#define SkFixedToScalar(x)          SkFixedToDouble(x)
+#define SkScalarToFixed(x)          SkDoubleToFixed(x)
+
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+
 typedef int64_t SkFixed3232;   // 32.32
 
 #define SkIntToFixed3232(x)       (SkLeftShift((SkFixed3232)(x), 32))
 #define SkFixed3232ToInt(x)       ((int)((x) >> 32))
 #define SkFixedToFixed3232(x)     (SkLeftShift((SkFixed3232)(x), 16))
 #define SkFixed3232ToFixed(x)     ((SkFixed)((x) >> 16))
 #define SkFloatToFixed3232(x)     ((SkFixed3232)((x) * (65536.0f * 65536.0f)))
 
 #define SkScalarToFixed3232(x)    SkFloatToFixed3232(x)
 
 #endif