Title: [169924] trunk/Source/WebKit2
- Revision
- 169924
- Author
- [email protected]
- Date
- 2014-06-12 17:55:53 -0700 (Thu, 12 Jun 2014)
Log Message
[iOS] Tiny hack to fix WebKitTestRunner view visibility
https://bugs.webkit.org/show_bug.cgi?id=133833
Reviewed by Tim Horton.
PageClientImplIOS in WebKitTestRunner has a null m_webView, so isViewInWindow
was returning false, which confused things.
Fix by falling back to a check on the content view if the m_webView is nil.
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::isViewVisible):
(WebKit::PageClientImpl::isViewInWindow):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (169923 => 169924)
--- trunk/Source/WebKit2/ChangeLog 2014-06-13 00:27:43 UTC (rev 169923)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-13 00:55:53 UTC (rev 169924)
@@ -1,3 +1,19 @@
+2014-06-12 Simon Fraser <[email protected]>
+
+ [iOS] Tiny hack to fix WebKitTestRunner view visibility
+ https://bugs.webkit.org/show_bug.cgi?id=133833
+
+ Reviewed by Tim Horton.
+
+ PageClientImplIOS in WebKitTestRunner has a null m_webView, so isViewInWindow
+ was returning false, which confused things.
+
+ Fix by falling back to a check on the content view if the m_webView is nil.
+
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::isViewVisible):
+ (WebKit::PageClientImpl::isViewInWindow):
+
2014-06-12 Brady Eidson <[email protected]>
Add SPI for image controls and service controls preferences.
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (169923 => 169924)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2014-06-13 00:27:43 UTC (rev 169923)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2014-06-13 00:55:53 UTC (rev 169924)
@@ -124,12 +124,16 @@
bool PageClientImpl::isViewVisible()
{
- return [m_webView window] && [UIApplication sharedApplication].applicationState != UIApplicationStateBackground;
+ return isViewInWindow() && [UIApplication sharedApplication].applicationState != UIApplicationStateBackground;
}
bool PageClientImpl::isViewInWindow()
{
- return [m_webView window];
+ // FIXME: in WebKitTestRunner, m_webView is nil, so check the content view instead.
+ if (m_webView)
+ return [m_webView window];
+
+ return [m_contentView window];
}
bool PageClientImpl::isViewVisibleOrOccluded()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
