diff options
| author | George Mount <mount@google.com> | 2012-05-24 07:20:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-24 07:20:24 -0700 |
| commit | 9bada0c1014db839ba690474105c2126c11ad317 (patch) | |
| tree | 341434e598aa0ebb3a775badb539153e2468dc3f /Source/WebKit/android/jni/WebViewCore.cpp | |
| parent | cd6a3bff0abccf9f1c3c3351c6984be2c3124239 (diff) | |
| parent | 39ba1a3a160e41f7e3efc87365c14142f02a341a (diff) | |
| download | external_webkit-9bada0c1014db839ba690474105c2126c11ad317.zip external_webkit-9bada0c1014db839ba690474105c2126c11ad317.tar.gz external_webkit-9bada0c1014db839ba690474105c2126c11ad317.tar.bz2 | |
am 39ba1a3a: Merge "Don\'t send selection info to WebView for unrendered selections." into jb-dev
* commit '39ba1a3a160e41f7e3efc87365c14142f02a341a':
Don't send selection info to WebView for unrendered selections.
Diffstat (limited to 'Source/WebKit/android/jni/WebViewCore.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index 9592d29..0add240 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -1602,7 +1602,11 @@ bool WebViewCore::isLtr(const Position& position) SelectText* WebViewCore::createSelectText(const VisibleSelection& selection) { bool isCaret = selection.isCaret(); - if (selection.isNone() || (!selection.isContentEditable() && isCaret)) + if (selection.isNone() || (!selection.isContentEditable() && isCaret) + || !selection.start().anchorNode() + || !selection.start().anchorNode()->renderer() + || !selection.end().anchorNode() + || !selection.end().anchorNode()->renderer()) return 0; RefPtr<Range> range = selection.firstRange(); |