Title: [153764] trunk/Source
- Revision
- 153764
- Author
- [email protected]
- Date
- 2013-08-06 14:31:46 -0700 (Tue, 06 Aug 2013)
Log Message
[Windows] Unreviewed build correction after r153754 and r153757.
Source/WebCore:
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::blendFunc): Don't force std::remainder, since we are using our own
custom implementation on Windows.
Source/WTF:
* wtf/MathExtras.h:
(remainder): Provide implementation of C99 remainder for VS2010 (and earlier).
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (153763 => 153764)
--- trunk/Source/WTF/ChangeLog 2013-08-06 21:20:10 UTC (rev 153763)
+++ trunk/Source/WTF/ChangeLog 2013-08-06 21:31:46 UTC (rev 153764)
@@ -1,3 +1,10 @@
+2013-08-06 Brent Fulgham <[email protected]>
+
+ [Windows] Unreviewed build correction after r153754 and r153757.
+
+ * wtf/MathExtras.h:
+ (remainder): Provide implementation of C99 remainder for VS2010 (and earlier).
+
2013-07-23 David Farler <[email protected]>
Provide optional OTHER_CFLAGS, OTHER_CPPFLAGS, OTHER_LDFLAGS additions for building with ASAN
https://bugs.webkit.org/show_bug.cgi?id=117762
Modified: trunk/Source/WTF/wtf/MathExtras.h (153763 => 153764)
--- trunk/Source/WTF/wtf/MathExtras.h 2013-08-06 21:20:10 UTC (rev 153763)
+++ trunk/Source/WTF/wtf/MathExtras.h 2013-08-06 21:31:46 UTC (rev 153764)
@@ -144,8 +144,22 @@
inline long lroundf(float num) { return static_cast<long>(roundf(num)); }
inline double trunc(double num) { return num > 0 ? floor(num) : ceil(num); }
+#if defined(_MSC_VER) && (_MSC_VER <= 1600)
+
+inline double remainder(double numerator, double denominator)
+{
+ double result = fmod(numerator, denominator);
+ if (result > 0.5 * denominator)
+ return result - denominator;
+
+ return result;
+}
+
#endif
+
+#endif
+
#if COMPILER(GCC) && OS(QNX)
// The stdlib on QNX doesn't contain long abs(long). See PR #104666.
inline long long abs(long num) { return labs(num); }
Modified: trunk/Source/WebCore/ChangeLog (153763 => 153764)
--- trunk/Source/WebCore/ChangeLog 2013-08-06 21:20:10 UTC (rev 153763)
+++ trunk/Source/WebCore/ChangeLog 2013-08-06 21:31:46 UTC (rev 153764)
@@ -1,5 +1,13 @@
2013-08-06 Brent Fulgham <[email protected]>
+ [Windows] Unreviewed build correction after r153754 and r153757.
+
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::blendFunc): Don't force std::remainder, since we are using our own
+ custom implementation on Windows.
+
+2013-08-06 Brent Fulgham <[email protected]>
+
Improper Calculation of In-band Cue Colors
https://bugs.webkit.org/show_bug.cgi?id=119523
Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (153763 => 153764)
--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2013-08-06 21:20:10 UTC (rev 153763)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2013-08-06 21:31:46 UTC (rev 153764)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.
* Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -49,6 +49,7 @@
#include "StylePropertyShorthand.h"
#include "StyleResolver.h"
#include <algorithm>
+#include <wtf/MathExtras.h>
#include <wtf/Noncopyable.h>
#include <wtf/RefCounted.h>
@@ -240,7 +241,7 @@
return progress == 1 ? from : to;
size_t resultLength = fromLength;
if (fromLength != toLength) {
- if (!std::remainder(std::max(fromLength, toLength), std::min(fromLength, toLength)))
+ if (!remainder(std::max(fromLength, toLength), std::min(fromLength, toLength)))
resultLength = std::max(fromLength, toLength);
else
resultLength = fromLength * toLength;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
