summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/jni/WebViewCore.cpp
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2012-05-23 15:16:03 -0700
committerGeorge Mount <mount@google.com>2012-05-23 15:16:03 -0700
commit430be9fcdd291a02c0ff2ce97d9d25549f283bd1 (patch)
treedf100ed9b7874a26e52c12314de99f2db32575ad /Source/WebKit/android/jni/WebViewCore.cpp
parenta6645da2a8bfb194b7ee9c790f1da607e0e984c0 (diff)
downloadexternal_webkit-430be9fcdd291a02c0ff2ce97d9d25549f283bd1.zip
external_webkit-430be9fcdd291a02c0ff2ce97d9d25549f283bd1.tar.gz
external_webkit-430be9fcdd291a02c0ff2ce97d9d25549f283bd1.tar.bz2
Don't send selection info to WebView for unrendered selections.
Bug 6537569 Change-Id: Iefbb06ad9175f61b79d815c668754538febec4f5
Diffstat (limited to 'Source/WebKit/android/jni/WebViewCore.cpp')
-rw-r--r--Source/WebKit/android/jni/WebViewCore.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index d07b00e..1822a18 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -1599,7 +1599,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();