Title: [97041] trunk/Source/WebCore
- Revision
- 97041
- Author
- [email protected]
- Date
- 2011-10-09 21:54:35 -0700 (Sun, 09 Oct 2011)
Log Message
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 double precision result to
an integer. 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 (97040 => 97041)
--- trunk/Source/WebCore/ChangeLog 2011-10-10 04:28:58 UTC (rev 97040)
+++ trunk/Source/WebCore/ChangeLog 2011-10-10 04:54:35 UTC (rev 97041)
@@ -1,3 +1,13 @@
+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)
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::zoomAnimatorTransformChanged): Explicitly convert double precision result to
+ an integer. 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 Luke Macpherson <[email protected]>
Fix Lion, Leopard and Snow Leopard builds after changeset 97034 <http://trac.webkit.org/changeset/97034>
Modified: trunk/Source/WebCore/page/FrameView.cpp (97040 => 97041)
--- trunk/Source/WebCore/page/FrameView.cpp 2011-10-10 04:28:58 UTC (rev 97040)
+++ trunk/Source/WebCore/page/FrameView.cpp 2011-10-10 04:54:35 UTC (rev 97041)
@@ -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,
- LayoutPoint(scale * scrollX() - x, scale * scrollY() - y));
+ 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
