Changeset 97188 in webkit

Timestamp:

Oct 11, 2011 3:43:53 PM (13 years ago)

Author:

wjmaclean@chromium.org

Message:

Loss of precision when converting from double to int and double to float in FrameView::zoomAnimatorTransformChanged()
​https://bugs.webkit.org/show_bug.cgi?id=69739

Source/WebCore:

Reviewed by Simon Fraser.

Change 'double' parameters in FrameView:: & ScrollableArea::zoomAnimatorTransformChanged()
to 'float' to avoid loss of precision warnings when invoking setPageScalefactor.

Test coverage provided by existing zoom-animator tests.

• page/FrameView.cpp:

(WebCore::FrameView::zoomAnimatorTransformChanged):

• page/FrameView.h:
• platform/ScrollableArea.cpp:

(WebCore::ScrollableArea::zoomAnimatorTransformChanged):

• platform/ScrollableArea.h:

Source/WebKit2:

Change 'double' parameters to 'float' to match changes in FrameView.

Reviewed by Simon Fraser.

• WebProcess/Plugins/PDF/BuiltInPDFView.h:

(WebKit::BuiltInPDFView::zoomAnimatorTransformChanged):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (1 diff)
• WebCore/page/FrameView.h (modified) (1 diff)
• WebCore/platform/ScrollableArea.cpp (modified) (1 diff)
• WebCore/platform/ScrollableArea.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-11  W. James MacLean  <wjmaclean@chromium.org>
+
+        Loss of precision when converting from double to int and double to float in FrameView::zoomAnimatorTransformChanged()
+        https://bugs.webkit.org/show_bug.cgi?id=69739
+
+        Reviewed by Simon Fraser.
+
+        Change 'double' parameters in FrameView:: & ScrollableArea::zoomAnimatorTransformChanged()
+        to 'float' to avoid loss of precision warnings when invoking setPageScalefactor.
+
+        Test coverage provided by existing zoom-animator tests.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::zoomAnimatorTransformChanged):
+        * page/FrameView.h:
+        * platform/ScrollableArea.cpp:
+        (WebCore::ScrollableArea::zoomAnimatorTransformChanged):
+        * platform/ScrollableArea.h:
+
 2011-10-11  No'am Rosenthal  <noam.rosenthal@nokia.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -1224 +1224 @@
 }
 
-void FrameView::zoomAnimatorTransformChanged(double scale, double x, double y, ZoomAnimationState state)
+void FrameView::zoomAnimatorTransformChanged(float scale, float x, float y, ZoomAnimationState state)
 {
     if (state == ZoomAnimationFinishing) {
-        // 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)));
+        m_page->setPageScaleFactor(m_page->pageScaleFactor() * scale,
+                                   LayoutPoint(scale * scrollX() - x, scale * scrollY() - y));
         scrollAnimator()->resetZoom();
     }

trunk/Source/WebCore/page/FrameView.h

@@ -171 +171 @@
     virtual bool shouldRubberBandInDirection(ScrollDirection) const;
 
-    virtual void zoomAnimatorTransformChanged(double, double, double, ZoomAnimationState);
+    virtual void zoomAnimatorTransformChanged(float, float, float, ZoomAnimationState);
 
     String mediaType() const;

trunk/Source/WebCore/platform/ScrollableArea.cpp

@@ -124 +124 @@
 }
 
-void ScrollableArea::zoomAnimatorTransformChanged(double, double, double, ZoomAnimationState)
+void ScrollableArea::zoomAnimatorTransformChanged(float, float, float, ZoomAnimationState)
 {
     // Requires FrameView to override this.

trunk/Source/WebCore/platform/ScrollableArea.h

@@ -55 +55 @@
     void scrollToYOffsetWithoutAnimation(float x);
 
-    virtual void zoomAnimatorTransformChanged(double, double, double, ZoomAnimationState);
+    virtual void zoomAnimatorTransformChanged(float, float, float, ZoomAnimationState);
 
     bool handleWheelEvent(const PlatformWheelEvent&);

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-10-11  W. James MacLean  <wjmaclean@chromium.org>
+
+        Loss of precision when converting from double to int and double to float in FrameView::zoomAnimatorTransformChanged()
+        https://bugs.webkit.org/show_bug.cgi?id=69739
+
+        Change 'double' parameters to 'float' to match changes in FrameView.
+
+        Reviewed by Simon Fraser.
+
+        * WebProcess/Plugins/PDF/BuiltInPDFView.h:
+        (WebKit::BuiltInPDFView::zoomAnimatorTransformChanged):
+
 2011-10-11  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h

@@ -88 +88 @@
     virtual void manualStreamDidFinishLoading();
     virtual void manualStreamDidFail(bool wasCancelled);
-    
-    virtual void zoomAnimatorTransformChanged(double, double, double, ZoomAnimationState) { }
+
+    virtual void zoomAnimatorTransformChanged(float, float, float, ZoomAnimationState) { }
 
     virtual bool handleMouseEvent(const WebMouseEvent&);