[webkit-changes] [WebKit/WebKit] 8996a7: [Cocoa] Add conversion functions from native modif...

[EWS]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 8996a7f84e0fde0d7b15e727404daea7b8db8dc6
      https://github.com/WebKit/WebKit/commit/8996a7f84e0fde0d7b15e727404daea7b8db8dc6
  Author: David Kilzer <ddkilzer at apple.com>
  Date:   2022-11-22 (Tue, 22 Nov 2022)

  Changed paths:
    M Source/WebKit/Shared/ios/WebIOSEventFactory.h
    M Source/WebKit/Shared/ios/WebIOSEventFactory.mm
    M Source/WebKit/Shared/mac/WebEventFactory.h
    M Source/WebKit/Shared/mac/WebEventFactory.mm
    M Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm
    M Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.mm

  Log Message:
  -----------
  [Cocoa] Add conversion functions from native modifier types to OptionSet<WebKit::WebEventModifier>
https://bugs.webkit.org/show_bug.cgi?id=248162
<rdar://102571520>

Reviewed by Darin Adler and Timothy Hatcher.

Define conversion functions from native modifier types to
OptionSet<WebKit::WebEventModifier> to make it easier to reuse
this code.

* Source/WebKit/Shared/ios/WebIOSEventFactory.h:
(WebIOSEventFactory::webEventModifiersForUIKeyModifierFlags): Add.
* Source/WebKit/Shared/ios/WebIOSEventFactory.mm:
(WebIOSEventFactory::webEventModifiersForUIKeyModifierFlags): Add.
- Move here from WKMouseGestureRecognizer.mm.

* Source/WebKit/Shared/mac/WebEventFactory.h:
(WebKit::WebEventFactory::webEventModifiersForNSEventModifierFlags): Add.
* Source/WebKit/Shared/mac/WebEventFactory.mm:
(WebKit::modifiersForEvent): Delete.
(WebKit::WebEventFactory::createWebMouseEvent):
(WebKit::WebEventFactory::createWebWheelEvent):
(WebKit::WebEventFactory::createWebKeyboardEvent):
- Switch to use webEventModifiersForNSEventModifierFlags().
(WebKit::WebEventFactory::webEventModifiersForNSEventModifierFlags): Add.
- Move and rename from modifiersForEvent().  Change argument
  type from native event to native modifier flags.

* Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm:
(WebKit::WebAutomationSession::platformWebModifiersFromRaw):
- Remove duplicate code by calling
  WebEventFactory::webEventModifiersForNSEventModifierFlags().
* Source/WebKit/UIProcess/ios/WKMouseGestureRecognizer.mm:
(webEventModifiersForUIKeyModifierFlags): Delete.
- Move to WebIOSEventFactory.mm.
(-[WKMouseGestureRecognizer createMouseEventWithType:wasCancelled:]):
- Switch to use
  WebIOSEventFactory::webEventModifiersForUIKeyModifierFlags().

Canonical link: https://commits.webkit.org/256942@main