Modified: trunk/Source/WebCore/ChangeLog (101918 => 101919)
--- trunk/Source/WebCore/ChangeLog 2011-12-03 09:36:54 UTC (rev 101918)
+++ trunk/Source/WebCore/ChangeLog 2011-12-03 09:44:59 UTC (rev 101919)
@@ -1,3 +1,16 @@
+2011-12-03 Alejandro G. Castro <[email protected]>
+
+ [GTK] TextureMapperNode should not use Qt types and functions
+ https://bugs.webkit.org/show_bug.cgi?id=73713
+
+ Replace qreal with double and qMin with std::min.
+
+ Reviewed by Noam Rosenthal.
+
+ * platform/graphics/texmap/TextureMapperNode.cpp:
+ (WebCore::solveCubicBezierFunction):
+ (WebCore::solveStepsFunction):
+
2011-12-03 Dan Winship <[email protected]>
[GTK] Remove lots of code that is now unnecessary after
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp (101918 => 101919)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp 2011-12-03 09:36:54 UTC (rev 101918)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp 2011-12-03 09:44:59 UTC (rev 101919)
@@ -23,6 +23,7 @@
#if USE(ACCELERATED_COMPOSITING)
#include "GraphicsLayerTextureMapper.h"
+#include "MathExtras.h"
namespace {
static const float gTileDimension = 1024.0;
@@ -823,7 +824,7 @@
return 1.0 / (200.0 * duration);
}
-static inline double solveCubicBezierFunction(qreal p1x, qreal p1y, qreal p2x, qreal p2y, double t, double duration)
+static inline double solveCubicBezierFunction(double p1x, double p1y, double p2x, double p2y, double t, double duration)
{
UnitBezier bezier(p1x, p1y, p2x, p2y);
return bezier.solve(t, solveEpsilon(duration));
@@ -832,7 +833,7 @@
static inline double solveStepsFunction(int numSteps, bool stepAtStart, double t)
{
if (stepAtStart)
- return qMin(1.0, (floor(numSteps * t) + 1) / numSteps);
+ return std::min(1.0, (floor(numSteps * t) + 1) / numSteps);
return floor(numSteps * t) / numSteps;
}
