Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1287)

Unified Diff: third_party/WebKit/Source/wtf/SaturatedArithmetic.h

Issue 1611343002: wtf reformat test Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pydent Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/wtf/SaturatedArithmetic.h
diff --git a/third_party/WebKit/Source/wtf/SaturatedArithmetic.h b/third_party/WebKit/Source/wtf/SaturatedArithmetic.h
index a627b532ddc9e310b6210422ed4bd847cec7a7dd..35aa80d3b10995e11123aac20ad1f813787bda5e 100644
--- a/third_party/WebKit/Source/wtf/SaturatedArithmetic.h
+++ b/third_party/WebKit/Source/wtf/SaturatedArithmetic.h
@@ -43,79 +43,72 @@
#else
-ALWAYS_INLINE int32_t saturatedAddition(int32_t a, int32_t b)
-{
- uint32_t ua = a;
- uint32_t ub = b;
- uint32_t result = ua + ub;
+ALWAYS_INLINE int32_t saturatedAddition(int32_t a, int32_t b) {
+ uint32_t ua = a;
+ uint32_t ub = b;
+ uint32_t result = ua + ub;
- // Can only overflow if the signed bit of the two values match. If the
- // signed bit of the result and one of the values differ it overflowed.
+ // Can only overflow if the signed bit of the two values match. If the
+ // signed bit of the result and one of the values differ it overflowed.
- if (~(ua ^ ub) & (result ^ ua) & (1 << 31))
- return std::numeric_limits<int>::max() + (ua >> 31);
+ if (~(ua ^ ub) & (result ^ ua) & (1 << 31))
+ return std::numeric_limits<int>::max() + (ua >> 31);
- return result;
+ return result;
}
-ALWAYS_INLINE int32_t saturatedSubtraction(int32_t a, int32_t b)
-{
- uint32_t ua = a;
- uint32_t ub = b;
- uint32_t result = ua - ub;
+ALWAYS_INLINE int32_t saturatedSubtraction(int32_t a, int32_t b) {
+ uint32_t ua = a;
+ uint32_t ub = b;
+ uint32_t result = ua - ub;
- // Can only overflow if the signed bit of the two input values differ. If
- // the signed bit of the result and the first value differ it overflowed.
+ // Can only overflow if the signed bit of the two input values differ. If
+ // the signed bit of the result and the first value differ it overflowed.
- if ((ua ^ ub) & (result ^ ua) & (1 << 31))
- return std::numeric_limits<int>::max() + (ua >> 31);
+ if ((ua ^ ub) & (result ^ ua) & (1 << 31))
+ return std::numeric_limits<int>::max() + (ua >> 31);
- return result;
+ return result;
}
-inline int getMaxSaturatedSetResultForTesting(int FractionalShift)
-{
- // For C version the set function maxes out to max int, this differs from
- // the ARM asm version, see SaturatedArithmetiARM.h for the equivalent asm
- // version.
- return std::numeric_limits<int>::max();
+inline int getMaxSaturatedSetResultForTesting(int FractionalShift) {
+ // For C version the set function maxes out to max int, this differs from
+ // the ARM asm version, see SaturatedArithmetiARM.h for the equivalent asm
+ // version.
+ return std::numeric_limits<int>::max();
}
-inline int getMinSaturatedSetResultForTesting(int FractionalShift)
-{
- return std::numeric_limits<int>::min();
+inline int getMinSaturatedSetResultForTesting(int FractionalShift) {
+ return std::numeric_limits<int>::min();
}
template <int FractionalShift>
-ALWAYS_INLINE int saturatedSet(int value)
-{
- const int intMaxForLayoutUnit =
- std::numeric_limits<int>::max() >> FractionalShift;
+ALWAYS_INLINE int saturatedSet(int value) {
+ const int intMaxForLayoutUnit =
+ std::numeric_limits<int>::max() >> FractionalShift;
- const int intMinForLayoutUnit =
- std::numeric_limits<int>::min() >> FractionalShift;
+ const int intMinForLayoutUnit =
+ std::numeric_limits<int>::min() >> FractionalShift;
- if (value > intMaxForLayoutUnit)
- return std::numeric_limits<int>::max();
+ if (value > intMaxForLayoutUnit)
+ return std::numeric_limits<int>::max();
- if (value < intMinForLayoutUnit)
- return std::numeric_limits<int>::min();
+ if (value < intMinForLayoutUnit)
+ return std::numeric_limits<int>::min();
- return value << FractionalShift;
+ return value << FractionalShift;
}
-
template <int FractionalShift>
-ALWAYS_INLINE int saturatedSet(unsigned value)
-{
- const unsigned intMaxForLayoutUnit =
- std::numeric_limits<int>::max() >> FractionalShift;
+ALWAYS_INLINE int saturatedSet(unsigned value) {
+ const unsigned intMaxForLayoutUnit =
+ std::numeric_limits<int>::max() >> FractionalShift;
- if (value >= intMaxForLayoutUnit)
- return std::numeric_limits<int>::max();
+ if (value >= intMaxForLayoutUnit)
+ return std::numeric_limits<int>::max();
- return value << FractionalShift;
+ return value << FractionalShift;
}
-#endif // CPU(ARM) && COMPILER(GCC)
-#endif // SaturatedArithmetic_h
+#endif // CPU(ARM) && COMPILER(GCC)
+#endif // SaturatedArithmetic_h
« no previous file with comments | « third_party/WebKit/Source/wtf/RetainPtr.h ('k') | third_party/WebKit/Source/wtf/SaturatedArithmeticTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698