Changeset 240700 in webkit

Timestamp:

Jan 29, 2019, 6:01:21 PM (8 years ago)

Author:

ap@apple.com

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/mac/DumpRenderTree.mm (modified) (1 diff)
• DumpRenderTree/mac/DumpRenderTreeWindow.h (modified) (1 diff)
• WebKitTestRunner/mac/PlatformWebViewMac.mm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-01-29  Alexey Proskuryakov  <ap@apple.com>
+
+        [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  <cdumez@apple.com>
 

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -1620 +1620 @@
     // 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

trunk/Tools/DumpRenderTree/mac/DumpRenderTreeWindow.h

@@ -40 +40 @@
 @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;
 

trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm

@@ -53 +53 @@
 // 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
@@ -239 +241 @@
         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];