Title: [114431] trunk/Source/WebCore
- Revision
- 114431
- Author
- e...@chromium.org
- Date
- 2012-04-17 13:56:12 -0700 (Tue, 17 Apr 2012)
Log Message
Rollout r114404 as it broke a couple of chromium builds.
* platform/FractionalLayoutUnit.h:
(WebCore::FractionalLayoutUnit::FractionalLayoutUnit):
(WebCore::FractionalLayoutUnit::isInBounds):
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (114430 => 114431)
--- trunk/Source/WebCore/ChangeLog 2012-04-17 20:48:47 UTC (rev 114430)
+++ trunk/Source/WebCore/ChangeLog 2012-04-17 20:56:12 UTC (rev 114431)
@@ -1,3 +1,12 @@
+2012-04-17 Emil A Eklund <e...@chromium.org>
+
+ Rollout r114404 as it broke a couple of chromium builds.
+
+ * platform/FractionalLayoutUnit.h:
+ (WebCore::FractionalLayoutUnit::FractionalLayoutUnit):
+ (WebCore::FractionalLayoutUnit::isInBounds):
+ (WebCore):
+
2012-04-17 Ben Murdoch <b...@google.com>
`localStorage.setItem` can overwrite `localStorage` methods
Modified: trunk/Source/WebCore/platform/FractionalLayoutUnit.h (114430 => 114431)
--- trunk/Source/WebCore/platform/FractionalLayoutUnit.h 2012-04-17 20:48:47 UTC (rev 114430)
+++ trunk/Source/WebCore/platform/FractionalLayoutUnit.h 2012-04-17 20:56:12 UTC (rev 114431)
@@ -36,10 +36,6 @@
#include <math.h>
#include <stdlib.h>
-#if (PLATFORM(CHROMIUM) && !OS(WINDOWS)) || PLATFORM(MAC)
-#define ARE_SIZE_T_UNSIGNED_DIFFERENT_UNIT
-#endif
-
namespace WebCore {
static const int kFixedPointDenominator = 60;
@@ -55,9 +51,6 @@
FractionalLayoutUnit(float value) { ASSERT(isInBounds(value)); m_value = value * kFixedPointDenominator; }
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; }
inline unsigned toUnsigned() const { ASSERT(m_value >= 0); return toInt(); }
@@ -133,12 +126,6 @@
{
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;
};
@@ -344,13 +331,6 @@
return a * FractionalLayoutUnit(b);
}
-#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)
{
return FractionalLayoutUnit(a) * b;
@@ -371,13 +351,6 @@
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)
{
FractionalLayoutUnit returnVal;
@@ -406,13 +379,6 @@
return a / FractionalLayoutUnit(b);
}
-#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)
{
return a / b.toFloat();
@@ -428,13 +394,6 @@
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)
{
FractionalLayoutUnit returnVal;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
