Stop forwarding touch events from Java when the top level document is detached rather than when eventHandlers are cleared for a frame.

Also no longer keep track of the number of touch event handlers that a page has registered. If a page requests touch events, always
send them from Java until a new page is loaded. This simplifies the logic when dealing with the page cache as otherwise as well as
restoring the forwarding of touch events when a page is restored from the page cache, we would need to restore the number of touch handlers
that have been registered.

Change-Id: I0269e1632a37ccbf105bac658c2cb7f1d5cd3052

2 files changed, 3 insertions, 3 deletions

diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index 9b0e7b4..17dc0d0 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -468,12 +468,12 @@ void ChromeClientAndroid::wakeUpMainThreadWithNewQuota(long newQuota) {
 }
 
 #if ENABLE(TOUCH_EVENTS)
-void ChromeClientAndroid::needTouchEvents(bool needTouchEvents, bool force)
+void ChromeClientAndroid::needTouchEvents(bool needTouchEvents)
 {
     FrameView* frameView = m_webFrame->page()->mainFrame()->view();
     android::WebViewCore* core = android::WebViewCore::getWebViewCore(frameView);
     if (core)
-        core->needTouchEvents(needTouchEvents, force);
+        core->needTouchEvents(needTouchEvents);
 }
 #endif
 
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
index b61f9fd..15bf52a 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
@@ -137,7 +137,7 @@ namespace android {
 	virtual void populateVisitedLinks();
 
 #if ENABLE(TOUCH_EVENTS)
-        virtual void needTouchEvents(bool, bool);
+        virtual void needTouchEvents(bool);
 #endif
 
         // Methods used to request and provide Geolocation permissions.