aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/private/SkFixed.h
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2016-04-27 18:45:36 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-04-27 18:45:36 -0700
commit1541130b661c0851267782e2ab56dfee481f44c6 (patch)
tree19cc70371dd61735f7b9c4095938953b0cfa2689 /include/private/SkFixed.h
parent95416f477d2ca264f2fb065455e95778a2289a1d (diff)
remove SK_SUPPORT_LEGACY_DIVBITS_UB -- chrome no longer defines this
Diffstat (limited to 'include/private/SkFixed.h')
-rw-r--r--include/private/SkFixed.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/include/private/SkFixed.h b/include/private/SkFixed.h
index c90d5e9ffd..dade2399d1 100644
--- a/include/private/SkFixed.h
+++ b/include/private/SkFixed.h
@@ -98,14 +98,9 @@ static inline SkFixed SkDoublePinToFixed(double x) {
#define SkFixedAbs(x) SkAbs32(x)
#define SkFixedAve(a, b) (((a) + (b)) >> 1)
-// Blink layout tests are baselined to Clang optimizing through undefined behavior in SkDivBits.
-#if defined(SK_SUPPORT_LEGACY_DIVBITS_UB)
- #define SkFixedDiv(numer, denom) SkDivBits(numer, denom, 16)
-#else
- // The divide may exceed 32 bits. Clamp to a signed 32 bit result.
- #define SkFixedDiv(numer, denom) \
- SkToS32(SkTPin<int64_t>((SkLeftShift((int64_t)numer, 16) / denom), SK_MinS32, SK_MaxS32))
-#endif
+// The divide may exceed 32 bits. Clamp to a signed 32 bit result.
+#define SkFixedDiv(numer, denom) \
+ SkToS32(SkTPin<int64_t>((SkLeftShift((int64_t)numer, 16) / denom), SK_MinS32, SK_MaxS32))
//////////////////////////////////////////////////////////////////////////////////////////////////////
// Now look for ASM overrides for our portable versions (should consider putting this in its own file)