Changeset 243777 in webkit

Timestamp:

Apr 2, 2019, 5:04:36 PM (7 years ago)

Author:

Kocsen Chung

Message:

Cherry-pick r240339. rdar://problem/49539128

webkitpy: Use correct config for --iphone-simulator and --ipad-simulator
​https://bugs.webkit.org/show_bug.cgi?id=193722
<rdar://problem/47481475>

Reviewed by Lucas Forschler.

iPhone and iPad ports should both use the iOS config.

• Scripts/webkitpy/port/ios_simulator.py: (IPhoneSimulatorPort.init): (IPadSimulatorPort.init):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@240339 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-607-branch/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/ios_simulator.py (modified) (3 diffs)

branches/safari-607-branch/Tools/ChangeLog

@@ +1 @@
+2019-04-02  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r240339. rdar://problem/49539128
+
+    webkitpy: Use correct config for --iphone-simulator and --ipad-simulator
+    https://bugs.webkit.org/show_bug.cgi?id=193722
+    <rdar://problem/47481475>
+    
+    Reviewed by Lucas Forschler.
+    
+    iPhone and iPad ports should both use the iOS config.
+    
+    * Scripts/webkitpy/port/ios_simulator.py:
+    (IPhoneSimulatorPort.__init__):
+    (IPadSimulatorPort.__init__):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240339 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-01-23  Jonathan Bedard  <jbedard@apple.com>
+
+            webkitpy: Use correct config for --iphone-simulator and --ipad-simulator
+            https://bugs.webkit.org/show_bug.cgi?id=193722
+            <rdar://problem/47481475>
+
+            Reviewed by Lucas Forschler.
+
+            iPhone and iPad ports should both use the iOS config.
+
+            * Scripts/webkitpy/port/ios_simulator.py:
+            (IPhoneSimulatorPort.__init__):
+            (IPadSimulatorPort.__init__):
+
 2019-04-02  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-607-branch/Tools/Scripts/webkitpy/port/ios_simulator.py

@@ -25 +25 @@
 from webkitpy.common.memoized import memoized
 from webkitpy.common.version import Version
-from webkitpy.port.config import apple_additions
+from webkitpy.port.config import apple_additions, Config
 from webkitpy.port.ios import IOSPort
 from webkitpy.xcode.device_type import DeviceType
@@ -121 +121 @@
     ]
 
+    def __init__(self, *args, **kwargs):
+        super(IPhoneSimulatorPort, self).__init__(*args, **kwargs)
+        self._config = Config(self._executive, self._filesystem, IOSSimulatorPort.port_name)
+
 
 class IPadSimulatorPort(IOSSimulatorPort):
@@ -127 +131 @@
     DEVICE_TYPE = DeviceType(hardware_family='iPad')
     DEFAULT_DEVICE_TYPES = [DeviceType(hardware_family='iPad', hardware_type='(5th generation)')]
+
+    def __init__(self, *args, **kwargs):
+        super(IPadSimulatorPort, self).__init__(*args, **kwargs)
+        self._config = Config(self._executive, self._filesystem, IOSSimulatorPort.port_name)