summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-31 16:39:21 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-31 16:39:21 +0000
commitcc4e5cd2b60e2dabfec20af2ed2c3087985fb526 (patch)
tree881ba19065ca4dc50ec9b7f7b3738ca40b9ab3cd
parentb39c6d963c4cd8668c12c2c1baaaed0d80b8cd04 (diff)
downloadchromium_src-cc4e5cd2b60e2dabfec20af2ed2c3087985fb526.zip
chromium_src-cc4e5cd2b60e2dabfec20af2ed2c3087985fb526.tar.gz
chromium_src-cc4e5cd2b60e2dabfec20af2ed2c3087985fb526.tar.bz2
aura: Send correct screen position for touch-points to webkit.
BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/9293027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119899 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/renderer_host/web_input_event_aurax11.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/renderer_host/web_input_event_aurax11.cc b/content/browser/renderer_host/web_input_event_aurax11.cc
index b6037e3..a3aa22f 100644
--- a/content/browser/renderer_host/web_input_event_aurax11.cc
+++ b/content/browser/renderer_host/web_input_event_aurax11.cc
@@ -382,9 +382,9 @@ WebKit::WebTouchPoint* UpdateWebTouchEventFromAuraEvent(
point->position.x = event->x();
point->position.y = event->y();
- // TODO(sad): Convert to screen coordinates.
- point->screenPosition.x = point->position.x;
- point->screenPosition.y = point->position.y;
+ const gfx::Point root_point = event->root_location();
+ point->screenPosition.x = root_point.x();
+ point->screenPosition.y = root_point.y();
// Mark the rest of the points as stationary.
for (unsigned i = 0; i < web_event->touchesLength; ++i) {