3 files changed, 7 insertions, 9 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 70e96cd..14fd44e 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -2075,14 +2075,6 @@ bool WebViewCore::handleTouchEvent(int action, int x, int y, int metaState)
     // Track previous touch and if stationary set the state.
     WebCore::IntPoint pt(x - m_scrollOffsetX, y - m_scrollOffsetY);
 
-//  handleTouchEvent() in EventHandler.cpp doesn't handle TouchStationary, which
-//  causes preventDefault be false when it returns. As our Java side may continue
-//  process the events if WebKit doesn't, it can cause unexpected result.
-//    if (type == WebCore::TouchMove && pt == m_lastTouchPoint)
-//        touchState = WebCore::PlatformTouchPoint::TouchStationary;
-
-    m_lastTouchPoint = pt;
-
     WebCore::PlatformTouchEvent te(pt, type, touchState, metaState);
     preventDefault = m_mainFrame->eventHandler()->handleTouchEvent(te);
 #endif
diff --git a/WebKit/android/jni/WebViewCore.h b/WebKit/android/jni/WebViewCore.h
index 056dba1..4ed17bf 100644
--- a/WebKit/android/jni/WebViewCore.h
+++ b/WebKit/android/jni/WebViewCore.h
@@ -558,7 +558,6 @@ namespace android {
 
 #if ENABLE(TOUCH_EVENTS)
         bool m_forwardingTouchEvents;
-        IntPoint m_lastTouchPoint;
 #endif
 
 #if DEBUG_NAV_UI
diff --git a/WebKit/android/nav/CachedPrefix.h b/WebKit/android/nav/CachedPrefix.h
index b682288..73a5c2c 100644
--- a/WebKit/android/nav/CachedPrefix.h
+++ b/WebKit/android/nav/CachedPrefix.h
@@ -43,4 +43,11 @@
 
 #define OFFSETOF(type, field) ((char*)&(((type*)1)->field) - (char*)1) // avoids gnu warning
 
+#ifndef BZERO_DEFINED
+#define BZERO_DEFINED
+// http://www.opengroup.org/onlinepubs/000095399/functions/bzero.html
+// For maximum portability, it is recommended to replace the function call to bzero() as follows:
+#define bzero(b,len) (memset((b), '\0', (len)), (void) 0)
+#endif
+
 #endif