diff options
| author | Leon Scroggins <scroggo@google.com> | 2009-10-23 09:41:05 -0400 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2009-10-23 10:34:18 -0400 |
| commit | f514da7c6b4891ba0db5043e7be58bb49df9a72c (patch) | |
| tree | 4f8253b2283ae02a9cfdcb002452752eae639d29 /WebKit | |
| parent | 1d597e09bd6fa3e654abaf5790d6c18c996828e2 (diff) | |
| download | external_webkit-f514da7c6b4891ba0db5043e7be58bb49df9a72c.zip external_webkit-f514da7c6b4891ba0db5043e7be58bb49df9a72c.tar.gz external_webkit-f514da7c6b4891ba0db5043e7be58bb49df9a72c.tar.bz2 | |
Remove some unused variables.
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/jni/WebViewCore.h | 2 | ||||
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index 5b30d0a..6ca1e4b 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -218,7 +218,6 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m m_popupReply = 0; m_moveGeneration = 0; - m_generation = 0; m_lastGeneration = 0; m_touchGeneration = 0; m_blockTextfieldUpdates = false; @@ -326,7 +325,6 @@ void WebViewCore::reset(bool fromConstructor) m_focusBoundsChanged = false; m_lastFocusedSelStart = 0; m_lastFocusedSelEnd = 0; - m_lastMoveGeneration = 0; clearContent(); m_updatedFrameCache = true; m_frameCacheOutOfDate = true; diff --git a/WebKit/android/jni/WebViewCore.h b/WebKit/android/jni/WebViewCore.h index 39eca61..88031d0 100644 --- a/WebKit/android/jni/WebViewCore.h +++ b/WebKit/android/jni/WebViewCore.h @@ -420,7 +420,6 @@ namespace android { static Mutex gFrameCacheMutex; CachedRoot* m_frameCacheKit; // nav data being built by webcore SkPicture* m_navPictureKit; - int m_generation; // copy of the number bumped by WebViewNative int m_moveGeneration; // copy of state in WebViewNative triggered by move int m_touchGeneration; // copy of state in WebViewNative triggered by touch int m_lastGeneration; // last action using up to date cache @@ -463,7 +462,6 @@ namespace android { WebCore::IntRect m_lastFocusedBounds; int m_lastFocusedSelStart; int m_lastFocusedSelEnd; - int m_lastMoveGeneration; static Mutex m_contentMutex; // protects ui/core thread pictureset access PictureSet m_content; // the set of pictures to draw (accessed by UI too) SkRegion m_addInval; // the accumulated inval region (not yet drawn) diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index 9793ed4..8bf22f0 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -1231,7 +1231,7 @@ void sendMoveMouseIfLatest(bool disableFocusController) void sendMotionUp( WebCore::Frame* framePtr, WebCore::Node* nodePtr, int x, int y) { - m_viewImpl->m_touchGeneration = m_viewImpl->m_generation = ++m_generation; + m_viewImpl->m_touchGeneration = ++m_generation; DBG_NAV_LOGD("m_generation=%d framePtr=%p nodePtr=%p x=%d y=%d", m_generation, framePtr, nodePtr, x, y); LOG_ASSERT(m_javaGlue.m_obj, "A WebView was not associated with this WebViewNative!"); |