Title: [181548] trunk/Source/WebKit2
- Revision
- 181548
- Author
- ddkil...@apple.com
- Date
- 2015-03-16 05:15:22 -0700 (Mon, 16 Mar 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (181547 => 181548)
--- trunk/Source/WebKit2/ChangeLog 2015-03-16 12:14:19 UTC (rev 181547)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-16 12:15:22 UTC (rev 181548)
@@ -1,3 +1,15 @@
+2015-03-16 David Kilzer <ddkil...@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.fra...@apple.com>
Clean up related to wheelEvent names
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (181547 => 181548)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-03-16 12:14:19 UTC (rev 181547)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-03-16 12:15:22 UTC (rev 181548)
@@ -171,13 +171,13 @@
bool PageClientImpl::isViewWindowActive()
{
// FIXME: https://bugs.webkit.org/show_bug.cgi?id=133098
- return isViewVisible() || m_webView->_activeFocusedStateRetainCount;
+ return isViewVisible() || (m_webView && m_webView->_activeFocusedStateRetainCount);
}
bool PageClientImpl::isViewFocused()
{
// FIXME: https://bugs.webkit.org/show_bug.cgi?id=133098
- return isViewWindowActive() || m_webView->_activeFocusedStateRetainCount;
+ return isViewWindowActive() || (m_webView && m_webView->_activeFocusedStateRetainCount);
}
bool PageClientImpl::isViewVisible()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
