From 4e2a4b529874878b8c8027887cbbbea34cce7334 Mon Sep 17 00:00:00 2001 From: John Reck Date: Thu, 3 May 2012 10:37:14 -0700 Subject: Fix null pointer crash Bug: 6436745 Change-Id: I7225fbb3c05d9c8ea79180740bbf1b5f3faf6ead --- Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Source/WebKit') 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(); } } -- cgit v1.1