summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/nav/WebView.cpp
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-02-21 15:43:33 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-21 15:43:33 -0800
commitcb3b415105a884d70ac845b228f6bb87807f9f34 (patch)
tree3508667aabf4933b9fe275ee62287a63e55033de /Source/WebKit/android/nav/WebView.cpp
parente9e5137f0a4c0744c94b10eeb67162ede3339975 (diff)
parentfba5bad67c2589216f05da70a7f2fbd537637672 (diff)
downloadexternal_webkit-cb3b415105a884d70ac845b228f6bb87807f9f34.zip
external_webkit-cb3b415105a884d70ac845b228f6bb87807f9f34.tar.gz
external_webkit-cb3b415105a884d70ac845b228f6bb87807f9f34.tar.bz2
Merge "Add two missing null checks"
Diffstat (limited to 'Source/WebKit/android/nav/WebView.cpp')
-rw-r--r--Source/WebKit/android/nav/WebView.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index a63675c..2bd76f5 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -1301,7 +1301,7 @@ void setTextSelection(SelectText *selection) {
int getHandleLayerId(SelectText::HandleId handleId, SkIRect& cursorRect) {
SelectText* selectText = static_cast<SelectText*>(getDrawExtra(DrawExtrasSelection));
- if (!selectText)
+ if (!selectText || !m_baseLayer)
return -1;
int layerId = selectText->caretLayerId(handleId);
IntRect rect = selectText->caretRect(handleId);