summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 22:10:56 +0000
committertdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 22:10:56 +0000
commitaa64e88bf9575be2951a0766b44a2d07786d9d70 (patch)
treef8ab5ec14657a6e5a8ee60d36c4e062096c12d89
parent804d145076e71761d5eab658dfaf40cfc480833c (diff)
downloadchromium_src-aa64e88bf9575be2951a0766b44a2d07786d9d70.zip
chromium_src-aa64e88bf9575be2951a0766b44a2d07786d9d70.tar.gz
chromium_src-aa64e88bf9575be2951a0766b44a2d07786d9d70.tar.bz2
Prepare to convert WebTouchPoint to use PointF
Another minor chrome side change before we can land https://codereview.chromium.org/149053002/. BUG=336807 Review URL: https://codereview.chromium.org/186143003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254847 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/renderer_host/input/motion_event_web.cc1
-rw-r--r--content/browser/renderer_host/input/touch_event_queue.cc2
2 files changed, 1 insertions, 2 deletions
diff --git a/content/browser/renderer_host/input/motion_event_web.cc b/content/browser/renderer_host/input/motion_event_web.cc
index 5d74e5c..d7f7862 100644
--- a/content/browser/renderer_host/input/motion_event_web.cc
+++ b/content/browser/renderer_host/input/motion_event_web.cc
@@ -7,7 +7,6 @@
#include "base/logging.h"
using blink::WebInputEvent;
-using blink::WebPoint;
using blink::WebTouchEvent;
using blink::WebTouchPoint;
diff --git a/content/browser/renderer_host/input/touch_event_queue.cc b/content/browser/renderer_host/input/touch_event_queue.cc
index 1990b96..7398f97 100644
--- a/content/browser/renderer_host/input/touch_event_queue.cc
+++ b/content/browser/renderer_host/input/touch_event_queue.cc
@@ -174,7 +174,7 @@ class TouchEventQueue::TouchMoveSlopSuppressor {
bool FilterEvent(const WebTouchEvent& event) {
if (WebTouchEventTraits::IsTouchSequenceStart(event)) {
touch_sequence_start_position_ =
- gfx::Point(event.touches[0].position);
+ gfx::PointF(event.touches[0].position.x, event.touches[0].position.y);
suppressing_touch_moves_ = slop_suppression_length_dips_squared_ != 0;
}