diff options
| author | Steve Block <steveblock@google.com> | 2010-09-22 14:10:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-29 17:45:51 +0100 |
| commit | d3f77cbd83886c98082e63773dd09f9de32acc5f (patch) | |
| tree | 1a76b93a61ac13d601b7b49dad3028a81ee989ca /WebKit | |
| parent | 8398c067254e66df9f726716f95aee2a0ca7b39a (diff) | |
| download | external_webkit-d3f77cbd83886c98082e63773dd09f9de32acc5f.zip external_webkit-d3f77cbd83886c98082e63773dd09f9de32acc5f.tar.gz external_webkit-d3f77cbd83886c98082e63773dd09f9de32acc5f.tar.bz2 | |
Merge WebKit at r67908: Frame::revealSelection() moved to SelectionController
See http://trac.webkit.org/changeset/67238
Change-Id: Ie2e1feb0f63acc90397bccd78b55811d1d58be28
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index 619ac10..126a3fb 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -1308,7 +1308,7 @@ void WebViewCore::revealSelection() WebCore::Frame* focusedFrame = focus->document()->frame(); WebFrame* webFrame = WebFrame::getWebFrame(focusedFrame); webFrame->setUserInitiatedAction(true); - focusedFrame->revealSelection(); + focusedFrame->selection()->revealSelection(); webFrame->setUserInitiatedAction(false); } @@ -1886,7 +1886,7 @@ void WebViewCore::setSelection(int start, int end) || !static_cast<WebCore::HTMLInputElement*>(focus)->isPasswordField()) { WebFrame* webFrame = WebFrame::getWebFrame(focusedFrame); webFrame->setUserInitiatedAction(true); - focusedFrame->revealSelection(); + focusedFrame->selection()->revealSelection(); webFrame->setUserInitiatedAction(false); } } |