diff options
| author | John Reck <jreck@google.com> | 2012-05-03 10:44:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-03 10:44:53 -0700 |
| commit | 2f108e0434f1ded75cabc768d8087c568e971557 (patch) | |
| tree | 82057bf723b348d24c42d00f8681117b90ed66aa /Source/WebKit | |
| parent | 93b1f920c29dd2af08dc086ba0646cf124e81e1a (diff) | |
| parent | 4e2a4b529874878b8c8027887cbbbea34cce7334 (diff) | |
| download | external_webkit-2f108e0434f1ded75cabc768d8087c568e971557.zip external_webkit-2f108e0434f1ded75cabc768d8087c568e971557.tar.gz external_webkit-2f108e0434f1ded75cabc768d8087c568e971557.tar.bz2 | |
Merge "Fix null pointer crash" into jb-dev
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index 271fe58..ac5cd9d 100644 --- a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -422,7 +422,9 @@ void FrameLoaderClientAndroid::dispatchDidFirstLayout() { // so that about:blank will update the screen. if (!m_frame->tree()->parent()) { // Only need to notify Java side for the top frame - WebViewCore::getWebViewCore(m_frame->view())->didFirstLayout(); + WebViewCore* core = WebViewCore::getWebViewCore(m_frame->view()); + if (core) + core->didFirstLayout(); } } |