summaryrefslogtreecommitdiff
path: root/chromium/content/browser/android/touch_point.h
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-03-18 13:16:26 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-03-20 15:55:39 +0100
commit3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch)
tree92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/content/browser/android/touch_point.h
parente90d7c4b152c56919d963987e2503f9909a666d2 (diff)
downloadqtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies needed on Windows. Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42 Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/content/browser/android/touch_point.h')
-rw-r--r--chromium/content/browser/android/touch_point.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/content/browser/android/touch_point.h b/chromium/content/browser/android/touch_point.h
index 8e9971bad5c..d7caac08764 100644
--- a/chromium/content/browser/android/touch_point.h
+++ b/chromium/content/browser/android/touch_point.h
@@ -12,7 +12,7 @@
namespace content {
// This class provides a helper method to convert a java object array of touch
-// events (in physical pixdels) into a WebKit::WebTouchEvent (in dip).
+// events (in physical pixdels) into a blink::WebTouchEvent (in dip).
class TouchPoint {
public:
static void BuildWebTouchEvent(JNIEnv* env,
@@ -20,7 +20,7 @@ class TouchPoint {
jlong time_ms,
float dpi_scale,
jobjectArray pts,
- WebKit::WebTouchEvent& event);
+ blink::WebTouchEvent& event);
};
bool RegisterTouchPoint(JNIEnv* env);