diff options
| author | George Mount <mount@google.com> | 2012-05-24 07:18:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-24 07:18:23 -0700 |
| commit | 39ba1a3a160e41f7e3efc87365c14142f02a341a (patch) | |
| tree | 341434e598aa0ebb3a775badb539153e2468dc3f /Source/WebKit/android/jni/WebViewCore.cpp | |
| parent | 6f4fd96b140b47cb8215dfe480209424929b609e (diff) | |
| parent | 430be9fcdd291a02c0ff2ce97d9d25549f283bd1 (diff) | |
| download | external_webkit-39ba1a3a160e41f7e3efc87365c14142f02a341a.zip external_webkit-39ba1a3a160e41f7e3efc87365c14142f02a341a.tar.gz external_webkit-39ba1a3a160e41f7e3efc87365c14142f02a341a.tar.bz2 | |
Merge "Don't send selection info to WebView for unrendered selections." into jb-dev
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(); |