Title: [97048] trunk/Source/WebKit2
- Revision
- 97048
- Author
- hausm...@webkit.org
- Date
- 2011-10-10 02:21:41 -0700 (Mon, 10 Oct 2011)
Log Message
[Qt] Fix build with qreal == float on MeeGo 1.2 Harmattan
Reviewed by Andreas Kling.
Explicitly choose the qreal variant of qMin, since QPointF is using qreal.
* UIProcess/qt/ViewportInteractionEngine.cpp:
(WebKit::ViewportInteractionEngine::animateContentPositionIntoBoundariesIfNeeded):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (97047 => 97048)
--- trunk/Source/WebKit2/ChangeLog 2011-10-10 09:20:19 UTC (rev 97047)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-10 09:21:41 UTC (rev 97048)
@@ -1,3 +1,14 @@
+2011-10-10 Simon Hausmann <simon.hausm...@nokia.com>
+
+ [Qt] Fix build with qreal == float on MeeGo 1.2 Harmattan
+
+ Reviewed by Andreas Kling.
+
+ Explicitly choose the qreal variant of qMin, since QPointF is using qreal.
+
+ * UIProcess/qt/ViewportInteractionEngine.cpp:
+ (WebKit::ViewportInteractionEngine::animateContentPositionIntoBoundariesIfNeeded):
+
2011-10-10 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Add methods to reload the view to WebKit2 GTK+ API
Modified: trunk/Source/WebKit2/UIProcess/qt/ViewportInteractionEngine.cpp (97047 => 97048)
--- trunk/Source/WebKit2/UIProcess/qt/ViewportInteractionEngine.cpp 2011-10-10 09:20:19 UTC (rev 97047)
+++ trunk/Source/WebKit2/UIProcess/qt/ViewportInteractionEngine.cpp 2011-10-10 09:21:41 UTC (rev 97048)
@@ -260,7 +260,7 @@
if (contentGeometry.width() < m_viewport->width())
newPos.setX((m_viewport->width() - contentGeometry.width()) / 2);
else {
- newPos.setX(qMin(0., newPos.x()));
+ newPos.setX(qMin<qreal>(0., newPos.x()));
const qreal rightSideGap = m_viewport->boundingRect().right() - contentGeometry.right();
if (rightSideGap > 0.)
newPos.setX(newPos.x() + rightSideGap);
@@ -270,7 +270,7 @@
if (contentGeometry.height() < m_viewport->height())
newPos.setY(0);
else {
- newPos.setY(qMin(0., newPos.y()));
+ newPos.setY(qMin<qreal>(0., newPos.y()));
const qreal bottomSideGap = m_viewport->boundingRect().bottom() - contentGeometry.bottom();
if (bottomSideGap > 0.)
newPos.setY(newPos.y() + bottomSideGap);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
