Changeset 277508 in webkit

Timestamp:

May 14, 2021, 3:18:06 PM (4 years ago)

Author:

Jean-Yves Avenard

Message:

TestWebKitAPI.Fullscreen.WKViewDelegate is timing out
​https://bugs.webkit.org/show_bug.cgi?id=223282
rdar://75495585

Reviewed by Jer Noble.

• TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm:

(TestWebKitAPI::TEST): Use WkView/NSWindow directly instead of using a
PlatformWebView. A PlatformWebView uses an OffscreenWindow which is a
NSWindow placed with a -10000 offset. This configuration appears to fail
to go into full screen in automation.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-05-14  Jean-Yves Avenard  <jya@apple.com>
+
+        TestWebKitAPI.Fullscreen.WKViewDelegate is timing out
+        https://bugs.webkit.org/show_bug.cgi?id=223282
+        rdar://75495585
+
+        Reviewed by Jer Noble.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm:
+        (TestWebKitAPI::TEST): Use WkView/NSWindow directly instead of using a
+        PlatformWebView. A PlatformWebView uses an OffscreenWindow which is a
+        NSWindow placed with a -10000 offset. This configuration appears to fail
+        to go into full screen in automation.
+
 2021-05-14  Sam Weinig  <weinig@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm

@@ -29 +29 @@
 
 #import "PlatformUtilities.h"
-#import "PlatformWebView.h"
 #import <WebKit/WKPagePrivateMac.h>
 #import <WebKit/WKPreferencesPrivate.h>
 #import <WebKit/WKView.h>
+#import <WebKit/WKViewPrivate.h>
 #import <WebKit/WKWebViewConfigurationPrivate.h>
 #import <WebKit/WKWebViewPrivate.h>
@@ -115 +115 @@
 }
 
-// FIXME: Re-enable this test once webkit.org/b/223282 is resolved
-TEST(Fullscreen, DISABLED_WKViewDelegate)
+TEST(Fullscreen, WKViewDelegate)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreateWithConfiguration(nullptr));
@@ -123 +122 @@
     WKPreferencesSetFullScreenEnabled(preferences, true);
 
-    PlatformWebView webView(context.get(), pageGroup.get());
+    WKRetainPtr<WKPageConfigurationRef> configuration = adoptWK(WKPageConfigurationCreate());
+    WKPageConfigurationSetContext(configuration.get(), context.get());
+    WKPageConfigurationSetPageGroup(configuration.get(), pageGroup.get());
+
+    NSRect rect = NSMakeRect(0, 0, 800, 600);
+    auto webView = adoptNS([[WKView alloc] initWithFrame:rect configurationRef:configuration.get()]);
+    [webView setWindowOcclusionDetectionEnabled:NO];
+
+    auto window = adoptNS([[NSWindow alloc] initWithContentRect:rect styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO]);
+    [[window contentView] addSubview:webView.get()];
+    [window makeKeyAndOrderFront:nil];
 
     RetainPtr<FullscreenDelegateMessageHandler> handler = adoptNS([[FullscreenDelegateMessageHandler alloc] init]);
-    WKPageSetFullscreenDelegate(webView.page(), handler.get());
+    WKPageSetFullscreenDelegate([webView pageRef], handler.get());
 
     WKPageNavigationClientV0 loaderClient;
@@ -133 +142 @@
     loaderClient.base.version = 0;
     loaderClient.didFinishNavigation = didFinishNavigation;
-    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
+    WKPageSetPageNavigationClient([webView pageRef], &loaderClient.base);
 
     receivedLoadedMessage = false;
     WKRetainPtr<WKURLRef> url = adoptWK(Util::createURLForResource("FullscreenDelegate", "html"));
-    WKPageLoadURL(webView.page(), url.get());
+    WKPageLoadURL([webView pageRef], url.get());
 
     TestWebKitAPI::Util::run(&receivedLoadedMessage);
 
-    webView.simulateButtonClick(kWKEventMouseButtonLeftButton, 5, 5, 0);
+    NSEvent *event = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDown location:NSMakePoint(5, 5) modifierFlags:0 timestamp:0 windowNumber:window.get().windowNumber context:0 eventNumber:0 clickCount:0 pressure:0];
+
+    [webView mouseDown:event];
     TestWebKitAPI::Util::run(&receivedWillEnterFullscreenMessage);
     TestWebKitAPI::Util::run(&receivedDidEnterFullscreenMessage);
 
-    webView.simulateButtonClick(kWKEventMouseButtonLeftButton, 5, 5, 0);
+    [webView mouseDown:event];
     TestWebKitAPI::Util::run(&receivedWillExitFullscreenMessage);
     TestWebKitAPI::Util::run(&receivedDidExitFullscreenMessage);