Changeset 243445 in webkit

Timestamp:

Mar 25, 2019, 12:09:18 PM (7 years ago)

Author:

Wenson Hsieh

Message:

Pull IPadUserInterfaceSwizzler out into a separate header file
​https://bugs.webkit.org/show_bug.cgi?id=196193

Reviewed by Anders Carlsson.

Pull the IPadUserInterfaceSwizzler helper class out into a separate file, so that it may
be used in other API tests.

• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
• TestWebKitAPI/Tests/ios/ActionSheetTests.mm:

(TestWebKitAPI::IPadUserInterfaceSwizzler::IPadUserInterfaceSwizzler): Deleted.
(TestWebKitAPI::IPadUserInterfaceSwizzler::padUserInterfaceIdiom): Deleted.

• TestWebKitAPI/ios/IPadUserInterfaceSwizzler.h: Added.

(TestWebKitAPI::IPadUserInterfaceSwizzler::IPadUserInterfaceSwizzler):
(TestWebKitAPI::IPadUserInterfaceSwizzler::padUserInterfaceIdiom):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (2 diffs)
• TestWebKitAPI/Tests/ios/ActionSheetTests.mm (modified) (2 diffs)
• TestWebKitAPI/ios/IPadUserInterfaceSwizzler.h (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-03-25  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Pull IPadUserInterfaceSwizzler out into a separate header file
+        https://bugs.webkit.org/show_bug.cgi?id=196193
+
+        Reviewed by Anders Carlsson.
+
+        Pull the IPadUserInterfaceSwizzler helper class out into a separate file, so that it may
+        be used in other API tests.
+
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/ios/ActionSheetTests.mm:
+        (TestWebKitAPI::IPadUserInterfaceSwizzler::IPadUserInterfaceSwizzler): Deleted.
+        (TestWebKitAPI::IPadUserInterfaceSwizzler::padUserInterfaceIdiom): Deleted.
+        * TestWebKitAPI/ios/IPadUserInterfaceSwizzler.h: Added.
+        (TestWebKitAPI::IPadUserInterfaceSwizzler::IPadUserInterfaceSwizzler):
+        (TestWebKitAPI::IPadUserInterfaceSwizzler::padUserInterfaceIdiom):
+
 2019-03-25  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
 

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

@@ -2308 +2308 @@
                 F4CD74C720FDB49600DE3794 /* TestURLSchemeHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestURLSchemeHandler.h; sourceTree = "<group>"; };
                 F4CD74C820FDB49600DE3794 /* TestURLSchemeHandler.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = TestURLSchemeHandler.mm; sourceTree = "<group>"; };
+                F4CDAB3322489FE10057A2D9 /* IPadUserInterfaceSwizzler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IPadUserInterfaceSwizzler.h; sourceTree = "<group>"; };
                 F4D2986D20FEE7370092D636 /* RunScriptAfterDocumentLoad.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RunScriptAfterDocumentLoad.mm; sourceTree = "<group>"; };
                 F4D4F3B41E4E2BCB00BB2767 /* DragAndDropSimulatorIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DragAndDropSimulatorIOS.mm; sourceTree = "<group>"; };
@@ -2719 +2720 @@
                         children = (
                                 F4D4F3B41E4E2BCB00BB2767 /* DragAndDropSimulatorIOS.mm */,
+                                F4CDAB3322489FE10057A2D9 /* IPadUserInterfaceSwizzler.h */,
                                 2E7765CC16C4D80A00BA2BB1 /* mainIOS.mm */,
                                 2D61EC3021B0B75C00A7D1CB /* PencilKitTestSPI.h */,

trunk/Tools/TestWebKitAPI/Tests/ios/ActionSheetTests.mm

@@ -30 +30 @@
 
 #import "ClassMethodSwizzler.h"
-#import "InstanceMethodSwizzler.h"
+#import "IPadUserInterfaceSwizzler.h"
 #import "PlatformUtilities.h"
 #import "TestNavigationDelegate.h"
@@ -66 +66 @@
 namespace TestWebKitAPI {
 
-class IPadUserInterfaceSwizzler {
-public:
-    IPadUserInterfaceSwizzler()
-        : m_swizzler([UIDevice class], @selector(userInterfaceIdiom), reinterpret_cast<IMP>(padUserInterfaceIdiom))
-    {
-    }
-private:
-    static UIUserInterfaceIdiom padUserInterfaceIdiom()
-    {
-        return UIUserInterfaceIdiomPad;
-    }
-    InstanceMethodSwizzler m_swizzler;
-};
-
 static RetainPtr<UIViewController> gOverrideViewControllerForFullscreenPresentation;
 static void setOverrideViewControllerForFullscreenPresentation(UIViewController *viewController)