Changeset 271656 in webkit

Timestamp:

Jan 20, 2021 11:01:57 AM (18 months ago)

Author:

jer.noble@apple.com

Message:

[Mac] Netflix controls do not fade out after entering fullscreen
​https://bugs.webkit.org/show_bug.cgi?id=220472
<rdar://70602577>

Reviewed by Eric Carlson.

Test: TestWebKitAPI/Tests/mac/FullscreenPointerLeave.mm

Netflix uses a "pointerleave" event over their playback controls to trigger setting their "fade out controls"
timer, but a "pointerleave" event isn't fired when the element moves out from under the pointer (either due to
style changes, or the window screen location moving due to entering fullscreen).

Work around this behavior by sending a synthetic mouse event after entering fullscreen, which causes the
"pointerleave" event to be fired if, indeed, the pointer is no longer over the element in question.

• UIProcess/mac/WKFullScreenWindowController.mm:

(-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm (modified) (2 diffs)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (6 diffs)
• Tools/TestWebKitAPI/Tests/mac/FullscreenPointerLeave.mm (added)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-20  Jer Noble  <jer.noble@apple.com>
+
+        [Mac] Netflix controls do not fade out after entering fullscreen
+        https://bugs.webkit.org/show_bug.cgi?id=220472
+        <rdar://70602577>
+
+        Reviewed by Eric Carlson.
+
+        Test: TestWebKitAPI/Tests/mac/FullscreenPointerLeave.mm
+
+        Netflix uses a "pointerleave" event over their playback controls to trigger setting their "fade out controls"
+        timer, but a "pointerleave" event isn't fired when the element moves out from under the pointer (either due to
+        style changes, or the window screen location moving due to entering fullscreen).
+
+        Work around this behavior by sending a synthetic mouse event after entering fullscreen, which causes the
+        "pointerleave" event to be fired if, indeed, the pointer is no longer over the element in question.
+
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
+
 2021-01-20  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm

@@ -31 +31 @@
 #import "AppKitSPI.h"
 #import "LayerTreeContext.h"
+#import "NativeWebMouseEvent.h"
 #import "VideoFullscreenManagerProxy.h"
 #import "WKAPICast.h"
@@ -397 +398 @@
         [self _manager]->didExitFullScreen();
         [self _manager]->setAnimatingFullScreen(false);
+
+        // FIXME(53342): remove once pointer events fire when elements move out from under the pointer.
+        NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSEventTypeMouseMoved
+            location:[NSEvent mouseLocation]
+            modifierFlags:[[NSApp currentEvent] modifierFlags]
+            timestamp:[NSDate timeIntervalSinceReferenceDate]
+            windowNumber:[[_webView window] windowNumber]
+            context:nullptr
+            eventNumber:0
+            clickCount:0
+            pressure:0];
+        WebKit::NativeWebMouseEvent webEvent(fakeEvent, nil, _webView);
+        _page->handleMouseEvent(webEvent);
     }
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -1053 +1053 @@
                 CDD68F0D22C18317000CF0AE /* WKWebViewCloseAllMediaPresentations.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDD68F0C22C18317000CF0AE /* WKWebViewCloseAllMediaPresentations.mm */; };
                 CDE195B51CFE0B880053D256 /* FullscreenTopContentInset.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CDE195B21CFE0ADE0053D256 /* FullscreenTopContentInset.html */; };
+                CDE77D2525A6591C00D4115E /* FullscreenPointerLeave.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDE77D2425A6591C00D4115E /* FullscreenPointerLeave.mm */; };
                 CDED342F249DDE0E0002AE7A /* AudioRoutingArbitration.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDED342E249DDD9D0002AE7A /* AudioRoutingArbitration.mm */; };
                 CDF0B78A216D48DC00421ECC /* CloseWebViewDuringEnterFullscreen.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDF0B789216D484300421ECC /* CloseWebViewDuringEnterFullscreen.mm */; };
@@ -1428 +1429 @@
                                 F47728991E4AE3C1007ABF6A /* full-page-contenteditable.html in Copy Resources */,
                                 F4E0A28B211E4A2B00AF7C7F /* full-page-dropzone.html in Copy Resources */,
+                                CDB4776225568E2700FF5D2A /* full-screen-scroll-position.html in Copy Resources */,
                                 F4F405BC1D4C0D1C007A9707 /* full-size-autoplaying-video-with-audio.html in Copy Resources */,
                                 CD78E11E1DB7EE2A0014A2DE /* FullscreenDelegate.html in Copy Resources */,
@@ -2787 +2789 @@
                 CDE195B21CFE0ADE0053D256 /* FullscreenTopContentInset.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = FullscreenTopContentInset.html; sourceTree = "<group>"; };
                 CDE195B31CFE0ADE0053D256 /* TopContentInset.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TopContentInset.mm; sourceTree = "<group>"; };
+                CDE77D2425A6591C00D4115E /* FullscreenPointerLeave.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FullscreenPointerLeave.mm; sourceTree = "<group>"; };
                 CDED342E249DDD9D0002AE7A /* AudioRoutingArbitration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AudioRoutingArbitration.mm; sourceTree = "<group>"; };
                 CDF0B789216D484300421ECC /* CloseWebViewDuringEnterFullscreen.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CloseWebViewDuringEnterFullscreen.mm; sourceTree = "<group>"; };
@@ -3824 +3827 @@
                                 93575C551D30366E000D604D /* focus-inputs.html */,
                                 F46128D8211E496300D9FADB /* full-page-dropzone.html */,
+                                CDB477612556894B00FF5D2A /* full-screen-scroll-position.html */,
                                 F4F405BA1D4C0CF8007A9707 /* full-size-autoplaying-video-with-audio.html */,
                                 CD78E11B1DB7EA360014A2DE /* FullscreenDelegate.html */,
@@ -4523 +4527 @@
                                 1A7E8B33181208DE00AEB74A /* FragmentNavigation.mm */,
                                 CDB213BC24EF522800FDE301 /* FullscreenFocus.mm */,
+                                CDE77D2425A6591C00D4115E /* FullscreenPointerLeave.mm */,
                                 CDBFCC431A9FF44800A7B691 /* FullscreenZoomInitialFrame.mm */,
                                 51EB125824C68589000CB030 /* HIDGamepads.mm */,
@@ -5269 +5274 @@
                                 CD78E11D1DB7EA660014A2DE /* FullscreenDelegate.mm in Sources */,
                                 CDB213BD24EF522800FDE301 /* FullscreenFocus.mm in Sources */,
+                                CDE77D2525A6591C00D4115E /* FullscreenPointerLeave.mm in Sources */,
+                                CDB477602556886800FF5D2A /* FullScreenScrollPosition.mm in Sources */,
                                 CDBFCC451A9FF45300A7B691 /* FullscreenZoomInitialFrame.mm in Sources */,
                                 83DB79691EF63B3C00BFA5E5 /* Function.cpp in Sources */,