Title: [240700] trunk/Tools
- Revision
- 240700
- Author
- [email protected]
- Date
- 2019-01-29 18:01:21 -0800 (Tue, 29 Jan 2019)
Log Message
[Mac] Update window scale API usage
https://bugs.webkit.org/show_bug.cgi?id=193991
rdar://problem/47614795
Reviewed by Tim Horton.
* DumpRenderTree/mac/DumpRenderTree.mm:
(changeWindowScaleIfNeeded):
* DumpRenderTree/mac/DumpRenderTreeWindow.h:
* WebKitTestRunner/mac/PlatformWebViewMac.mm:
(WTR::PlatformWebView::changeWindowScaleIfNeeded):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (240699 => 240700)
--- trunk/Tools/ChangeLog 2019-01-30 01:57:45 UTC (rev 240699)
+++ trunk/Tools/ChangeLog 2019-01-30 02:01:21 UTC (rev 240700)
@@ -1,3 +1,17 @@
+2019-01-29 Alexey Proskuryakov <[email protected]>
+
+ [Mac] Update window scale API usage
+ https://bugs.webkit.org/show_bug.cgi?id=193991
+ rdar://problem/47614795
+
+ Reviewed by Tim Horton.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (changeWindowScaleIfNeeded):
+ * DumpRenderTree/mac/DumpRenderTreeWindow.h:
+ * WebKitTestRunner/mac/PlatformWebViewMac.mm:
+ (WTR::PlatformWebView::changeWindowScaleIfNeeded):
+
2019-01-29 Chris Dumez <[email protected]>
REGRESSION: ProcessSwap.DoSameSiteNavigationAfterCrossSiteProvisionalLoadStarted Failing on iOS
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (240699 => 240700)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2019-01-30 01:57:45 UTC (rev 240699)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2019-01-30 02:01:21 UTC (rev 240700)
@@ -1619,7 +1619,11 @@
return;
// When the new scale factor is set on the window first, WebView doesn't see it as a new scale and stops propagating the behavior change to WebCore::Page.
gTestRunner->setBackingScaleFactor(requiredScaleFactor);
- [[[mainFrame webView] window] _setWindowResolution:requiredScaleFactor displayIfChanged:YES];
+ NSWindow *window = [[mainFrame webView] window];
+ if ([window respondsToSelector:@selector(_setWindowResolution:)])
+ [window _setWindowResolution:requiredScaleFactor];
+ else
+ [window _setWindowResolution:requiredScaleFactor displayIfChanged:YES];
}
#endif
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreeWindow.h (240699 => 240700)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreeWindow.h 2019-01-30 01:57:45 UTC (rev 240699)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreeWindow.h 2019-01-30 02:01:21 UTC (rev 240700)
@@ -39,6 +39,9 @@
@interface NSWindow (Details)
+- (void)_setWindowResolution:(CGFloat)resolution;
+
+// FIXME: Remove once the variant above exists on all platforms we need (cf. rdar://problem/47614795).
- (void)_setWindowResolution:(CGFloat)resolution displayIfChanged:(BOOL)displayIfChanged;
@end
Modified: trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm (240699 => 240700)
--- trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2019-01-30 01:57:45 UTC (rev 240699)
+++ trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2019-01-30 02:01:21 UTC (rev 240700)
@@ -52,6 +52,8 @@
// FIXME: Move to NSWindowSPI.h.
@interface NSWindow ()
+- (void)_setWindowResolution:(CGFloat)resolution;
+// FIXME: Remove once the variant above exists on all platforms we need (cf. rdar://problem/47614795).
- (void)_setWindowResolution:(CGFloat)resolution displayIfChanged:(BOOL)displayIfChanged;
@end
@@ -238,7 +240,10 @@
if (currentScale == newScale)
return;
- [m_window _setWindowResolution:newScale displayIfChanged:YES];
+ if ([m_window respondsToSelector:@selector(_setWindowResolution:)])
+ [m_window _setWindowResolution:newScale];
+ else
+ [m_window _setWindowResolution:newScale displayIfChanged:YES];
#if WK_API_ENABLED
[m_view _setOverrideDeviceScaleFactor:newScale];
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
