From 9c566fe3ef36f8aa4f5277e9ef0eaeaf1f336531 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Thu, 11 Feb 2016 19:07:42 +0000
Subject: [PATCH] Bug 1245414, part 8 - Remove mfbt/decimal/floor-ceiling.patch
 now that the issue is fixed upstream. r=Waldo

---
 mfbt/decimal/floor-ceiling.patch | 89 --------------------------------
 mfbt/decimal/update.sh           |  1 -
 2 files changed, 90 deletions(-)
 delete mode 100644 mfbt/decimal/floor-ceiling.patch

diff --git a/mfbt/decimal/floor-ceiling.patch b/mfbt/decimal/floor-ceiling.patch
deleted file mode 100644
index 9e26787444e..00000000000
--- a/mfbt/decimal/floor-ceiling.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff --git a/mfbt/decimal/Decimal.cpp b/mfbt/decimal/Decimal.cpp
---- a/mfbt/decimal/Decimal.cpp
-+++ b/mfbt/decimal/Decimal.cpp
-@@ -618,26 +618,26 @@ Decimal::AlignedOperands Decimal::alignO
- Decimal Decimal::ceiling() const
- {
-     if (isSpecial())
-         return *this;
- 
-     if (exponent() >= 0)
-         return *this;
- 
--    uint64_t result = m_data.coefficient();
--    const int numberOfDigits = countDigits(result);
-+    uint64_t coefficient = m_data.coefficient();
-+    const int numberOfDigits = countDigits(coefficient);
-     const int numberOfDropDigits = -exponent();
-     if (numberOfDigits < numberOfDropDigits)
-         return isPositive() ? Decimal(1) : zero(Positive);
- 
--    result = scaleDown(result, numberOfDropDigits - 1);
--    if (sign() == Positive && result % 10 > 0)
--        result += 10;
--    result /= 10;
-+    uint64_t result = scaleDown(coefficient, numberOfDropDigits);
-+    uint64_t droppedDigits = coefficient - scaleUp(result, numberOfDropDigits);
-+    if (droppedDigits && isPositive())
-+        result += 1;
-     return Decimal(sign(), 0, result);
- }
- 
- Decimal Decimal::compareTo(const Decimal& rhs) const
- {
-     const Decimal result(*this - rhs);
-     switch (result.m_data.formatClass()) {
-     case EncodedData::ClassInfinity:
-@@ -660,26 +660,27 @@ Decimal Decimal::compareTo(const Decimal
- Decimal Decimal::floor() const
- {
-     if (isSpecial())
-         return *this;
- 
-     if (exponent() >= 0)
-         return *this;
- 
--    uint64_t result = m_data.coefficient();
--    const int numberOfDigits = countDigits(result);
-+    uint64_t coefficient = m_data.coefficient();
-+    const int numberOfDigits = countDigits(coefficient);
-     const int numberOfDropDigits = -exponent();
-     if (numberOfDigits < numberOfDropDigits)
-         return isPositive() ? zero(Positive) : Decimal(-1);
- 
--    result = scaleDown(result, numberOfDropDigits - 1);
--    if (isNegative() && result % 10 > 0)
--        result += 10;
--    result /= 10;
-+    uint64_t result = scaleDown(coefficient, numberOfDropDigits);
-+    uint64_t droppedDigits = coefficient - scaleUp(result, numberOfDropDigits);
-+    if (droppedDigits && isNegative()) {
-+        result += 1;
-+    }
-     return Decimal(sign(), 0, result);
- }
- 
- Decimal Decimal::fromDouble(double doubleValue)
- {
-     if (std::isfinite(doubleValue))
-         return fromString(String::numberToStringECMAScript(doubleValue));
- 
-@@ -915,16 +916,18 @@ Decimal Decimal::round() const
-         return *this;
- 
-     uint64_t result = m_data.coefficient();
-     const int numberOfDigits = countDigits(result);
-     const int numberOfDropDigits = -exponent();
-     if (numberOfDigits < numberOfDropDigits)
-         return zero(Positive);
- 
-+    // We're implementing round-half-away-from-zero, so we only need the one
-+    // (the most significant) fractional digit:
-     result = scaleDown(result, numberOfDropDigits - 1);
-     if (result % 10 >= 5)
-         result += 10;
-     result /= 10;
-     return Decimal(sign(), 0, result);
- }
- 
- double Decimal::toDouble() const
diff --git a/mfbt/decimal/update.sh b/mfbt/decimal/update.sh
index 6847485d12f..ba261e4bf05 100755
--- a/mfbt/decimal/update.sh
+++ b/mfbt/decimal/update.sh
@@ -49,7 +49,6 @@ fi
 
 # Apply patches:
 
-patch -p3 < floor-ceiling.patch
 patch -p3 < zero-serialization.patch
 patch -p3 < comparison-with-nan.patch
 patch -p3 < mfbt-abi-markers.patch