diff options
| author | John Reck <jreck@google.com> | 2012-05-03 10:37:14 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2012-05-03 10:37:14 -0700 |
| commit | 4e2a4b529874878b8c8027887cbbbea34cce7334 (patch) | |
| tree | f828d343b871866cace48376f0d8da9f207cc840 /Source/WebKit/android/WebCoreSupport | |
| parent | e859a34171f2a36877d95197d118d962078f8aa0 (diff) | |
| download | external_webkit-4e2a4b529874878b8c8027887cbbbea34cce7334.zip external_webkit-4e2a4b529874878b8c8027887cbbbea34cce7334.tar.gz external_webkit-4e2a4b529874878b8c8027887cbbbea34cce7334.tar.bz2 | |
Fix null pointer crash
Bug: 6436745
Change-Id: I7225fbb3c05d9c8ea79180740bbf1b5f3faf6ead
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport')
| -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(); } } |