Changeset 171070 in webkit

Timestamp:

Jul 14, 2014 11:31:54 AM (10 years ago)

Author:

mitz@apple.com

Message:

REGRESSION (r171045): Reproducible crash on navigation in PageClientImpl::willRecordNavigationSnapshot
​https://bugs.webkit.org/show_bug.cgi?id=134887

Reviewed by Tim Horton.

• UIProcess/mac/PageClientImpl.mm:

(WebKit::PageClientImpl::navigationGestureDidBegin): nil-check m_webView. It can be nil when
the client is using WKView directly.
(WebKit::PageClientImpl::navigationGestureWillEnd): Ditto.
(WebKit::PageClientImpl::navigationGestureDidEnd): Ditto.
(WebKit::PageClientImpl::willRecordNavigationSnapshot): Ditto.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/PageClientImpl.mm (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-14  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r171045): Reproducible crash on navigation in PageClientImpl::willRecordNavigationSnapshot
+        https://bugs.webkit.org/show_bug.cgi?id=134887
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/mac/PageClientImpl.mm:
+        (WebKit::PageClientImpl::navigationGestureDidBegin): nil-check m_webView. It can be nil when
+        the client is using WKView directly.
+        (WebKit::PageClientImpl::navigationGestureWillEnd): Ditto.
+        (WebKit::PageClientImpl::navigationGestureDidEnd): Ditto.
+        (WebKit::PageClientImpl::willRecordNavigationSnapshot): Ditto.
+
 2014-07-14  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm

@@ -691 +691 @@
 {
 #if WK_API_ENABLED
-    NavigationState::fromWebPage(*m_webView->_page).navigationGestureDidBegin();
+    if (m_webView)
+        NavigationState::fromWebPage(*m_webView->_page).navigationGestureDidBegin();
 #endif
 }
@@ -698 +699 @@
 {
 #if WK_API_ENABLED
-    NavigationState::fromWebPage(*m_webView->_page).navigationGestureWillEnd(willNavigate, item);
+    if (m_webView)
+        NavigationState::fromWebPage(*m_webView->_page).navigationGestureWillEnd(willNavigate, item);
 #else
     UNUSED_PARAM(willNavigate);
@@ -708 +710 @@
 {
 #if WK_API_ENABLED
-    NavigationState::fromWebPage(*m_webView->_page).navigationGestureDidEnd(willNavigate, item);
+    if (m_webView)
+        NavigationState::fromWebPage(*m_webView->_page).navigationGestureDidEnd(willNavigate, item);
 #else
     UNUSED_PARAM(willNavigate);
@@ -718 +721 @@
 {
 #if WK_API_ENABLED
-    NavigationState::fromWebPage(*m_webView->_page).willRecordNavigationSnapshot(item);
+    if (m_webView)
+        NavigationState::fromWebPage(*m_webView->_page).willRecordNavigationSnapshot(item);
 #else
     UNUSED_PARAM(item);