Changeset 113730 in webkit

Timestamp:

Apr 10, 2012 10:11:10 AM (12 years ago)

Author:

eae@chromium.org

Message:

Add missing methods and operators to FractionalLayoutUnit
​https://bugs.webkit.org/show_bug.cgi?id=82403

Reviewed by Eric Seidel.

Add missing methods and operators and from branch version of
FractionalLayoutUnit. Also fix overflow assertion and add const keyword
to a couple of methods.

No new tests.

• platform/FractionalLayoutUnit.h:

(WebCore::FractionalLayoutUnit::abs):
(FractionalLayoutUnit):
(WebCore::FractionalLayoutUnit::ceil):
(WebCore::FractionalLayoutUnit::round):
(WebCore::FractionalLayoutUnit::floor):
(WebCore::FractionalLayoutUnit::isInBounds):
(WebCore::operator<):
(WebCore):
(WebCore::operator-):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-10  Emil A Eklund  <eae@chromium.org>
+
+        Add missing methods and operators to FractionalLayoutUnit
+        https://bugs.webkit.org/show_bug.cgi?id=82403
+
+        Reviewed by Eric Seidel.
+
+        Add missing methods and operators and from branch version of
+        FractionalLayoutUnit. Also fix overflow assertion and add const keyword
+        to a couple of methods.
+
+        No new tests.
+
+        * platform/FractionalLayoutUnit.h:
+        (WebCore::FractionalLayoutUnit::abs):
+        (FractionalLayoutUnit):
+        (WebCore::FractionalLayoutUnit::ceil):
+        (WebCore::FractionalLayoutUnit::round):
+        (WebCore::FractionalLayoutUnit::floor):
+        (WebCore::FractionalLayoutUnit::isInBounds):
+        (WebCore::operator<):
+        (WebCore):
+        (WebCore::operator-):
+
 2011-12-14  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/platform/FractionalLayoutUnit.h

@@ -72 +72 @@
     }
 
-    inline FractionalLayoutUnit abs()
+    inline FractionalLayoutUnit abs() const
     {
         FractionalLayoutUnit returnValue;
@@ -79 +79 @@
     }
 #if OS(DARWIN)
-    inline int wtf_ceil()
+    inline int wtf_ceil() const
 #else
-    inline int ceil()
+    inline int ceil() const
 #endif
     {
@@ -88 +88 @@
         return (m_value - kFixedPointDenominator + 1) / kFixedPointDenominator;
     }
-    inline int round()
+    inline int round() const
     {
         if (m_value > 0)
@@ -95 +95 @@
     }
 
-    inline int floor()
+    inline int floor() const
     {
         return toInt();
@@ -117 +117 @@
     inline bool isInBounds(int value)
     {
-        return ::abs(value) < std::numeric_limits<int>::max() / kFixedPointDenominator;
+        return ::abs(value) <= std::numeric_limits<int>::max() / kFixedPointDenominator;
     }
     inline bool isInBounds(unsigned value)
     {
-        return value < static_cast<unsigned>(std::numeric_limits<int>::max()) / kFixedPointDenominator;
+        return value <= static_cast<unsigned>(std::numeric_limits<int>::max()) / kFixedPointDenominator;
     }
     inline bool isInBounds(double value)
     {
-        return ::fabs(value) < std::numeric_limits<int>::max() / kFixedPointDenominator;
+        return ::abs(value) <= std::numeric_limits<int>::max() / kFixedPointDenominator;
     }
 
@@ -194 +194 @@
 {
     return a.toFloat() < b;
+}
+
+inline bool operator<(const FractionalLayoutUnit& a, double b)
+{
+    return a.toDouble() < b;
 }
 
@@ -434 +439 @@
 }
 
+inline FractionalLayoutUnit operator-(const FractionalLayoutUnit& a, unsigned b)
+{
+    return a - FractionalLayoutUnit(b);
+}
+
 inline float operator-(const FractionalLayoutUnit& a, float b)
 {