[webkit-changes] [WebKit/WebKit] d685f7: [WKTR] Fix warnings about duplicate NSString categ...

EWS noreply at github.com
Tue Nov 22 15:39:24 PST 2022


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

  Changed paths:
    A Tools/WebKitTestRunner/InjectedBundle/cocoa/AccessibilityCommonCocoa.h
    A Tools/WebKitTestRunner/InjectedBundle/cocoa/AccessibilityCommonCocoa.mm
    M Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm
    M Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm
    R Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityCommonMac.h
    R Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityCommonMac.mm
    M Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm
    M Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm
    M Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm
    M Tools/WebKitTestRunner/PlatformMac.cmake
    M Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj

  Log Message:
  -----------
  [WKTR] Fix warnings about duplicate NSString category methods
https://bugs.webkit.org/show_bug.cgi?id=248239
<rdar://102609414>

Reviewed by Darin Adler.

Remove duplciate methods from AccessibilityUIElementIOS.mm since
they already exist in AccessibilityCommonMac.mm.  Also take this
opportunity to rename AccessibilityCommonMac.{h,mm} to
AccessibilityCommonCocoa.{h,mm} and move them to the cocoa/
folder since they are used on both iOS and Mac platforms.

* Tools/WebKitTestRunner/InjectedBundle/cocoa/AccessibilityCommonCocoa.h: Rename from Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityCommonMac.h.
* Tools/WebKitTestRunner/InjectedBundle/cocoa/AccessibilityCommonCocoa.mm: Rename from Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityCommonMac.mm.

* Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm:
* Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
(+[NSString stringWithJSStringRef:]): Delete.
(-[NSString createJSStringRef]): Delete.
* Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm:
* Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm:
* Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
- Update #import statements for AccessibilityCommonMac.h rename.

* Tools/WebKitTestRunner/PlatformMac.cmake:
* Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
- Update project for header and source file renames.

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




More information about the webkit-changes mailing list