diff options
| author | John Reck <jreck@google.com> | 2011-12-07 17:18:02 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-07 17:18:02 -0800 |
| commit | 1d9cab1bc5a505a47c7a314699520dcd56ee9d4f (patch) | |
| tree | 1bd1e46b4ec82021e725d263a298ca398175882a | |
| parent | 84117244fe33b7de6e83c691f4f4bc7f0db0f32b (diff) | |
| parent | 07bb72956bf5daf9db5eae4412a68bd95812197f (diff) | |
| download | external_webkit-1d9cab1bc5a505a47c7a314699520dcd56ee9d4f.zip external_webkit-1d9cab1bc5a505a47c7a314699520dcd56ee9d4f.tar.gz external_webkit-1d9cab1bc5a505a47c7a314699520dcd56ee9d4f.tar.bz2 | |
Merge "Fix crash" into ics-mr1
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 9 |
1 files 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) |