diff options
| author | John Reck <jreck@google.com> | 2011-12-07 17:21:24 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-07 17:21:24 -0800 |
| commit | b433116cefaaeb788939d73511f35b1ac7d70156 (patch) | |
| tree | 9d2ece0a773daf996b67d5f77d1f1af45878d040 /Source | |
| parent | 838d6f9b23f400bf120d078278f6348c260cbbc1 (diff) | |
| parent | 1d9cab1bc5a505a47c7a314699520dcd56ee9d4f (diff) | |
| download | external_webkit-b433116cefaaeb788939d73511f35b1ac7d70156.zip external_webkit-b433116cefaaeb788939d73511f35b1ac7d70156.tar.gz external_webkit-b433116cefaaeb788939d73511f35b1ac7d70156.tar.bz2 | |
am 1d9cab1b: Merge "Fix crash" into ics-mr1
* commit '1d9cab1bc5a505a47c7a314699520dcd56ee9d4f':
Fix crash
Diffstat (limited to 'Source')
| -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 5491b23..5e943ae 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -2091,11 +2091,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) |