commit 98ee7b8a5eb2c89439d7cdab914cc7b3d862f8b0
author The Android Open Source Project <initial-contribution@android.com> Wed Oct 31 09:16:22 2012 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed Oct 31 09:16:22 2012 -0700
tree 2bf61e5bf7a3cb252c3f9703912bde83bf9240bb
parent 8c0e5df8a91955356325a6d526a18f2e1c2196b3
parent f48fa4adc27def6277ddb81a531dfa4800838560

Reconcile with jb-mr1-release - do not merge

Change-Id: I9f43c1a10d1df3c9aa98d21d3dc8689da99fe1b8

Source/WebKit/android/jni/WebViewCore.cpp

diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index aa38222..26ad35a 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -427,6 +427,7 @@
     , m_maxYScroll(240/4)
     , m_scrollOffsetX(0)
     , m_scrollOffsetY(0)
+    , m_scrollSetTime(0)
     , m_mousePos(WebCore::IntPoint(0,0))
     , m_screenWidth(320)
     , m_screenHeight(240)