Changeset 114404 in webkit

Timestamp:

Apr 17, 2012 11:51:50 AM (12 years ago)

Author:

eae@chromium.org

Message:

Add size_t versions of multiplication and division operators to FractionalLayoutUnit
​https://bugs.webkit.org/show_bug.cgi?id=83848

Reviewed by Julien Chaffraix.

Add size_t versions of operator* and operator/ for platforms where there
is no ambiguity between unsigned int and size_t.

No new tests, no new functionality.

• platform/FractionalLayoutUnit.h:

(FractionalLayoutUnit):
(WebCore::FractionalLayoutUnit::FractionalLayoutUnit):
(WebCore::FractionalLayoutUnit::isInBounds):
(WebCore):
(WebCore::operator*):
(WebCore::operator/):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/FractionalLayoutUnit.h (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-17  Emil A Eklund  <eae@chromium.org>
+
+        Add size_t versions of multiplication and division operators to FractionalLayoutUnit
+        https://bugs.webkit.org/show_bug.cgi?id=83848
+
+        Reviewed by Julien Chaffraix.
+
+        Add size_t versions of operator* and operator/ for platforms where there
+        is no ambiguity between unsigned int and size_t.
+
+        No new tests, no new functionality.
+
+        * platform/FractionalLayoutUnit.h:
+        (FractionalLayoutUnit):
+        (WebCore::FractionalLayoutUnit::FractionalLayoutUnit):
+        (WebCore::FractionalLayoutUnit::isInBounds):
+        (WebCore):
+        (WebCore::operator*):
+        (WebCore::operator/):
+
 2012-04-17  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/platform/FractionalLayoutUnit.h

@@ -37 +37 @@
 #include <stdlib.h>
 
+#if PLATFORM(CHROMIUM) || PLATFORM(MAC)
+#define ARE_SIZE_T_UNSIGNED_DIFFERENT_UNIT
+#endif
+
 namespace WebCore {
 
@@ -52 +56 @@
     FractionalLayoutUnit(double value) { ASSERT(isInBounds(value)); m_value = value * kFixedPointDenominator; }
     FractionalLayoutUnit(const FractionalLayoutUnit& value) { m_value = value.rawValue(); }
+#ifdef ARE_SIZE_T_UNSIGNED_DIFFERENT_UNIT
+    FractionalLayoutUnit(size_t value) { ASSERT(isInBounds(value)); m_value = static_cast<int>(value * kFixedPointDenominator); }
+#endif
 
     inline int toInt() const { return m_value / kFixedPointDenominator; }
@@ -127 +134 @@
         return ::fabs(value) <= std::numeric_limits<int>::max() / kFixedPointDenominator;
     }
+#ifdef ARE_SIZE_T_UNSIGNED_DIFFERENT_UNIT
+    inline bool isInBounds(size_t value)
+    {
+        return value <= static_cast<size_t>(std::numeric_limits<int>::max()) / kFixedPointDenominator;
+    }
+#endif
 
     int m_value;
@@ -332 +345 @@
 }
 
+#ifdef ARE_SIZE_T_UNSIGNED_DIFFERENT_UNIT
+inline FractionalLayoutUnit operator*(const FractionalLayoutUnit& a, size_t b)
+{
+    return a * FractionalLayoutUnit(b);
+}
+#endif
+
 inline FractionalLayoutUnit operator*(unsigned a, const FractionalLayoutUnit& b)
 {
@@ -351 +371 @@
     return a * b.toDouble();
 }
+
+#ifdef ARE_SIZE_T_UNSIGNED_DIFFERENT_UNIT
+inline FractionalLayoutUnit operator*(size_t a, const FractionalLayoutUnit& b)
+{
+    return FractionalLayoutUnit(a) * b;
+}
+#endif
 
 inline FractionalLayoutUnit operator/(const FractionalLayoutUnit& a, const FractionalLayoutUnit& b)
@@ -380 +407 @@
 }
 
+#ifdef ARE_SIZE_T_UNSIGNED_DIFFERENT_UNIT
+inline FractionalLayoutUnit operator/(const FractionalLayoutUnit& a, size_t b)
+{
+    return a / FractionalLayoutUnit(b);
+}
+#endif
+
 inline float operator/(const float a, const FractionalLayoutUnit& b)
 {
@@ -394 +428 @@
     return FractionalLayoutUnit(a) / b;
 }
+
+#ifdef ARE_SIZE_T_UNSIGNED_DIFFERENT_UNIT
+inline FractionalLayoutUnit operator/(size_t a, const FractionalLayoutUnit& b)
+{
+    return FractionalLayoutUnit(a) / b;
+}
+#endif
 
 inline FractionalLayoutUnit operator+(const FractionalLayoutUnit& a, const FractionalLayoutUnit& b)