From a586b7baaf71eef621a826675346b95947fd1df0 Mon Sep 17 00:00:00 2001 From: Huahui Wu Date: Fri, 21 Jan 2011 10:37:09 -0800 Subject: b/3369602 Using Math.round() to convert float coordinates to integers. Change-Id: If4da01046c909667ce57a849569ae6b1acefb939 --- .../src/com/android/dumprendertree/WebViewEventSender.java | 4 ++-- .../src/com/android/dumprendertree2/EventSenderImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/WebViewEventSender.java b/tests/DumpRenderTree/src/com/android/dumprendertree/WebViewEventSender.java index 383d782..17345ae 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/WebViewEventSender.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/WebViewEventSender.java @@ -357,11 +357,11 @@ public class WebViewEventSender implements EventSender { } private int contentsToWindowX(int x) { - return (int) (x * mWebView.getScale()) - mWebView.getScrollX(); + return Math.round(x * mWebView.getScale()) - mWebView.getScrollX(); } private int contentsToWindowY(int y) { - return (int) (y * mWebView.getScale()) - mWebView.getScrollY(); + return Math.round(y * mWebView.getScale()) - mWebView.getScrollY(); } private WebView mWebView = null; diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/EventSenderImpl.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/EventSenderImpl.java index d425734..af22039 100644 --- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/EventSenderImpl.java +++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/EventSenderImpl.java @@ -73,8 +73,8 @@ public class EventSenderImpl { } private Point createViewPointFromContentCoordinates(int x, int y) { - return new Point((int)(x * mWebView.getScale()) - mWebView.getScrollX(), - (int)(y * mWebView.getScale()) - mWebView.getScrollY()); + return new Point(Math.round(x * mWebView.getScale()) - mWebView.getScrollX(), + Math.round(y * mWebView.getScale()) - mWebView.getScrollY()); } public static class TouchPoint { -- cgit v1.1