Diff
Modified: trunk/Source/_javascript_Core/API/tests/TypedArrayCTest.cpp (232931 => 232932)
--- trunk/Source/_javascript_Core/API/tests/TypedArrayCTest.cpp 2018-06-18 15:40:33 UTC (rev 232931)
+++ trunk/Source/_javascript_Core/API/tests/TypedArrayCTest.cpp 2018-06-18 15:55:43 UTC (rev 232932)
@@ -27,7 +27,6 @@
#include "TypedArrayCTest.h"
#include "_javascript_.h"
-#include <cmath>
#include <limits.h>
#include <math.h>
#include <stdio.h>
@@ -85,7 +84,7 @@
static int assertEqualsAsNumber(JSGlobalContextRef context, JSValueRef value, double expectedValue)
{
double number = JSValueToNumber(context, value, nullptr);
- if (number != expectedValue && !(std::isnan(number) && std::isnan(expectedValue))) {
+ if (number != expectedValue && !(isnan(number) && isnan(expectedValue))) {
fprintf(stderr, "assertEqualsAsNumber FAILED: %p, %lf\n", value, expectedValue);
return 1;
}
Modified: trunk/Source/_javascript_Core/ChangeLog (232931 => 232932)
--- trunk/Source/_javascript_Core/ChangeLog 2018-06-18 15:40:33 UTC (rev 232931)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-06-18 15:55:43 UTC (rev 232932)
@@ -1,3 +1,15 @@
+2018-06-18 Carlos Alberto Lopez Perez <[email protected]>
+
+ [WTF] Remove workarounds needed to support libstdc++-4
+ https://bugs.webkit.org/show_bug.cgi?id=186762
+
+ Reviewed by Michael Catanzaro.
+
+ Revert r226299, r226300 r226301 and r226302.
+
+ * API/tests/TypedArrayCTest.cpp:
+ (assertEqualsAsNumber):
+
2018-06-16 Michael Catanzaro <[email protected]>
REGRESSION(r227717): Hardcoded page size causing JSC crashes on platforms with page size bigger than 16 KB
Modified: trunk/Source/WTF/ChangeLog (232931 => 232932)
--- trunk/Source/WTF/ChangeLog 2018-06-18 15:40:33 UTC (rev 232931)
+++ trunk/Source/WTF/ChangeLog 2018-06-18 15:55:43 UTC (rev 232932)
@@ -1,3 +1,14 @@
+2018-06-18 Carlos Alberto Lopez Perez <[email protected]>
+
+ [WTF] Remove workarounds needed to support libstdc++-4
+ https://bugs.webkit.org/show_bug.cgi?id=186762
+
+ Reviewed by Michael Catanzaro.
+
+ Revert r226299, r226300 r226301 and r226302-
+
+ * wtf/StdLibExtras.h:
+
2018-06-12 Darin Adler <[email protected]>
[Cocoa] Make some RetainPtr refinements to get more ready for ARC
Modified: trunk/Source/WTF/wtf/StdLibExtras.h (232931 => 232932)
--- trunk/Source/WTF/wtf/StdLibExtras.h 2018-06-18 15:40:33 UTC (rev 232931)
+++ trunk/Source/WTF/wtf/StdLibExtras.h 2018-06-18 15:55:43 UTC (rev 232932)
@@ -27,7 +27,6 @@
#ifndef WTF_StdLibExtras_h
#define WTF_StdLibExtras_h
-#include <algorithm>
#include <cstring>
#include <memory>
#include <type_traits>
@@ -455,22 +454,6 @@
return std::tuple<Args&...>(values...);
}
-// libstdc++4 does not have constexpr std::min or std::max.
-// As a workaround this defines WTF::min and WTF::max with constexpr, to be used when a constexpr result is expected.
-// This workaround can be removed after 2018-06 and all users of WTF::min and WTF::max can be converted to std::min and std::max.
-// For more info see: https://bugs.webkit.org/show_bug.cgi?id=181160
-template <class T>
-inline constexpr const T& min(const T& a, const T& b)
-{
- return std::min(a, b);
-}
-
-template <class T>
-inline constexpr const T& max(const T& a, const T& b)
-{
- return std::max(a, b);
-}
-
} // namespace WTF
// This version of placement new omits a 0 check.
Modified: trunk/Source/WebCore/ChangeLog (232931 => 232932)
--- trunk/Source/WebCore/ChangeLog 2018-06-18 15:40:33 UTC (rev 232931)
+++ trunk/Source/WebCore/ChangeLog 2018-06-18 15:55:43 UTC (rev 232932)
@@ -1,3 +1,21 @@
+2018-06-18 Carlos Alberto Lopez Perez <[email protected]>
+
+ [WTF] Remove workarounds needed to support libstdc++-4
+ https://bugs.webkit.org/show_bug.cgi?id=186762
+
+ Reviewed by Michael Catanzaro.
+
+ Revert r226299, r226300 r226301 and r226302.
+
+ No new tests, no change in behaviour.
+
+ * platform/graphics/FontSelectionAlgorithm.h:
+ (WebCore::FontSelectionValue::clampFloat):
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundationCF::currentMediaTime const):
+ * platform/graphics/win/UniscribeController.cpp:
+ (WebCore::UniscribeController::shapeAndPlaceItem):
+
2018-06-18 Karl Leplat <[email protected]>
[Threaded paintingEngine] Fix rendering glitches
Modified: trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.h (232931 => 232932)
--- trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.h 2018-06-18 15:40:33 UTC (rev 232931)
+++ trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.h 2018-06-18 15:55:43 UTC (rev 232932)
@@ -30,7 +30,6 @@
#include <tuple>
#include <wtf/Hasher.h>
#include <wtf/Optional.h>
-#include <wtf/StdLibExtras.h>
namespace WebCore {
@@ -103,7 +102,7 @@
constexpr FontSelectionValue FontSelectionValue::clampFloat(float value)
{
- return FontSelectionValue { WTF::max<float>(minimumValue(), WTF::min<float>(value, maximumValue())) };
+ return FontSelectionValue { std::max<float>(minimumValue(), std::min<float>(value, maximumValue())) };
}
constexpr FontSelectionValue::FontSelectionValue(int rawValue, RawTag)
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (232931 => 232932)
--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2018-06-18 15:40:33 UTC (rev 232931)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2018-06-18 15:55:43 UTC (rev 232932)
@@ -600,7 +600,7 @@
CMTime itemTime = AVCFPlayerItemGetCurrentTime(avPlayerItem(m_avfWrapper));
if (CMTIME_IS_NUMERIC(itemTime))
- return std::max(PAL::toMediaTime(itemTime), MediaTime::zeroTime());
+ return max(PAL::toMediaTime(itemTime), MediaTime::zeroTime());
return MediaTime::zeroTime();
}
Modified: trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp (232931 => 232932)
--- trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp 2018-06-18 15:40:33 UTC (rev 232931)
+++ trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp 2018-06-18 15:55:43 UTC (rev 232932)
@@ -370,10 +370,10 @@
FloatRect glyphBounds = fontData->boundsForGlyph(glyph);
glyphBounds.move(m_glyphOrigin.x(), m_glyphOrigin.y());
- m_minGlyphBoundingBoxX = std::min(m_minGlyphBoundingBoxX, glyphBounds.x());
- m_maxGlyphBoundingBoxX = std::max(m_maxGlyphBoundingBoxX, glyphBounds.maxX());
- m_minGlyphBoundingBoxY = std::min(m_minGlyphBoundingBoxY, glyphBounds.y());
- m_maxGlyphBoundingBoxY = std::max(m_maxGlyphBoundingBoxY, glyphBounds.maxY());
+ m_minGlyphBoundingBoxX = min(m_minGlyphBoundingBoxX, glyphBounds.x());
+ m_maxGlyphBoundingBoxX = max(m_maxGlyphBoundingBoxX, glyphBounds.maxX());
+ m_minGlyphBoundingBoxY = min(m_minGlyphBoundingBoxY, glyphBounds.y());
+ m_maxGlyphBoundingBoxY = max(m_maxGlyphBoundingBoxY, glyphBounds.maxY());
m_glyphOrigin.move(advance + offsetX, -offsetY);
// Mutate the glyph array to contain our altered advances.
