Title: [243777] branches/safari-607-branch/Tools
Revision
243777
Author
[email protected]
Date
2019-04-02 17:04:36 -0700 (Tue, 02 Apr 2019)

Log 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

Modified Paths

Diff

Modified: branches/safari-607-branch/Tools/ChangeLog (243776 => 243777)


--- branches/safari-607-branch/Tools/ChangeLog	2019-04-03 00:04:33 UTC (rev 243776)
+++ branches/safari-607-branch/Tools/ChangeLog	2019-04-03 00:04:36 UTC (rev 243777)
@@ -1,5 +1,38 @@
 2019-04-02  Kocsen Chung  <[email protected]>
 
+        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  <[email protected]>
+
+            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  <[email protected]>
+
         Cherry-pick r240163. rdar://problem/49539128
 
     webkitpy: Add iPhone and iPad ports

Modified: branches/safari-607-branch/Tools/Scripts/webkitpy/port/ios_simulator.py (243776 => 243777)


--- branches/safari-607-branch/Tools/Scripts/webkitpy/port/ios_simulator.py	2019-04-03 00:04:33 UTC (rev 243776)
+++ branches/safari-607-branch/Tools/Scripts/webkitpy/port/ios_simulator.py	2019-04-03 00:04:36 UTC (rev 243777)
@@ -24,7 +24,7 @@
 
 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
 from webkitpy.xcode.simulated_device import SimulatedDeviceManager
@@ -120,9 +120,17 @@
         DeviceType(hardware_family='iPhone', hardware_type='7'),
     ]
 
+    def __init__(self, *args, **kwargs):
+        super(IPhoneSimulatorPort, self).__init__(*args, **kwargs)
+        self._config = Config(self._executive, self._filesystem, IOSSimulatorPort.port_name)
 
+
 class IPadSimulatorPort(IOSSimulatorPort):
     port_name = 'ipad-simulator'
 
     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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to