ubsan shift fixes

src/core/SkFDot6.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 SkFDot6_DEFINED
@@ skipping 38 matching lines @@
     #define SkIntToFDot6(x) ((x) << 6)
 #endif
 
 #define SkFDot6Floor(x)     ((x) >> 6)
 #define SkFDot6Ceil(x)      (((x) + 63) >> 6)
 #define SkFDot6Round(x)     (((x) + 32) >> 6)
 
 #define SkFixedToFDot6(x)   ((x) >> 10)
 
 inline SkFixed SkFDot6ToFixed(SkFDot6 x) {
-    SkASSERT((x << 10 >> 10) == x);
+    SkASSERT((SkLeftShift(x, 10) >> 10) == x);
 
-    return x << 10;
+    return SkLeftShift(x, 10);
 }
 
 #define SkScalarToFDot6(x)  (SkFDot6)((x) * 64)
 #define SkFDot6ToScalar(x)  ((SkScalar)(x) * 0.015625f)
 
 inline SkFixed SkFDot6Div(SkFDot6 a, SkFDot6 b) {
     SkASSERT(b != 0);
 
     if (a == (int16_t)a) {
-        return (a << 16) / b;
+        return SkLeftShift(a, 16) / b;
     } else {
         return SkFixedDiv(a, b);
     }
 }
 
 #endif