From 07bb72956bf5daf9db5eae4412a68bd95812197f Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Wed, 7 Dec 2011 16:11:36 -0800
Subject: Fix crash

 Bug: 5727901

Change-Id: Ic2323eca6bc6e77fe428f3602800799e7b996cce
---
 Source/WebKit/android/nav/WebView.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index d3b9591..76f0fb8 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -2108,11 +2108,14 @@ static int nativeFocusCandidateType(JNIEnv *env, jobject obj)
 
 static int nativeFocusCandidateLayerId(JNIEnv *env, jobject obj)
 {
-    const CachedFrame* frame;
+    const CachedFrame* frame = 0;
     const CachedNode* node = getFocusNode(env, obj, &frame);
-    if (!node)
+    if (!node || !frame)
+        return -1;
+    const CachedLayer* layer = frame->layer(node);
+    if (!layer)
         return -1;
-    return frame->layer(node)->uniqueId();
+    return layer->uniqueId();
 }
 
 static bool nativeFocusIsPlugin(JNIEnv *env, jobject obj)
-- 
cgit v1.1