Changeset 181548 in webkit

Timestamp:

Mar 16, 2015, 5:15:22 AM (10 years ago)

Author:

ddkilzer@apple.com

Message:

[iOS] REGRESSION (r181511): Most layout tests crash with a NULL deref

Follow-up fix for:
[iOS] Presenting a modal sheet on top of a WKWebView causes it to lose focused, active state
<​http://webkit.org/b/142702>

• UIProcess/ios/PageClientImplIOS.mm:

(WebKit::PageClientImpl::isViewWindowActive): Add NULL check for m_webView.
(WebKit::PageClientImpl::isViewFocused): Ditto.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/PageClientImplIOS.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-16  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] REGRESSION (r181511): Most layout tests crash with a NULL deref
+
+        Follow-up fix for:
+        [iOS] Presenting a modal sheet on top of a WKWebView causes it to lose focused, active state
+        <http://webkit.org/b/142702>
+
+        * UIProcess/ios/PageClientImplIOS.mm:
+        (WebKit::PageClientImpl::isViewWindowActive): Add NULL check for m_webView.
+        (WebKit::PageClientImpl::isViewFocused): Ditto.
+
 2015-03-15  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm

@@ -172 +172 @@
 {
     // FIXME: https://bugs.webkit.org/show_bug.cgi?id=133098
-    return isViewVisible() || m_webView->_activeFocusedStateRetainCount;
+    return isViewVisible() || (m_webView && m_webView->_activeFocusedStateRetainCount);
 }
 
@@ -178 +178 @@
 {
     // FIXME: https://bugs.webkit.org/show_bug.cgi?id=133098
-    return isViewWindowActive() || m_webView->_activeFocusedStateRetainCount;
+    return isViewWindowActive() || (m_webView && m_webView->_activeFocusedStateRetainCount);
 }