Merge Webkit at r70949: setSelectionRange changed

 Updated WebViewCore to use setSelectionRange instead of
 RenderTextControl:setSelectionRange. Now takes the Node* to set the
 selection on.
 http://trac.webkit.org/changeset/70945

Change-Id: I862c986e11d54c6f05f62a14196b4478a70fc549

1 files changed, 1 insertions, 2 deletions

diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 64b53c4..f63f043 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -1923,7 +1923,6 @@ void WebViewCore::setSelection(int start, int end)
     WebCore::RenderObject* renderer = focus->renderer();
     if (!renderer || (!renderer->isTextField() && !renderer->isTextArea()))
         return;
-    WebCore::RenderTextControl* rtc = static_cast<WebCore::RenderTextControl*>(renderer);
     if (start > end) {
         int temp = start;
         start = end;
@@ -1934,7 +1933,7 @@ void WebViewCore::setSelection(int start, int end)
     EditorClientAndroid* client = static_cast<EditorClientAndroid*>(
             m_mainFrame->editor()->client());
     client->setUiGeneratedSelectionChange(true);
-    rtc->setSelectionRange(start, end);
+    setSelectionRange(focus, start, end);
     client->setUiGeneratedSelectionChange(false);
     WebCore::Frame* focusedFrame = focus->document()->frame();
     bool isPasswordField = false;