Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(618)

Unified Diff: content/public/android/java/src/org/chromium/content/browser/ContentView.java

Issue 2708613002: Add EventForwarder for routing touch events (Closed)
Patch Set: unittests Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/public/android/java/src/org/chromium/content/browser/ContentView.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentView.java b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
index 33f7d538f670997dcd10d269ccf5584c64f8b974..227c464ed56e4347732ebb955d42590b7642fcad 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentView.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
@@ -22,6 +22,8 @@ import android.view.inputmethod.InputConnection;
import android.widget.FrameLayout;
import org.chromium.base.TraceEvent;
+import org.chromium.ui.base.EventHandler;
+import org.chromium.ui.base.SPenSupport;
/**
* The containing view for {@link ContentViewCore} that exists in the Android UI hierarchy and
@@ -37,6 +39,7 @@ public class ContentView extends FrameLayout
MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
protected final ContentViewCore mContentViewCore;
+ private EventHandler mEventHandler;
/**
* The desired size of this view in {@link MeasureSpec}. Set by the host
@@ -77,6 +80,7 @@ public class ContentView extends FrameLayout
setFocusableInTouchMode(true);
mContentViewCore = cvc;
+ SPenSupport.detect(context);
}
@Override
@@ -184,7 +188,8 @@ public class ContentView extends FrameLayout
@Override
public boolean onTouchEvent(MotionEvent event) {
- return mContentViewCore.onTouchEvent(event);
+ mContentViewCore.onTouchEvent(event);
+ return getEventHandler().onTouchEvent(event);
}
/**
@@ -204,6 +209,13 @@ public class ContentView extends FrameLayout
return mContentViewCore.onGenericMotionEvent(event);
}
+ private EventHandler getEventHandler() {
+ if (mEventHandler == null) {
+ mEventHandler = mContentViewCore.getWebContents().getEventHandler();
+ }
+ return mEventHandler;
+ }
+
@Override
public boolean performLongClick() {
return false;

Powered by Google App Engine
This is Rietveld 408576698