From fba5bad67c2589216f05da70a7f2fbd537637672 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Tue, 21 Feb 2012 14:16:31 -0800
Subject: Add two missing null checks

 Bug: 6008243

Change-Id: I32df636933d77dc9d7174f7a025a1ee70bb945fa
---
 Source/WebKit/android/nav/WebView.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/WebKit/android/nav/WebView.cpp')

diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index d2d1321..e86b85a 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -1415,7 +1415,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);
-- 
cgit v1.1