Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java |
index 822280d829191aefd11704e110a3d0684fa7f0a7..6ade3dce442ed68e181362d8e8803c0b8f6d8f4b 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java |
@@ -10,6 +10,7 @@ import android.graphics.Color; |
import android.graphics.Paint; |
import android.graphics.Rect; |
import android.graphics.RectF; |
+import android.os.Build; |
import android.os.Bundle; |
import android.os.Handler; |
import android.support.v4.view.ViewCompat; |
@@ -20,6 +21,7 @@ import android.util.AttributeSet; |
import android.util.Pair; |
import android.view.DragEvent; |
import android.view.MotionEvent; |
+import android.view.PointerIcon; |
import android.view.View; |
import android.view.ViewGroup; |
import android.view.accessibility.AccessibilityEvent; |
@@ -181,6 +183,14 @@ public class CompositorViewHolder extends FrameLayout |
internalInit(); |
} |
+ @Override |
+ public PointerIcon onResolvePointerIcon(MotionEvent event, int pointerIndex) { |
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return null; |
+ View activeView = getActiveView(); |
+ if (activeView == null || !ViewCompat.isAttachedToWindow(activeView)) return null; |
+ return activeView.onResolvePointerIcon(event, pointerIndex); |
+ } |
+ |
/** |
* Creates a {@link CompositorView}. |
* @param c The Context to create this {@link CompositorView} in. |