diff options
| author | George Mount <mount@google.com> | 2012-05-24 07:23:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-24 07:23:12 -0700 |
| commit | 9b8186433c6514e4f132ef615cc9bdbe6c92ee9e (patch) | |
| tree | 1a5a4d18c0e93394117d3dd8ed21d1f34afca4b1 /Source/WebKit/android/jni/WebViewCore.cpp | |
| parent | 415b03411f96b199071dc0aedc30f9517659929f (diff) | |
| parent | 9bada0c1014db839ba690474105c2126c11ad317 (diff) | |
| download | external_webkit-9b8186433c6514e4f132ef615cc9bdbe6c92ee9e.zip external_webkit-9b8186433c6514e4f132ef615cc9bdbe6c92ee9e.tar.gz external_webkit-9b8186433c6514e4f132ef615cc9bdbe6c92ee9e.tar.bz2 | |
am 9bada0c1: am 39ba1a3a: Merge "Don\'t send selection info to WebView for unrendered selections." into jb-dev
* commit '9bada0c1014db839ba690474105c2126c11ad317':
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 00cec40..74fc8a0 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(); |