202027 2019-09-19 21:27:13 -0700 Remove some support for < iOS 13 2019-09-20 17:17:35 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=201851 InRadar P2 Normal --- 1 krollin krollin achristensen commit-queue joepeck webkit-bug-importer oldest_to_newest 1572636 0 krollin 2019-09-19 21:27:13 -0700 Remove some support for iOS versions less than 13.0. Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have values >= 130000. This means that expressions like "__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and "__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. After version checks have been removed, there are some cases where the preprocessor conditional looks like "#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)". These can be collapsed into "#if PLATFORM(COCOA)". This additional cleanup will be performed in a subsequent patch. This removal is part of a series of patches effecting the removal of dead code for old versions of iOS. This particular pass involves changes in which Joe Pecoraro was involved. These changes are isolated from other similar changes in order to facilitate the reviewing process. 1572637 1 webkit-bug-importer 2019-09-19 21:27:28 -0700 <rdar://problem/55547109> 1572646 2 379206 krollin 2019-09-19 22:29:07 -0700 Created attachment 379206 Patch 1572658 3 379206 achristensen 2019-09-19 22:46:42 -0700 Comment on attachment 379206 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379206&action=review > Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h:222 > +#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY) These should just be PLATFORM(COCOA) 1572661 4 krollin 2019-09-19 22:55:08 -0700 I noted in my comment that I was going to perform that cleanup later. I'd like to keep each patch focussed on one type of change. 1572823 5 krollin 2019-09-20 12:53:34 -0700 So can I land it now anyway? 1572846 6 achristensen 2019-09-20 13:19:56 -0700 I don't see any reason to do this in two changes. It's not hard to follow, and it would merge cleanly if we merged this to a branch. 1572879 7 krollin 2019-09-20 14:06:24 -0700 My reason is that this current patch is part of a much larger body of work, and I don't want to distract myself by going down other paths at the point. I have a process to manage all these details. Getting to the change you want is part of that, but it comes later. 1572883 8 379206 achristensen 2019-09-20 14:08:21 -0700 Comment on attachment 379206 Patch I'm assuming that means you have a long train of git commits that would need rebasing if we changed this. Whatever. You should have a work flow that is more open to review changing things. 1572967 9 379206 commit-queue 2019-09-20 17:17:34 -0700 Comment on attachment 379206 Patch Clearing flags on attachment: 379206 Committed r250171: <https://trac.webkit.org/changeset/250171> 1572968 10 commit-queue 2019-09-20 17:17:35 -0700 All reviewed patches have been landed. Closing bug. 379206 2019-09-19 22:29:07 -0700 2019-09-20 17:17:34 -0700 Patch bug-202027-20190919222906.patch text/plain 5619 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCA1NDRhNWQw ODI4Nzc4ZTE3NjkxZDdkM2Q4MzQ2MmE3MTQxYWRhZjBlLi41NDQ5M2Y4MjQzMzI3YzZlMmI3N2Jm OTBjZGU1YWQ4MTc4NThiOTIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAor MjAxOS0wOS0xOSAgS2VpdGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5jb20+CisKKyAgICAgICAg UmVtb3ZlIHNvbWUgc3VwcG9ydCBmb3IgPCBpT1MgMTMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMjAyNworICAgICAgICA8cmRhcjovL3Byb2JsZW0v NTU1NDcxMDk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgUmVtb3ZlIHNvbWUgc3VwcG9ydCBmb3IgaU9TIHZlcnNpb25zIGxlc3MgdGhhbiAxMy4wLgor CisgICAgICAgIFVwZGF0ZSBjb25kaXRpb25hbHMgdGhhdCByZWZlcmVuY2UgX19JUEhPTkVfT1Nf VkVSU0lPTl9NSU5fUkVRVUlSRUQKKyAgICAgICAgYW5kIF9fSVBIT05FX09TX1ZFUlNJT05fTUFY X0FMTE9XRUQsIGFzc3VtaW5nIHRoYXQgdGhleSBib3RoIGhhdmUKKyAgICAgICAgdmFsdWVzID49 IDEzMDAwMC4gVGhpcyBtZWFucyB0aGF0IGV4cHJlc3Npb25zIGxpa2UKKyAgICAgICAgIl9fSVBI T05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTAxMzAwIiBhcmUgYWx3YXlzIEZhbHNlIGFu ZAorICAgICAgICAiX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMzAwIiBh cmUgYWx3YXlzIFRydWUuCisKKyAgICAgICAgQWZ0ZXIgdmVyc2lvbiBjaGVja3MgaGF2ZSBiZWVu IHJlbW92ZWQsIHRoZXJlIGFyZSBzb21lIGNhc2VzIHdoZXJlIHRoZQorICAgICAgICBwcmVwcm9j ZXNzb3IgY29uZGl0aW9uYWwgbG9va3MgbGlrZSAiI2lmIFBMQVRGT1JNKE1BQykgfHwKKyAgICAg ICAgUExBVEZPUk0oSU9TX0ZBTUlMWSkiLiBUaGVzZSBjYW4gYmUgY29sbGFwc2VkIGludG8gIiNp ZgorICAgICAgICBQTEFURk9STShDT0NPQSkiLiBUaGlzIGFkZGl0aW9uYWwgY2xlYW51cCB3aWxs IGJlIHBlcmZvcm1lZCBpbiBhCisgICAgICAgIHN1YnNlcXVlbnQgcGF0Y2guCisKKyAgICAgICAg VGhpcyByZW1vdmFsIGlzIHBhcnQgb2YgYSBzZXJpZXMgb2YgcGF0Y2hlcyBlZmZlY3RpbmcgdGhl IHJlbW92YWwgb2YKKyAgICAgICAgZGVhZCBjb2RlIGZvciBvbGQgdmVyc2lvbnMgb2YgaU9TLiBU aGlzIHBhcnRpY3VsYXIgcGFzcyBpbnZvbHZlcworICAgICAgICBjaGFuZ2VzIGluIHdoaWNoIEpv ZSBQZWNvcmFybyB3YXMgaW52b2x2ZWQuIFRoZXNlIGNoYW5nZXMgYXJlIGlzb2xhdGVkCisgICAg ICAgIGZyb20gb3RoZXIgc2ltaWxhciBjaGFuZ2VzIGluIG9yZGVyIHRvIGZhY2lsaXRhdGUgdGhl IHJldmlld2luZworICAgICAgICBwcm9jZXNzLgorCisgICAgICAgICogcGFsL3NwaS9jZi9DRk5l dHdvcmtTUEkuaDoKKwogMjAxOS0wOS0xOCAgS2VpdGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5j b20+CiAKICAgICAgICAgUmVtb3ZlIGNoZWNrIG9mIHNldFNvdXJjZUFwcFBpZCBzZWxlY3RvciB0 aGF0J3Mgbm8gbG9uZ2VyIG5lZWRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBmOTAxMzc2Y2JmYmUyZjIxOTFhNTEw OGRlODQwMWQ2YjdiY2FiNzU5Li45Njg2ZjkwNGNiNTY4ZmMxMTBmOGFiNzI0MDRkODg1M2RjZjc5 YTFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE5LTA5LTE5ICBLZWl0aCBSb2xsaW4g IDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgc29tZSBzdXBwb3J0IGZvciA8 IGlPUyAxMworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjAyMDI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NTU0NzEwOT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgc29tZSBzdXBwb3J0IGZv ciBpT1MgdmVyc2lvbnMgbGVzcyB0aGFuIDEzLjAuCisKKyAgICAgICAgVXBkYXRlIGNvbmRpdGlv bmFscyB0aGF0IHJlZmVyZW5jZSBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRAorICAg ICAgICBhbmQgX19JUEhPTkVfT1NfVkVSU0lPTl9NQVhfQUxMT1dFRCwgYXNzdW1pbmcgdGhhdCB0 aGV5IGJvdGggaGF2ZQorICAgICAgICB2YWx1ZXMgPj0gMTMwMDAwLiBUaGlzIG1lYW5zIHRoYXQg ZXhwcmVzc2lvbnMgbGlrZQorICAgICAgICAiX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPCAxMDEzMDAiIGFyZSBhbHdheXMgRmFsc2UgYW5kCisgICAgICAgICJfX0lQSE9ORV9PU19W RVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDEzMDAiIGFyZSBhbHdheXMgVHJ1ZS4KKworICAgICAg ICBBZnRlciB2ZXJzaW9uIGNoZWNrcyBoYXZlIGJlZW4gcmVtb3ZlZCwgdGhlcmUgYXJlIHNvbWUg Y2FzZXMgd2hlcmUgdGhlCisgICAgICAgIHByZXByb2Nlc3NvciBjb25kaXRpb25hbCBsb29rcyBs aWtlICIjaWYgUExBVEZPUk0oTUFDKSB8fAorICAgICAgICBQTEFURk9STShJT1NfRkFNSUxZKSIu IFRoZXNlIGNhbiBiZSBjb2xsYXBzZWQgaW50byAiI2lmCisgICAgICAgIFBMQVRGT1JNKENPQ09B KSIuIFRoaXMgYWRkaXRpb25hbCBjbGVhbnVwIHdpbGwgYmUgcGVyZm9ybWVkIGluIGEKKyAgICAg ICAgc3Vic2VxdWVudCBwYXRjaC4KKworICAgICAgICBUaGlzIHJlbW92YWwgaXMgcGFydCBvZiBh IHNlcmllcyBvZiBwYXRjaGVzIGVmZmVjdGluZyB0aGUgcmVtb3ZhbCBvZgorICAgICAgICBkZWFk IGNvZGUgZm9yIG9sZCB2ZXJzaW9ucyBvZiBpT1MuIFRoaXMgcGFydGljdWxhciBwYXNzIGludm9s dmVzCisgICAgICAgIGNoYW5nZXMgaW4gd2hpY2ggSm9lIFBlY29yYXJvIHdhcyBpbnZvbHZlZC4g VGhlc2UgY2hhbmdlcyBhcmUgaXNvbGF0ZWQKKyAgICAgICAgZnJvbSBvdGhlciBzaW1pbGFyIGNo YW5nZXMgaW4gb3JkZXIgdG8gZmFjaWxpdGF0ZSB0aGUgcmV2aWV3aW5nCisgICAgICAgIHByb2Nl c3MuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29h Lm1tOgorICAgICAgICAoLVtXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vzc2lvbjp0YXNr OmRpZEZpbmlzaENvbGxlY3RpbmdNZXRyaWNzOl0pOgorCiAyMDE5LTA5LTE4ICBLZWl0aCBSb2xs aW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgc29tZSBzdXBwb3J0IGZv ciA8IGlPUyAxMwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ0ZO ZXR3b3JrU1BJLmggYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEku aAppbmRleCA3ODgxYzc4OTYyODc3MmM0YzM2NDZkYTcxMzhmNTk2YWFlNThmZmU3Li4zZGEyYjI2 Y2Q5OGI4NGVjMDk4MWU5ZTQ1NGIwMGFjNzdjNDlmODNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9QQUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Q QUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaApAQCAtMjE5LDcgKzIxOSw3IEBAIHR5cGVkZWYg TlNfRU5VTShOU0ludGVnZXIsIE5TVVJMU2Vzc2lvbkNvbXBhbmlvblByb3h5UHJlZmVyZW5jZSkg ewogI2VuZGlmCiBAZW5kCiAKLSNpZiBQTEFURk9STShNQUMpIHx8IChQTEFURk9STShJT1NfRkFN SUxZKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMTAwMDApCisjaWYg UExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShJT1NfRkFNSUxZKQogQGludGVyZmFjZSBOU1VSTFNl c3Npb25UYXNrVHJhbnNhY3Rpb25NZXRyaWNzICgpCiBAcHJvcGVydHkgKGNvcHksIHJlYWRvbmx5 KSBOU1N0cmluZyogX3JlbW90ZUFkZHJlc3NBbmRQb3J0OwogQHByb3BlcnR5IChjb3B5LCByZWFk b25seSkgTlNVVUlEKiBfY29ubmVjdGlvbklkZW50aWZpZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0gYi9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KaW5k ZXggZDUzYTU0YzNkZjQyMGFlYWIyZWI1NzU0MTg4MDQzNjViYWE2OGI5Mi4uZmQ3NzVmMjEyYmRk NTM1NDNhMzIyOTAyOTdhN2NmNzkwYjBlMGU5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQpAQCAtNjc3 LDcgKzY3Nyw3IEBAIC0gKHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vzc2lvbiB0 YXNrOihOU1VSTFNlc3Npb25UYXNrICopdGFzayBkaWRGaW5pCiAgICAgICAgIGlmIChuZXR3b3Jr RGF0YVRhc2stPnNob3VsZENhcHR1cmVFeHRyYU5ldHdvcmtMb2FkTWV0cmljcygpKSB7CiAgICAg ICAgICAgICBuZXR3b3JrTG9hZE1ldHJpY3MucHJpb3JpdHkgPSB0b05ldHdvcmtMb2FkUHJpb3Jp dHkodGFzay5wcmlvcml0eSk7CiAKLSNpZiBQTEFURk9STShNQUMpIHx8IChQTEFURk9STShJT1Nf RkFNSUxZKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMTAwMDApCisj aWYgUExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShJT1NfRkFNSUxZKQogICAgICAgICAgICAgbmV0 d29ya0xvYWRNZXRyaWNzLnJlbW90ZUFkZHJlc3MgPSBTdHJpbmcobS5fcmVtb3RlQWRkcmVzc0Fu ZFBvcnQpOwogICAgICAgICAgICAgbmV0d29ya0xvYWRNZXRyaWNzLmNvbm5lY3Rpb25JZGVudGlm aWVyID0gU3RyaW5nKFttLl9jb25uZWN0aW9uSWRlbnRpZmllciBVVUlEU3RyaW5nXSk7CiAjZW5k aWYKQEAgLTY5Myw3ICs2OTMsNyBAQCAtICh2b2lkKVVSTFNlc3Npb246KE5TVVJMU2Vzc2lvbiAq KXNlc3Npb24gdGFzazooTlNVUkxTZXNzaW9uVGFzayAqKXRhc2sgZGlkRmluaQogICAgICAgICAg ICAgfV07CiAgICAgICAgICAgICBuZXR3b3JrTG9hZE1ldHJpY3MucmVxdWVzdEhlYWRlcnMgPSBX VEZNb3ZlKHJlcXVlc3RIZWFkZXJzKTsKIAotI2lmIFBMQVRGT1JNKE1BQykgfHwgKFBMQVRGT1JN KElPU19GQU1JTFkpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDExMDAw MCkKKyNpZiBQTEFURk9STShNQUMpIHx8IFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgICAgICAg ICB1aW50NjRfdCByZXF1ZXN0SGVhZGVyQnl0ZXNTZW50ID0gMDsKICAgICAgICAgICAgIHVpbnQ2 NF90IHJlc3BvbnNlSGVhZGVyQnl0ZXNSZWNlaXZlZCA9IDA7CiAgICAgICAgICAgICB1aW50NjRf dCByZXNwb25zZUJvZHlCeXRlc1JlY2VpdmVkID0gMDsK