Changeset 115928 in webkit

Timestamp:

May 2, 2012 7:01:30 PM (12 years ago)

Author:

leviw@chromium.org

Message:

Convert FractionalLayoutUnit overflow assertions to stderr warnings
​https://bugs.webkit.org/show_bug.cgi?id=85393

Reviewed by Eric Seidel.

Writing warnings to stderr when FractionalLayoutUnits overflow on debug builds instead of asserting
and crashing. It can be very useful to WebKit developers know when overflow is occurring, but it's
not always a programming error, so assert wasn't the right action.

No new tests. No change in behavior.

• platform/FractionalLayoutUnit.h:

(WebCore):
(WebCore::FractionalLayoutUnit::FractionalLayoutUnit):
(WebCore::FractionalLayoutUnit::toUnsigned):
(WebCore::FractionalLayoutUnit::setRawValue):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-02  Levi Weintraub  <leviw@chromium.org>
+
+        Convert FractionalLayoutUnit overflow assertions to stderr warnings
+        https://bugs.webkit.org/show_bug.cgi?id=85393
+
+        Reviewed by Eric Seidel.
+
+        Writing warnings to stderr when FractionalLayoutUnits overflow on debug builds instead of asserting
+        and crashing. It can be very useful to WebKit developers know when overflow is occurring, but it's
+        not always a programming error, so assert wasn't the right action.
+
+        No new tests. No change in behavior.
+
+        * platform/FractionalLayoutUnit.h:
+        (WebCore):
+        (WebCore::FractionalLayoutUnit::FractionalLayoutUnit):
+        (WebCore::FractionalLayoutUnit::toUnsigned):
+        (WebCore::FractionalLayoutUnit::setRawValue):
+
 2012-04-18  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/Source/WebCore/platform/FractionalLayoutUnit.h

@@ -39 +39 @@
 namespace WebCore {
 
+#ifdef NDEBUG
+
+#define REPORT_OVERFLOW(doesOverflow) ((void)0)
+
+#else
+
+#define REPORT_OVERFLOW(doesOverflow) do \
+    if (!(doesOverflow)) { \
+        WTFReportError(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, "!(%s)", #doesOverflow); \
+    } \
+while (0)
+
+#endif
+
 #if ENABLE(SUBPIXEL_LAYOUT)
 static const int kFixedPointDenominator = 60;
@@ -54 +68 @@
     
     FractionalLayoutUnit() : m_value(0) { }
-    FractionalLayoutUnit(int value) { ASSERT(isInBounds(value)); m_value = value * kFixedPointDenominator; }
-    FractionalLayoutUnit(unsigned short value) { ASSERT(isInBounds(value)); m_value = value * kFixedPointDenominator; }
-    FractionalLayoutUnit(unsigned int value) { ASSERT(isInBounds(value)); m_value = value * kFixedPointDenominator; }
-    FractionalLayoutUnit(float value) { ASSERT(isInBounds(value)); m_value = value * kFixedPointDenominator; }
-    FractionalLayoutUnit(double value) { ASSERT(isInBounds(value)); m_value = value * kFixedPointDenominator; }
+    FractionalLayoutUnit(int value) { REPORT_OVERFLOW(isInBounds(value)); m_value = value * kFixedPointDenominator; }
+    FractionalLayoutUnit(unsigned short value) { REPORT_OVERFLOW(isInBounds(value)); m_value = value * kFixedPointDenominator; }
+    FractionalLayoutUnit(unsigned int value) { REPORT_OVERFLOW(isInBounds(value)); m_value = value * kFixedPointDenominator; }
+    FractionalLayoutUnit(float value) { REPORT_OVERFLOW(isInBounds(value)); m_value = value * kFixedPointDenominator; }
+    FractionalLayoutUnit(double value) { REPORT_OVERFLOW(isInBounds(value)); m_value = value * kFixedPointDenominator; }
     FractionalLayoutUnit(const FractionalLayoutUnit& value) { m_value = value.rawValue(); }
 
     inline int toInt() const { return m_value / kFixedPointDenominator; }
-    inline unsigned toUnsigned() const { ASSERT(m_value >= 0); return toInt(); }
+    inline unsigned toUnsigned() const { REPORT_OVERFLOW(m_value >= 0); return toInt(); }
     inline float toFloat() const { return static_cast<float>(m_value) / kFixedPointDenominator; }
     inline double toDouble() const { return static_cast<double>(m_value) / kFixedPointDenominator; }
@@ -82 +96 @@
     inline void setRawValue(long long value)
     {
-        ASSERT(value > std::numeric_limits<int>::min() && value < std::numeric_limits<int>::max());
+        REPORT_OVERFLOW(value > std::numeric_limits<int>::min() && value < std::numeric_limits<int>::max());
         m_value = static_cast<int>(value);
     }