am f6fdbf35: am 55550b6a: Merge "Do not attempt to put textfield onscreen when size changes." into honeycomb-mr1

* commit 'f6fdbf3574ff706462d9e1e495b7812556578e64':
  Do not attempt to put textfield onscreen when size changes.

2 files changed, 1 insertions, 13 deletions

diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 5744609..34179f2 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -344,7 +344,6 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m
 #endif
     m_isPaused = false;
     m_screenOnCounter = 0;
-    m_onlyScrollIfImeIsShowing = false;
     m_shouldPaintCaret = true;
 
     LOG_ASSERT(m_mainFrame, "Uh oh, somehow a frameview was made without an initial frame!");
@@ -948,7 +947,7 @@ void WebViewCore::scrollTo(int x, int y, bool animate)
 
     JNIEnv* env = JSC::Bindings::getJNIEnv();
     env->CallVoidMethod(m_javaGlue->object(env).get(), m_javaGlue->m_scrollTo,
-            x, y, animate, m_onlyScrollIfImeIsShowing);
+            x, y, animate, false);
     checkException(env);
 }
 
@@ -1316,14 +1315,6 @@ void WebViewCore::setSizeScreenWidthAndScale(int width, int height,
         }
     }
 
-    // If this was in response to touching a textfield and showing the IME,
-    // the IME may now cover textfield.  Bring it back into view.
-    // If the scale changed, however, this was the result of a zoom.
-    if (oldScale == m_scale && osh > screenHeight) {
-        m_onlyScrollIfImeIsShowing = true;
-        revealSelection();
-        m_onlyScrollIfImeIsShowing = false;
-    }
     // update the currently visible screen as perceived by the plugin
     sendPluginVisibleScreen();
 }
diff --git a/WebKit/android/jni/WebViewCore.h b/WebKit/android/jni/WebViewCore.h
index be8de94..df7169d 100644
--- a/WebKit/android/jni/WebViewCore.h
+++ b/WebKit/android/jni/WebViewCore.h
@@ -608,9 +608,6 @@ namespace android {
         int m_blurringNodePointer;
         int m_lastFocusedSelStart;
         int m_lastFocusedSelEnd;
-        // Pass along with a scroll message to tell the UI thread to only
-        // scroll the page if the IME is showing.
-        bool m_onlyScrollIfImeIsShowing;
         PictureSet m_content; // the set of pictures to draw
         SkRegion m_addInval; // the accumulated inval region (not yet drawn)
         SkRegion m_rebuildInval; // the accumulated region for rebuilt pictures