Title: [97042] trunk/Source/WebCore
- Revision
- 97042
- Author
- [email protected]
- Date
- 2011-10-09 22:09:22 -0700 (Sun, 09 Oct 2011)
Log Message
Another attempt to fix the Leopard Intel Debug build after changeset 97034 <http://trac.webkit.org/changeset/97034>
(https://bugs.webkit.org/show_bug.cgi?id=68035)
* page/FrameView.cpp:
(WebCore::FrameView::zoomAnimatorTransformChanged): Explicitly convert a double precision result
to a single precision result. I am unsure if this fix is correct. We need to look into this some
more. See <https://bugs.webkit.org/show_bug.cgi?id=69739> for more details.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (97041 => 97042)
--- trunk/Source/WebCore/ChangeLog 2011-10-10 04:54:35 UTC (rev 97041)
+++ trunk/Source/WebCore/ChangeLog 2011-10-10 05:09:22 UTC (rev 97042)
@@ -1,5 +1,15 @@
2011-10-09 Daniel Bates <[email protected]>
+ Another attempt to fix the Leopard Intel Debug build after changeset 97034 <http://trac.webkit.org/changeset/97034>
+ (https://bugs.webkit.org/show_bug.cgi?id=68035)
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::zoomAnimatorTransformChanged): Explicitly convert a double precision result
+ to a single precision result. I am unsure if this fix is correct. We need to look into this some
+ more. See <https://bugs.webkit.org/show_bug.cgi?id=69739> for more details.
+
+2011-10-09 Daniel Bates <[email protected]>
+
Attempt to fix the Leopard Intel Debug build after changeset 97034 <http://trac.webkit.org/changeset/97034>
(https://bugs.webkit.org/show_bug.cgi?id=68035)
Modified: trunk/Source/WebCore/page/FrameView.cpp (97041 => 97042)
--- trunk/Source/WebCore/page/FrameView.cpp 2011-10-10 04:54:35 UTC (rev 97041)
+++ trunk/Source/WebCore/page/FrameView.cpp 2011-10-10 05:09:22 UTC (rev 97042)
@@ -1226,8 +1226,9 @@
void FrameView::zoomAnimatorTransformChanged(double scale, double x, double y, ZoomAnimationState state)
{
if (state == ZoomAnimationFinishing) {
- // FIXME: We lose precision when converting from a double to an int. Is this acceptable? See <https://bugs.webkit.org/show_bug.cgi?id=69739>.
- m_page->setPageScaleFactor(m_page->pageScaleFactor() * scale,
+ // FIXME: We lose precision when converting from a double to an int and an double to a float.
+ // Is this acceptable? See <https://bugs.webkit.org/show_bug.cgi?id=69739>.
+ m_page->setPageScaleFactor(static_cast<float>(m_page->pageScaleFactor() * scale),
LayoutPoint(static_cast<int>(scale * scrollX() - x), static_cast<int>(scale * scrollY() - y)));
scrollAnimator()->resetZoom();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
