<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[144856] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/144856">144856</a></dd>
<dt>Author</dt> <dd>aelias@chromium.org</dd>
<dt>Date</dt> <dd>2013-03-05 17:29:55 -0800 (Tue, 05 Mar 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[chromium] Scroll deltas should be floats
https://bugs.webkit.org/show_bug.cgi?id=111465

Reviewed by James Robinson.

This converts the remaining scroll delta fields to floats so that
we no longer lose precision due to DIP conversion. The natural
type for deltas is WebFloatSize, which was missing, so I also created
that type based on the existing WebSize header.

Source/Platform:

* Platform.gypi:
* chromium/public/WebFloatSize.h: Added.
(WebKit):
(WebFloatSize):
(WebKit::WebFloatSize::isEmpty):
(WebKit::WebFloatSize::WebFloatSize):
(WebKit::WebFloatSize::operator=):
(WebKit::WebFloatSize::operator WebCore::FloatSize):
(WebKit::WebFloatSize::operator gfx::SizeF):
(WebKit::WebFloatSize::operator gfx::Vector2dF):
(WebKit::operator==):
(WebKit::operator!=):
* chromium/public/WebGestureCurveTarget.h:
(WebKit::WebGestureCurveTarget::scrollBy):
(WebGestureCurveTarget):
* chromium/public/WebInputHandlerClient.h:
(WebKit::WebInputHandlerClient::scrollByIfPossible):
(WebInputHandlerClient):

Source/WebKit/chromium:

* src/WebCompositorInputHandlerImpl.cpp:
(WebKit::WebCompositorInputHandlerImpl::handleInputEventInternal):
(WebKit::WebCompositorInputHandlerImpl::touchpadFlingScroll):
(WebKit::WebCompositorInputHandlerImpl::scrollBy):
* src/WebCompositorInputHandlerImpl.h:
(WebCompositorInputHandlerImpl):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::scrollBy):
* src/WebViewImpl.h:
(WebViewImpl):
* tests/WebCompositorInputHandlerImplTest.cpp:
(MockWebInputHandlerClient):
(WebKit::TEST_F):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcePlatformChangeLog">trunk/Source/Platform/ChangeLog</a></li>
<li><a href="#trunkSourcePlatformPlatformgypi">trunk/Source/Platform/Platform.gypi</a></li>
<li><a href="#trunkSourcePlatformchromiumpublicWebGestureCurveTargeth">trunk/Source/Platform/chromium/public/WebGestureCurveTarget.h</a></li>
<li><a href="#trunkSourcePlatformchromiumpublicWebInputHandlerClienth">trunk/Source/Platform/chromium/public/WebInputHandlerClient.h</a></li>
<li><a href="#trunkSourceWebKitchromiumChangeLog">trunk/Source/WebKit/chromium/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitchromiumsrcWebCompositorInputHandlerImplcpp">trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp</a></li>
<li><a href="#trunkSourceWebKitchromiumsrcWebCompositorInputHandlerImplh">trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h</a></li>
<li><a href="#trunkSourceWebKitchromiumsrcWebViewImplcpp">trunk/Source/WebKit/chromium/src/WebViewImpl.cpp</a></li>
<li><a href="#trunkSourceWebKitchromiumsrcWebViewImplh">trunk/Source/WebKit/chromium/src/WebViewImpl.h</a></li>
<li><a href="#trunkSourceWebKitchromiumtestsWebCompositorInputHandlerImplTestcpp">trunk/Source/WebKit/chromium/tests/WebCompositorInputHandlerImplTest.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourcePlatformchromiumpublicWebFloatSizeh">trunk/Source/Platform/chromium/public/WebFloatSize.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcePlatformChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/Platform/ChangeLog (144855 => 144856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/Platform/ChangeLog        2013-03-06 01:19:20 UTC (rev 144855)
+++ trunk/Source/Platform/ChangeLog        2013-03-06 01:29:55 UTC (rev 144856)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2013-03-05  Alexandre Elias  &lt;aelias@chromium.org&gt;
+
+        [chromium] Scroll deltas should be floats
+        https://bugs.webkit.org/show_bug.cgi?id=111465
+
+        Reviewed by James Robinson.
+
+        This converts the remaining scroll delta fields to floats so that
+        we no longer lose precision due to DIP conversion. The natural
+        type for deltas is WebFloatSize, which was missing, so I also created
+        that type based on the existing WebSize header.
+
+        * Platform.gypi:
+        * chromium/public/WebFloatSize.h: Added.
+        (WebKit):
+        (WebFloatSize):
+        (WebKit::WebFloatSize::isEmpty):
+        (WebKit::WebFloatSize::WebFloatSize):
+        (WebKit::WebFloatSize::operator=):
+        (WebKit::WebFloatSize::operator WebCore::FloatSize):
+        (WebKit::WebFloatSize::operator gfx::SizeF):
+        (WebKit::WebFloatSize::operator gfx::Vector2dF):
+        (WebKit::operator==):
+        (WebKit::operator!=):
+        * chromium/public/WebGestureCurveTarget.h:
+        (WebKit::WebGestureCurveTarget::scrollBy):
+        (WebGestureCurveTarget):
+        * chromium/public/WebInputHandlerClient.h:
+        (WebKit::WebInputHandlerClient::scrollByIfPossible):
+        (WebInputHandlerClient):
+
</ins><span class="cx"> 2013-03-04  James Robinson  &lt;jamesr@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         [chromium] Move check for threaded compositing from WebCompositorSupport to Platform
</span></span></pre></div>
<a id="trunkSourcePlatformPlatformgypi"></a>
<div class="modfile"><h4>Modified: trunk/Source/Platform/Platform.gypi (144855 => 144856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/Platform/Platform.gypi        2013-03-06 01:19:20 UTC (rev 144855)
+++ trunk/Source/Platform/Platform.gypi        2013-03-06 01:29:55 UTC (rev 144856)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx">             'chromium/public/WebFloatKeyframe.h',
</span><span class="cx">             'chromium/public/WebFloatPoint.h',
</span><span class="cx">             'chromium/public/WebFloatQuad.h',
</span><ins>+            'chromium/public/WebFloatSize.h',
</ins><span class="cx">             'chromium/public/WebFloatRect.h',
</span><span class="cx">             'chromium/public/WebGamepad.h',
</span><span class="cx">             'chromium/public/WebGamepads.h',
</span></span></pre></div>
<a id="trunkSourcePlatformchromiumpublicWebFloatSizeh"></a>
<div class="addfile"><h4>Added: trunk/Source/Platform/chromium/public/WebFloatSize.h (0 => 144856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/Platform/chromium/public/WebFloatSize.h                                (rev 0)
+++ trunk/Source/Platform/chromium/public/WebFloatSize.h        2013-03-06 01:29:55 UTC (rev 144856)
</span><span class="lines">@@ -0,0 +1,133 @@
</span><ins>+/*
+ * Copyright (C) 2013 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebFloatSize_h
+#define WebFloatSize_h
+
+#include &quot;WebCommon.h&quot;
+
+#if WEBKIT_IMPLEMENTATION
+#include &quot;FloatSize.h&quot;
+#else
+#include &lt;cmath&gt;
+#include &lt;ui/gfx/size_f.h&gt;
+#include &lt;ui/gfx/vector2d_f.h&gt;
+#endif
+
+namespace WebKit {
+
+struct WebFloatSize {
+    float width;
+    float height;
+
+    bool isEmpty() const { return width &lt;= 0 || height &lt;= 0; }
+
+    WebFloatSize()
+        : width(0)
+        , height(0)
+    {
+    }
+
+    WebFloatSize(float width, float height)
+        : width(width)
+        , height(height)
+    {
+    }
+
+#if WEBKIT_IMPLEMENTATION
+    WebFloatSize(const WebCore::FloatSize&amp; s)
+        : width(s.width())
+        , height(s.height())
+    {
+    }
+
+    WebFloatSize&amp; operator=(const WebCore::FloatSize&amp; s)
+    {
+        width = s.width();
+        height = s.height();
+        return *this;
+    }
+
+    operator WebCore::FloatSize() const
+    {
+        return WebCore::FloatSize(width, height);
+    }
+#else
+    WebFloatSize(const gfx::SizeF&amp; s)
+        : width(s.width())
+        , height(s.height())
+    {
+    }
+
+    WebFloatSize(const gfx::Vector2dF&amp; v)
+        : width(v.x())
+        , height(v.y())
+    {
+    }
+
+    WebFloatSize&amp; operator=(const gfx::SizeF&amp; s)
+    {
+        width = s.width();
+        height = s.height();
+        return *this;
+    }
+
+    WebFloatSize&amp; operator=(const gfx::Vector2dF&amp; v)
+    {
+        width = v.x();
+        height = v.y();
+        return *this;
+    }
+
+    operator gfx::SizeF() const
+    {
+        return gfx::SizeF(std::max(0.f, width), std::max(0.f, height));
+    }
+
+    operator gfx::Vector2dF() const
+    {
+        return gfx::Vector2dF(width, height);
+    }
+#endif
+};
+
+inline bool operator==(const WebFloatSize&amp; a, const WebFloatSize&amp; b)
+{
+    return a.width == b.width &amp;&amp; a.height == b.height;
+}
+
+inline bool operator!=(const WebFloatSize&amp; a, const WebFloatSize&amp; b)
+{
+    return !(a == b);
+}
+
+} // namespace WebKit
+
+#endif
</ins></span></pre></div>
<a id="trunkSourcePlatformchromiumpublicWebGestureCurveTargeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/Platform/chromium/public/WebGestureCurveTarget.h (144855 => 144856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/Platform/chromium/public/WebGestureCurveTarget.h        2013-03-06 01:19:20 UTC (rev 144855)
+++ trunk/Source/Platform/chromium/public/WebGestureCurveTarget.h        2013-03-06 01:29:55 UTC (rev 144856)
</span><span class="lines">@@ -25,14 +25,18 @@
</span><span class="cx"> #ifndef WebGestureCurveTarget_h
</span><span class="cx"> #define WebGestureCurveTarget_h
</span><span class="cx"> 
</span><ins>+#include &quot;WebFloatSize.h&quot;
+#include &quot;WebPoint.h&quot;
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><del>-struct WebPoint;
-
</del><span class="cx"> class WebGestureCurveTarget {
</span><span class="cx"> public:
</span><del>-    virtual void scrollBy(const WebPoint&amp;) = 0;
</del><ins>+    virtual void scrollBy(const WebFloatSize&amp; delta) { scrollBy(WebPoint(delta.width, delta.height)); }
</ins><span class="cx"> 
</span><ins>+    // TODO(aelias): Delete this after WebKit roll.
+    virtual void scrollBy(const WebPoint&amp; delta) { scrollBy(WebFloatSize(delta.x, delta.y)); }
+
</ins><span class="cx"> protected:
</span><span class="cx">     virtual ~WebGestureCurveTarget() { }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourcePlatformchromiumpublicWebInputHandlerClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/Platform/chromium/public/WebInputHandlerClient.h (144855 => 144856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/Platform/chromium/public/WebInputHandlerClient.h        2013-03-06 01:19:20 UTC (rev 144855)
+++ trunk/Source/Platform/chromium/public/WebInputHandlerClient.h        2013-03-06 01:29:55 UTC (rev 144856)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> #define WebInputHandlerClient_h
</span><span class="cx"> 
</span><span class="cx"> #include &quot;WebCommon.h&quot;
</span><ins>+#include &quot;WebFloatSize.h&quot;
</ins><span class="cx"> #include &quot;WebPoint.h&quot;
</span><span class="cx"> #include &quot;WebSize.h&quot;
</span><span class="cx"> 
</span><span class="lines">@@ -55,8 +56,11 @@
</span><span class="cx">     // ancestor layer that can be scrolled will be moved instead. If there is no
</span><span class="cx">     // such layer to be moved, this returns false. Returns true otherwise.
</span><span class="cx">     // Should only be called if scrollBegin() returned ScrollStarted.
</span><del>-    virtual bool scrollByIfPossible(WebPoint, WebSize) = 0;
</del><ins>+    virtual bool scrollByIfPossible(WebPoint origin, WebFloatSize delta) { return scrollByIfPossible(origin, WebSize(delta.width, delta.height)); }
</ins><span class="cx"> 
</span><ins>+    // TODO(aelias): Delete this after WebKit roll.
+    virtual bool scrollByIfPossible(WebPoint origin, WebSize delta) { return scrollByIfPossible(origin, WebFloatSize(delta.width, delta.height)); }
+
</ins><span class="cx">     // Stop scrolling the selected layer. Should only be called if scrollBegin()
</span><span class="cx">     // returned ScrollStarted.
</span><span class="cx">     virtual void scrollEnd() = 0;
</span></span></pre></div>
<a id="trunkSourceWebKitchromiumChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/chromium/ChangeLog (144855 => 144856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/chromium/ChangeLog        2013-03-06 01:19:20 UTC (rev 144855)
+++ trunk/Source/WebKit/chromium/ChangeLog        2013-03-06 01:29:55 UTC (rev 144856)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2013-03-05  Alexandre Elias  &lt;aelias@chromium.org&gt;
+
+        [chromium] Scroll deltas should be floats
+        https://bugs.webkit.org/show_bug.cgi?id=111465
+
+        Reviewed by James Robinson.
+
+        This converts the remaining scroll delta fields to floats so that
+        we no longer lose precision due to DIP conversion. The natural
+        type for deltas is WebFloatSize, which was missing, so I also created
+        that type based on the existing WebSize header.
+
+        * src/WebCompositorInputHandlerImpl.cpp:
+        (WebKit::WebCompositorInputHandlerImpl::handleInputEventInternal):
+        (WebKit::WebCompositorInputHandlerImpl::touchpadFlingScroll):
+        (WebKit::WebCompositorInputHandlerImpl::scrollBy):
+        * src/WebCompositorInputHandlerImpl.h:
+        (WebCompositorInputHandlerImpl):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::scrollBy):
+        * src/WebViewImpl.h:
+        (WebViewImpl):
+        * tests/WebCompositorInputHandlerImplTest.cpp:
+        (MockWebInputHandlerClient):
+        (WebKit::TEST_F):
+
</ins><span class="cx"> 2013-03-05  Alec Flett  &lt;alecflett@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         IndexedDB: Add IDBBackingStoreTest
</span></span></pre></div>
<a id="trunkSourceWebKitchromiumsrcWebCompositorInputHandlerImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp (144855 => 144856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp        2013-03-06 01:19:20 UTC (rev 144855)
+++ trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp        2013-03-06 01:29:55 UTC (rev 144856)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx">         switch (scrollStatus) {
</span><span class="cx">         case WebInputHandlerClient::ScrollStatusStarted: {
</span><span class="cx">             TRACE_EVENT_INSTANT2(&quot;webkit&quot;, &quot;WebCompositorInputHandlerImpl::handleInput wheel scroll&quot;, &quot;deltaX&quot;, -wheelEvent.deltaX, &quot;deltaY&quot;, -wheelEvent.deltaY);
</span><del>-            bool didScroll = m_inputHandlerClient-&gt;scrollByIfPossible(WebPoint(wheelEvent.x, wheelEvent.y), IntSize(-wheelEvent.deltaX, -wheelEvent.deltaY));
</del><ins>+            bool didScroll = m_inputHandlerClient-&gt;scrollByIfPossible(WebPoint(wheelEvent.x, wheelEvent.y), WebFloatSize(-wheelEvent.deltaX, -wheelEvent.deltaY));
</ins><span class="cx">             m_inputHandlerClient-&gt;scrollEnd();
</span><span class="cx">             return didScroll ? DidHandle : DropEvent;
</span><span class="cx">         }
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> 
</span><span class="cx">         const WebGestureEvent&amp; gestureEvent = *static_cast&lt;const WebGestureEvent*&gt;(&amp;event);
</span><span class="cx">         bool didScroll = m_inputHandlerClient-&gt;scrollByIfPossible(WebPoint(gestureEvent.x, gestureEvent.y),
</span><del>-            IntSize(-gestureEvent.data.scrollUpdate.deltaX, -gestureEvent.data.scrollUpdate.deltaY));
</del><ins>+            WebFloatSize(-gestureEvent.data.scrollUpdate.deltaX, -gestureEvent.data.scrollUpdate.deltaY));
</ins><span class="cx">         return didScroll ? DidHandle : DropEvent;
</span><span class="cx">     } else if (event.type == WebInputEvent::GestureScrollEnd) {
</span><span class="cx">         ASSERT(m_expectScrollUpdateEnd);
</span><span class="lines">@@ -294,12 +294,12 @@
</span><span class="cx">     return hadFlingAnimation;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool WebCompositorInputHandlerImpl::touchpadFlingScroll(const WebPoint&amp; increment)
</del><ins>+bool WebCompositorInputHandlerImpl::touchpadFlingScroll(const WebFloatSize&amp; increment)
</ins><span class="cx"> {
</span><span class="cx">     WebMouseWheelEvent syntheticWheel;
</span><span class="cx">     syntheticWheel.type = WebInputEvent::MouseWheel;
</span><del>-    syntheticWheel.deltaX = increment.x;
-    syntheticWheel.deltaY = increment.y;
</del><ins>+    syntheticWheel.deltaX = increment.width;
+    syntheticWheel.deltaY = increment.height;
</ins><span class="cx">     syntheticWheel.hasPreciseScrollingDeltas = true;
</span><span class="cx">     syntheticWheel.x = m_flingParameters.point.x;
</span><span class="cx">     syntheticWheel.y = m_flingParameters.point.y;
</span><span class="lines">@@ -330,12 +330,12 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebCompositorInputHandlerImpl::scrollBy(const WebPoint&amp; increment)
</del><ins>+void WebCompositorInputHandlerImpl::scrollBy(const WebFloatSize&amp; increment)
</ins><span class="cx"> {
</span><del>-    if (increment == WebPoint())
</del><ins>+    if (increment == WebFloatSize())
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    TRACE_EVENT2(&quot;webkit&quot;, &quot;WebCompositorInputHandlerImpl::scrollBy&quot;, &quot;x&quot;, increment.x, &quot;y&quot;, increment.y);
</del><ins>+    TRACE_EVENT2(&quot;webkit&quot;, &quot;WebCompositorInputHandlerImpl::scrollBy&quot;, &quot;x&quot;, increment.width, &quot;y&quot;, increment.height);
</ins><span class="cx"> 
</span><span class="cx">     bool didScroll = false;
</span><span class="cx"> 
</span><span class="lines">@@ -344,13 +344,13 @@
</span><span class="cx">         didScroll = touchpadFlingScroll(increment);
</span><span class="cx">         break;
</span><span class="cx">     case WebGestureEvent::Touchscreen:
</span><del>-        didScroll = m_inputHandlerClient-&gt;scrollByIfPossible(m_flingParameters.point, IntSize(-increment.x, -increment.y));
</del><ins>+        didScroll = m_inputHandlerClient-&gt;scrollByIfPossible(m_flingParameters.point, WebFloatSize(-increment.width, -increment.height));
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (didScroll) {
</span><del>-        m_flingParameters.cumulativeScroll.width += increment.x;
-        m_flingParameters.cumulativeScroll.height += increment.y;
</del><ins>+        m_flingParameters.cumulativeScroll.width += increment.width;
+        m_flingParameters.cumulativeScroll.height += increment.height;
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitchromiumsrcWebCompositorInputHandlerImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h (144855 => 144856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h        2013-03-06 01:19:20 UTC (rev 144855)
+++ trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h        2013-03-06 01:29:55 UTC (rev 144856)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">     virtual void mainThreadHasStoppedFlinging();
</span><span class="cx"> 
</span><span class="cx">     // WebGestureCurveTarget implementation.
</span><del>-    virtual void scrollBy(const WebPoint&amp;);
</del><ins>+    virtual void scrollBy(const WebFloatSize&amp;);
</ins><span class="cx"> 
</span><span class="cx">     int identifier() const { return m_identifier; }
</span><span class="cx"> 
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">     EventDisposition handleGestureFling(const WebGestureEvent&amp;);
</span><span class="cx"> 
</span><span class="cx">     // Returns true if we scrolled by the increment.
</span><del>-    bool touchpadFlingScroll(const WebPoint&amp; increment);
</del><ins>+    bool touchpadFlingScroll(const WebFloatSize&amp; increment);
</ins><span class="cx"> 
</span><span class="cx">     // Returns true if we actually had an active fling to cancel.
</span><span class="cx">     bool cancelCurrentFling();
</span></span></pre></div>
<a id="trunkSourceWebKitchromiumsrcWebViewImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (144855 => 144856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp        2013-03-06 01:19:20 UTC (rev 144855)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp        2013-03-06 01:29:55 UTC (rev 144856)
</span><span class="lines">@@ -658,16 +658,16 @@
</span><span class="cx">     return PageWidgetEventHandler::handleMouseWheel(mainFrame, event);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebViewImpl::scrollBy(const WebPoint&amp; delta)
</del><ins>+void WebViewImpl::scrollBy(const WebFloatSize&amp; delta)
</ins><span class="cx"> {
</span><span class="cx">     if (m_flingSourceDevice == WebGestureEvent::Touchpad) {
</span><span class="cx">         WebMouseWheelEvent syntheticWheel;
</span><span class="cx">         const float tickDivisor = WebCore::WheelEvent::TickMultiplier;
</span><span class="cx"> 
</span><del>-        syntheticWheel.deltaX = delta.x;
-        syntheticWheel.deltaY = delta.y;
-        syntheticWheel.wheelTicksX = delta.x / tickDivisor;
-        syntheticWheel.wheelTicksY = delta.y / tickDivisor;
</del><ins>+        syntheticWheel.deltaX = delta.width;
+        syntheticWheel.deltaY = delta.height;
+        syntheticWheel.wheelTicksX = delta.width / tickDivisor;
+        syntheticWheel.wheelTicksY = delta.height / tickDivisor;
</ins><span class="cx">         syntheticWheel.hasPreciseScrollingDeltas = true;
</span><span class="cx">         syntheticWheel.x = m_positionOnFlingStart.x;
</span><span class="cx">         syntheticWheel.y = m_positionOnFlingStart.y;
</span><span class="lines">@@ -681,8 +681,8 @@
</span><span class="cx">         WebGestureEvent syntheticGestureEvent;
</span><span class="cx"> 
</span><span class="cx">         syntheticGestureEvent.type = WebInputEvent::GestureScrollUpdateWithoutPropagation;
</span><del>-        syntheticGestureEvent.data.scrollUpdate.deltaX = delta.x;
-        syntheticGestureEvent.data.scrollUpdate.deltaY = delta.y;
</del><ins>+        syntheticGestureEvent.data.scrollUpdate.deltaX = delta.width;
+        syntheticGestureEvent.data.scrollUpdate.deltaY = delta.height;
</ins><span class="cx">         syntheticGestureEvent.x = m_positionOnFlingStart.x;
</span><span class="cx">         syntheticGestureEvent.y = m_positionOnFlingStart.y;
</span><span class="cx">         syntheticGestureEvent.globalX = m_globalPositionOnFlingStart.x;
</span></span></pre></div>
<a id="trunkSourceWebKitchromiumsrcWebViewImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (144855 => 144856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/chromium/src/WebViewImpl.h        2013-03-06 01:19:20 UTC (rev 144855)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h        2013-03-06 01:29:55 UTC (rev 144856)
</span><span class="lines">@@ -400,7 +400,7 @@
</span><span class="cx">     void hasTouchEventHandlers(bool);
</span><span class="cx"> 
</span><span class="cx">     // WebGestureCurveTarget implementation for fling.
</span><del>-    virtual void scrollBy(const WebPoint&amp;);
</del><ins>+    virtual void scrollBy(const WebFloatSize&amp;);
</ins><span class="cx"> 
</span><span class="cx">     // Handles context menu events orignated via the the keyboard. These
</span><span class="cx">     // include the VK_APPS virtual key and the Shift+F10 combine. Code is
</span></span></pre></div>
<a id="trunkSourceWebKitchromiumtestsWebCompositorInputHandlerImplTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/chromium/tests/WebCompositorInputHandlerImplTest.cpp (144855 => 144856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/chromium/tests/WebCompositorInputHandlerImplTest.cpp        2013-03-06 01:19:20 UTC (rev 144855)
+++ trunk/Source/WebKit/chromium/tests/WebCompositorInputHandlerImplTest.cpp        2013-03-06 01:29:55 UTC (rev 144856)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include &lt;gmock/gmock.h&gt;
</span><span class="cx"> #include &lt;gtest/gtest.h&gt;
</span><span class="cx"> #include &lt;public/WebFloatPoint.h&gt;
</span><ins>+#include &lt;public/WebFloatSize.h&gt;
</ins><span class="cx"> #include &lt;public/WebInputHandler.h&gt;
</span><span class="cx"> #include &lt;public/WebInputHandlerClient.h&gt;
</span><span class="cx"> #include &lt;public/WebPoint.h&gt;
</span><span class="lines">@@ -61,7 +62,7 @@
</span><span class="cx">     MOCK_METHOD1(haveTouchEventHandlersAt, bool(WebPoint));
</span><span class="cx"> 
</span><span class="cx">     MOCK_METHOD2(scrollBegin, ScrollStatus(WebPoint, WebInputHandlerClient::ScrollInputType));
</span><del>-    MOCK_METHOD2(scrollByIfPossible, bool(WebPoint, WebSize));
</del><ins>+    MOCK_METHOD2(scrollByIfPossible, bool(WebPoint, WebFloatSize));
</ins><span class="cx">     MOCK_METHOD0(scrollEnd, void());
</span><span class="cx"> 
</span><span class="cx">     MOCK_METHOD0(didReceiveLastInputEventForVSync, void());
</span><span class="lines">@@ -165,7 +166,7 @@
</span><span class="cx"> 
</span><span class="cx">     gesture.type = WebInputEvent::GestureScrollUpdate;
</span><span class="cx">     gesture.data.scrollUpdate.deltaY = -40; // -Y means scroll down - i.e. in the +Y direction.
</span><del>-    EXPECT_CALL(m_mockInputHandlerClient, scrollByIfPossible(testing::_, testing::Field(&amp;WebSize::height, testing::Gt(0))))
</del><ins>+    EXPECT_CALL(m_mockInputHandlerClient, scrollByIfPossible(testing::_, testing::Field(&amp;WebFloatSize::height, testing::Gt(0))))
</ins><span class="cx">         .WillOnce(testing::Return(false));
</span><span class="cx">     m_inputHandler-&gt;handleInputEvent(gesture);
</span><span class="cx"> 
</span><span class="lines">@@ -175,7 +176,7 @@
</span><span class="cx"> 
</span><span class="cx">     gesture.type = WebInputEvent::GestureScrollUpdate;
</span><span class="cx">     gesture.data.scrollUpdate.deltaY = -40; // -Y means scroll down - i.e. in the +Y direction.
</span><del>-    EXPECT_CALL(m_mockInputHandlerClient, scrollByIfPossible(testing::_, testing::Field(&amp;WebSize::height, testing::Gt(0))))
</del><ins>+    EXPECT_CALL(m_mockInputHandlerClient, scrollByIfPossible(testing::_, testing::Field(&amp;WebFloatSize::height, testing::Gt(0))))
</ins><span class="cx">         .WillOnce(testing::Return(true));
</span><span class="cx">     m_inputHandler-&gt;handleInputEvent(gesture);
</span><span class="cx"> 
</span><span class="lines">@@ -303,7 +304,7 @@
</span><span class="cx"> 
</span><span class="cx">     gesture.type = WebInputEvent::GestureScrollUpdate;
</span><span class="cx">     gesture.data.scrollUpdate.deltaY = -40; // -Y means scroll down - i.e. in the +Y direction.
</span><del>-    EXPECT_CALL(m_mockInputHandlerClient, scrollByIfPossible(testing::_, testing::Field(&amp;WebSize::height, testing::Gt(0))))
</del><ins>+    EXPECT_CALL(m_mockInputHandlerClient, scrollByIfPossible(testing::_, testing::Field(&amp;WebFloatSize::height, testing::Gt(0))))
</ins><span class="cx">         .WillOnce(testing::Return(true));
</span><span class="cx">     m_inputHandler-&gt;handleInputEvent(gesture);
</span><span class="cx"> 
</span><span class="lines">@@ -440,7 +441,7 @@
</span><span class="cx">     EXPECT_CALL(m_mockInputHandlerClient, scheduleAnimation());
</span><span class="cx">     EXPECT_CALL(m_mockInputHandlerClient, scrollBegin(testing::_, testing::_))
</span><span class="cx">         .WillOnce(testing::Return(WebInputHandlerClient::ScrollStatusStarted));
</span><del>-    EXPECT_CALL(m_mockInputHandlerClient, scrollByIfPossible(testing::_, testing::Field(&amp;WebSize::width, testing::Lt(0))))
</del><ins>+    EXPECT_CALL(m_mockInputHandlerClient, scrollByIfPossible(testing::_, testing::Field(&amp;WebFloatSize::width, testing::Lt(0))))
</ins><span class="cx">         .WillOnce(testing::Return(true));
</span><span class="cx">     EXPECT_CALL(m_mockInputHandlerClient, scrollEnd());
</span><span class="cx">     m_inputHandler-&gt;animate(10.1);
</span><span class="lines">@@ -524,7 +525,7 @@
</span><span class="cx">     EXPECT_CALL(m_mockInputHandlerClient, scheduleAnimation());
</span><span class="cx">     EXPECT_CALL(m_mockInputHandlerClient, scrollBegin(testing::_, testing::_))
</span><span class="cx">         .WillOnce(testing::Return(WebInputHandlerClient::ScrollStatusStarted));
</span><del>-    EXPECT_CALL(m_mockInputHandlerClient, scrollByIfPossible(testing::_, testing::Field(&amp;WebSize::width, testing::Lt(0))))
</del><ins>+    EXPECT_CALL(m_mockInputHandlerClient, scrollByIfPossible(testing::_, testing::Field(&amp;WebFloatSize::width, testing::Lt(0))))
</ins><span class="cx">         .WillOnce(testing::Return(true));
</span><span class="cx">     EXPECT_CALL(m_mockInputHandlerClient, scrollEnd());
</span><span class="cx">     m_inputHandler-&gt;animate(10.1);
</span><span class="lines">@@ -607,7 +608,7 @@
</span><span class="cx">     EXPECT_CALL(m_mockInputHandlerClient, scheduleAnimation());
</span><span class="cx">     EXPECT_CALL(m_mockInputHandlerClient, scrollBegin(testing::_, testing::_))
</span><span class="cx">         .WillOnce(testing::Return(WebInputHandlerClient::ScrollStatusStarted));
</span><del>-    EXPECT_CALL(m_mockInputHandlerClient, scrollByIfPossible(testing::_, testing::Field(&amp;WebSize::height, testing::Gt(0))))
</del><ins>+    EXPECT_CALL(m_mockInputHandlerClient, scrollByIfPossible(testing::_, testing::Field(&amp;WebFloatSize::height, testing::Gt(0))))
</ins><span class="cx">         .WillOnce(testing::Return(true));
</span><span class="cx">     EXPECT_CALL(m_mockInputHandlerClient, scrollEnd());
</span><span class="cx">     m_inputHandler-&gt;animate(30.1);
</span><span class="lines">@@ -737,7 +738,7 @@
</span><span class="cx"> 
</span><span class="cx">     // The second call should start scrolling in the -X direction.
</span><span class="cx">     EXPECT_CALL(m_mockInputHandlerClient, scheduleAnimation());
</span><del>-    EXPECT_CALL(m_mockInputHandlerClient, scrollByIfPossible(testing::_, testing::Field(&amp;WebSize::width, testing::Lt(0))))
</del><ins>+    EXPECT_CALL(m_mockInputHandlerClient, scrollByIfPossible(testing::_, testing::Field(&amp;WebFloatSize::width, testing::Lt(0))))
</ins><span class="cx">         .WillOnce(testing::Return(true));
</span><span class="cx">     m_inputHandler-&gt;animate(10.1);
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>