Merge "Remove unused and fix build warning"

2 files changed, 0 insertions, 18 deletions

diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index 31d5535..885e730 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -423,7 +423,6 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m
     , m_mainFrame(mainframe)
     , m_popupReply(0)
     , m_blockTextfieldUpdates(false)
-    , m_focusBoundsChanged(false)
     , m_skipContentDraw(false)
     , m_textGeneration(0)
     , m_maxXScroll(320/4)
@@ -728,13 +727,6 @@ void WebViewCore::clearContent()
     updateLocale();
 }
 
-bool WebViewCore::focusBoundsChanged()
-{
-    bool result = m_focusBoundsChanged;
-    m_focusBoundsChanged = false;
-    return result;
-}
-
 void WebViewCore::paintContents(WebCore::GraphicsContext* gc, WebCore::IntRect& dirty)
 {
     WebCore::FrameView* view = m_mainFrame->view();
@@ -4799,11 +4791,6 @@ static void RegisterURLSchemeAsLocal(JNIEnv* env, jobject obj, jint nativeClass,
     WebCore::SchemeRegistry::registerURLSchemeAsLocal(jstringToWtfString(env, scheme));
 }
 
-static bool FocusBoundsChanged(JNIEnv* env, jobject obj, jint nativeClass)
-{
-    return reinterpret_cast<WebViewCore*>(nativeClass)->focusBoundsChanged();
-}
-
 static void Pause(JNIEnv* env, jobject obj, jint nativeClass)
 {
     // This is called for the foreground tab when the browser is put to the
@@ -5005,8 +4992,6 @@ static int FindNext(JNIEnv* env, jobject obj, jint nativeClass,
 static JNINativeMethod gJavaWebViewCoreMethods[] = {
     { "nativeClearContent", "(I)V",
             (void*) ClearContent },
-    { "nativeFocusBoundsChanged", "(I)Z",
-        (void*) FocusBoundsChanged } ,
     { "nativeKey", "(IIIIZZZZ)Z",
         (void*) Key },
     { "nativeContentInvalidateAll", "(I)V",
diff --git a/Source/WebKit/android/jni/WebViewCore.h b/Source/WebKit/android/jni/WebViewCore.h
index ba35005..def09d7 100644
--- a/Source/WebKit/android/jni/WebViewCore.h
+++ b/Source/WebKit/android/jni/WebViewCore.h
@@ -509,8 +509,6 @@ namespace android {
         // reset the picture set to empty
         void clearContent();
 
-        bool focusBoundsChanged();
-
         // record content in a new BaseLayerAndroid, copying the layer tree as well
         WebCore::BaseLayerAndroid* recordContent(SkIPoint* );
 
@@ -760,7 +758,6 @@ namespace android {
         // Used in passToJS to avoid updating the UI text field until after the
         // key event has been processed.
         bool m_blockTextfieldUpdates;
-        bool m_focusBoundsChanged;
         bool m_skipContentDraw;
         // Passed in with key events to know when they were generated.  Store it
         // with the cache so that we can ignore stale text changes.