Changeset 263878 in webkit

Timestamp:

Jul 2, 2020, 6:05:35 PM (6 years ago)

Author:

beidson@apple.com

Message:

GameController.framework soft linking refactoring
​https://bugs.webkit.org/show_bug.cgi?id=213909

Reviewed by Tim Horton.

No new tests (No behavior changes)

• WebCore.xcodeproj/project.pbxproj:
• platform/gamepad/cocoa/GameControllerGamepadProvider.mm:

(WebCore::GameControllerGamepadProvider::startMonitoringGamepads):

• platform/gamepad/cocoa/GameControllerSPI.h: Added.
• platform/gamepad/cocoa/GameControllerSoftLink.h: Added.
• platform/gamepad/cocoa/GameControllerSoftLink.mm: Added.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• platform/gamepad/cocoa/GameControllerGamepadProvider.mm (modified) (2 diffs)
• platform/gamepad/cocoa/GameControllerSPI.h (added)
• platform/gamepad/cocoa/GameControllerSoftLink.h (added)
• platform/gamepad/cocoa/GameControllerSoftLink.mm (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-02  Brady Eidson  <beidson@apple.com>
+
+        GameController.framework soft linking refactoring
+        https://bugs.webkit.org/show_bug.cgi?id=213909
+
+        Reviewed by Tim Horton.
+
+        No new tests (No behavior changes)
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/gamepad/cocoa/GameControllerGamepadProvider.mm:
+        (WebCore::GameControllerGamepadProvider::startMonitoringGamepads):
+        * platform/gamepad/cocoa/GameControllerSPI.h: Added.
+        * platform/gamepad/cocoa/GameControllerSoftLink.h: Added.
+        * platform/gamepad/cocoa/GameControllerSoftLink.mm: Added.
+
 2020-07-02  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1409 +1409 @@
                 512DD8FC0D91E6AF000F89EE /* ArchiveResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 512DD8F20D91E6AF000F89EE /* ArchiveResource.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 512DD8FD0D91E6AF000F89EE /* ArchiveFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 512DD8F30D91E6AF000F89EE /* ArchiveFactory.h */; };
+                5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5130F2F424AEA60300E1D0A0 /* GameControllerSoftLink.mm */; };
                 51327D6011A33A2B004F9D65 /* SinkDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 51327D5E11A33A2B004F9D65 /* SinkDocument.h */; };
                 513F14540AB634C400094DDF /* IconLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 513F14520AB634C400094DDF /* IconLoader.h */; };
@@ -8224 +8225 @@
                 512DD8F30D91E6AF000F89EE /* ArchiveFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArchiveFactory.h; sourceTree = "<group>"; };
                 512F1A771C07EA0D00908239 /* IDBGetResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBGetResult.cpp; sourceTree = "<group>"; };
+                5130F2F224AEA60200E1D0A0 /* GameControllerSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameControllerSoftLink.h; sourceTree = "<group>"; };
+                5130F2F424AEA60300E1D0A0 /* GameControllerSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GameControllerSoftLink.mm; sourceTree = "<group>"; };
+                5130F2F524AEA60300E1D0A0 /* GameControllerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameControllerSPI.h; sourceTree = "<group>"; };
                 51327D5E11A33A2B004F9D65 /* SinkDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SinkDocument.h; sourceTree = "<group>"; };
                 51327D5F11A33A2B004F9D65 /* SinkDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SinkDocument.cpp; sourceTree = "<group>"; };
@@ -19712 +19716 @@
                                 51E398FE1D6E474B009C8831 /* GameControllerGamepadProvider.h */,
                                 51E398FF1D6E474B009C8831 /* GameControllerGamepadProvider.mm */,
+                                5130F2F224AEA60200E1D0A0 /* GameControllerSoftLink.h */,
+                                5130F2F424AEA60300E1D0A0 /* GameControllerSoftLink.mm */,
+                                5130F2F524AEA60300E1D0A0 /* GameControllerSPI.h */,
                         );
                         path = cocoa;
@@ -34916 +34923 @@
                                 DE5F84331FA186E9006DB63A /* UnifiedSource330.cpp in Sources */,
                                 DE5F84341FA186E9006DB63A /* UnifiedSource331.cpp in Sources */,
+                                5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */,
                                 DE5F84351FA186E9006DB63A /* UnifiedSource332.cpp in Sources */,
                                 DE5F84361FA186E9006DB63A /* UnifiedSource333.cpp in Sources */,

trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepadProvider.mm

@@ -30 +30 @@
 
 #import "GameControllerGamepad.h"
+#import "GameControllerSoftLink.h"
 #import "GamepadProviderClient.h"
 #import "Logging.h"
 #import <GameController/GameController.h>
 #import <wtf/NeverDestroyed.h>
-#import <wtf/SoftLinking.h>
-
-SOFT_LINK_FRAMEWORK_OPTIONAL(GameController)
-SOFT_LINK_CLASS_OPTIONAL(GameController, GCController);
-SOFT_LINK_CONSTANT_MAY_FAIL(GameController, GCControllerDidConnectNotification, NSString *)
-SOFT_LINK_CONSTANT_MAY_FAIL(GameController, GCControllerDidDisconnectNotification, NSString *)
 
 namespace WebCore {
@@ -107 +102 @@
         return;
 
-    if (canLoadGCControllerDidConnectNotification()) {
-        m_connectObserver = [[NSNotificationCenter defaultCenter] addObserverForName:getGCControllerDidConnectNotification() object:nil queue:nil usingBlock:^(NSNotification *notification) {
+    if (canLoad_GameController_GCControllerDidConnectNotification()) {
+        m_connectObserver = [[NSNotificationCenter defaultCenter] addObserverForName:get_GameController_GCControllerDidConnectNotification() object:nil queue:nil usingBlock:^(NSNotification *notification) {
             GameControllerGamepadProvider::singleton().controllerDidConnect(notification.object, ConnectionVisibility::Visible);
         }];
     }
 
-    if (canLoadGCControllerDidDisconnectNotification()) {
-        m_disconnectObserver = [[NSNotificationCenter defaultCenter] addObserverForName:getGCControllerDidDisconnectNotification() object:nil queue:nil usingBlock:^(NSNotification *notification) {
+    if (canLoad_GameController_GCControllerDidDisconnectNotification()) {
+        m_disconnectObserver = [[NSNotificationCenter defaultCenter] addObserverForName:get_GameController_GCControllerDidDisconnectNotification() object:nil queue:nil usingBlock:^(NSNotification *notification) {
             GameControllerGamepadProvider::singleton().controllerDidDisconnect(notification.object);
         }];