Always inline SkFloatToFixed_arm.

include/core/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
 
@@ skipping 89 matching lines @@
 #ifdef SkLONGLONG
     inline SkFixed SkFixedMul_longlong(SkFixed a, SkFixed b)
     {
         return (SkFixed)((int64_t)a * b >> 16);
     }
     #define SkFixedMul(a,b)     SkFixedMul_longlong(a,b)
 #endif
 
 #if defined(SK_CPU_ARM)
     /* This guy does not handle NaN or other obscurities, but is faster than
-       than (int)(x*65536)
+       than (int)(x*65536).  When built on Android with -Os, needs forcing
+       to inline or we lose the speed benefit.
     */
-    inline SkFixed SkFloatToFixed_arm(float x)
+    SK_ALWAYS_INLINE SkFixed SkFloatToFixed_arm(float x)
     {
         int32_t y, z;
         asm("movs    %1, %3, lsl #1         \n"
             "mov     %2, #0x8E              \n"
             "sub     %1, %2, %1, lsr #24    \n"
             "mov     %2, %3, lsl #8         \n"
             "orr     %2, %2, #0x80000000    \n"
             "mov     %1, %2, lsr %1         \n"
             "it cs                          \n"
             "rsbcs   %1, %1, #0             \n"
@@ skipping 32 matching lines @@
 
 #define SkIntToFixed48(x)       ((SkFixed48)(x) << 48)
 #define SkFixed48ToInt(x)       ((int)((x) >> 48))
 #define SkFixedToFixed48(x)     ((SkFixed48)(x) << 32)
 #define SkFixed48ToFixed(x)     ((SkFixed)((x) >> 32))
 #define SkFloatToFixed48(x)     ((SkFixed48)((x) * (65536.0f * 65536.0f * 65536.0f)))
 
 #define SkScalarToFixed48(x)    SkFloatToFixed48(x)
 
 #endif