Merge "Ensure WebViewClassic calls super.onHoverEvent()" into jb-dev

2 files changed, 5 insertions, 0 deletions

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index cbb30116c01e..119fcd37f84d 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -1686,6 +1686,10 @@ public class WebView extends AbsoluteLayout
             WebView.super.computeScroll();
         }
 
+        public boolean super_onHoverEvent(MotionEvent event) {
+            return WebView.super.onHoverEvent(event);
+        }
+
         public boolean super_performAccessibilityAction(int action, Bundle arguments) {
             return WebView.super.performAccessibilityAction(action, arguments);
         }
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index da61e7492a94..84a6129e8c4d 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -5711,6 +5711,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
         int x = viewToContentX((int) event.getX() + getScrollX());
         int y = viewToContentY((int) event.getY() + getScrollY());
         mWebViewCore.sendMessage(EventHub.SET_MOVE_MOUSE, x, y);
+        mWebViewPrivate.super_onHoverEvent(event);
         return true;
     }