202054 2019-09-20 13:14:15 -0700 Remove dead code for a specific macOS and iOS SDK 2019-09-23 12:24:06 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=201851 https://bugs.webkit.org/show_bug.cgi?id=186571 InRadar P2 Normal --- 1 krollin krollin ap commit-queue ews-watchlist mmaxfield thorton webkit-bug-importer zalan oldest_to_newest 1572838 0 krollin 2019-09-20 13:14:15 -0700 ComplexTextController::collectComplexTextRunsForCharacters in ComplexTextControllerCoreText.mm has some code for compatibility with specifically macOS 10.14.0 and iOS 12.0 (see Bug 186571). We don't build for these targets any more (when we build for macOS 10.14, it's for a later minor revision), so this code can be removed. 1572839 1 webkit-bug-importer 2019-09-20 13:14:29 -0700 <rdar://problem/55569619> 1572841 2 379263 krollin 2019-09-20 13:16:48 -0700 Created attachment 379263 Patch 1572943 3 379263 ap 2019-09-20 16:34:14 -0700 Comment on attachment 379263 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379263&action=review > Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm:-142 > -#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED == 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED == 120000) While it is probably correct to make this change per the original explanation, please be aware that this is a behavior change. __MAC_OS_X_VERSION_MIN_REQUIRED still equals 101400 for builds that target 10.14. 1572984 4 379263 commit-queue 2019-09-20 17:36:12 -0700 Comment on attachment 379263 Patch Clearing flags on attachment: 379263 Committed r250173: <https://trac.webkit.org/changeset/250173> 1572985 5 commit-queue 2019-09-20 17:36:14 -0700 All reviewed patches have been landed. Closing bug. 1573375 6 krollin 2019-09-23 12:24:06 -0700 (In reply to Alexey Proskuryakov from comment #3) > While it is probably correct to make this change per the original > explanation, please be aware that this is a behavior change. > __MAC_OS_X_VERSION_MIN_REQUIRED still equals 101400 for builds that target > 10.14. Thanks. I didn't know that. 379263 2019-09-20 13:16:48 -0700 2019-09-20 17:36:12 -0700 Patch bug-202054-20190920131647.patch text/plain 3291 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjBmY2M0ODEzNTEwMjhm NWNlMDczYjIxMWJiY2NjNTdjNjZjYjRjMy4uZjI5NTNkZjY0YzMyMjQwZThmOGZmNDY0MWM2YjBj ZjA0ZGQzMjU1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE5LTA5LTIwICBLZWl0 aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgZGVhZCBjb2Rl IGZvciBhIHNwZWNpZmljIG1hY09TIGFuZCBpT1MgU0RLCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIwNTQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzU1NTY5NjE5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIENvbXBsZXhUZXh0Q29udHJvbGxlcjo6Y29sbGVjdENvbXBsZXhUZXh0UnVuc0ZvckNoYXJh Y3RlcnMgaW4KKyAgICAgICAgQ29tcGxleFRleHRDb250cm9sbGVyQ29yZVRleHQubW0gaGFzIHNv bWUgY29kZSBmb3IgY29tcGF0aWJpbGl0eSB3aXRoCisgICAgICAgIHNwZWNpZmljYWxseSBtYWNP UyAxMC4xNC4wIGFuZCBpT1MgMTIuMCAoc2VlIEJ1ZyAxODY1NzEpLiBXZSBkb24ndAorICAgICAg ICBidWlsZCBmb3IgdGhlc2UgdGFyZ2V0cyBhbnkgbW9yZSAod2hlbiB3ZSBidWlsZCBmb3IgbWFj T1MgMTAuMTQsIGl0J3MKKyAgICAgICAgZm9yIGEgbGF0ZXIgbWlub3IgcmV2aXNpb24pLCBzbyB0 aGlzIGNvZGUgY2FuIGJlIHJlbW92ZWQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC0tIG5vIG5l dyBvciBjaGFuZ2VkIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9tYWMvQ29tcGxleFRleHRDb250cm9sbGVyQ29yZVRleHQubW06CisgICAgICAgIChXZWJDb3Jl OjpDb21wbGV4VGV4dENvbnRyb2xsZXI6OmNvbGxlY3RDb21wbGV4VGV4dFJ1bnNGb3JDaGFyYWN0 ZXJzKToKKwogMjAxOS0wOS0xOSAgS2VpdGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5jb20+CiAK ICAgICAgICAgUmVtb3ZlIHNvbWUgc3VwcG9ydCBmb3IgPCBpT1MgMTMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Db21wbGV4VGV4dENvbnRyb2xsZXJD b3JlVGV4dC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Db21wbGV4 VGV4dENvbnRyb2xsZXJDb3JlVGV4dC5tbQppbmRleCA5MDAyNjFhYjAzN2JhZjUwZjQ1ODY2NzM3 OGQ3NDlkMTYwYWIwM2JkLi41NThhN2RkYzc5NjhkNzRkN2NkNzg1NjkzMGZmYWVjN2M5MTAyZWVk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29tcGxl eFRleHRDb250cm9sbGVyQ29yZVRleHQubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29udHJvbGxlckNvcmVUZXh0Lm1tCkBAIC0xMzksMTUg KzEzOSw5IEBAIHZvaWQgQ29tcGxleFRleHRDb250cm9sbGVyOjpjb2xsZWN0Q29tcGxleFRleHRS dW5zRm9yQ2hhcmFjdGVycyhjb25zdCBVQ2hhciogY3AsCiAgICAgaWYgKCFtX21heVVzZU5hdHVy YWxXcml0aW5nRGlyZWN0aW9uIHx8IG1fcnVuLmRpcmVjdGlvbmFsT3ZlcnJpZGUoKSkgewogICAg ICAgICBjb25zdCBzaG9ydCBsdHJGb3JjZWRFbWJlZGRpbmdMZXZlbFZhbHVlID0gMDsKICAgICAg ICAgY29uc3Qgc2hvcnQgcnRsRm9yY2VkRW1iZWRkaW5nTGV2ZWxWYWx1ZSA9IDE7Ci0jaWYgKFBM QVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA9PSAxMDE0MDAp IHx8IChQTEFURk9STShJT1NfRkFNSUxZKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFV SVJFRCA9PSAxMjAwMDApCi0gICAgICAgIHN0YXRpYyBjb25zdCB2b2lkKiBvcHRpb25LZXlzW10g PSB7IGtDVFR5cGVzZXR0ZXJPcHRpb25Gb3JjZWRFbWJlZGRpbmdMZXZlbCwga0NUVHlwZXNldHRl ck9wdGlvbkFsbG93VW5ib3VuZGVkTGF5b3V0IH07Ci0gICAgICAgIHN0YXRpYyBjb25zdCB2b2lk KiBsdHJPcHRpb25WYWx1ZXNbXSA9IHsgQ0ZOdW1iZXJDcmVhdGUoa0NGQWxsb2NhdG9yRGVmYXVs dCwga0NGTnVtYmVyU2hvcnRUeXBlLCAmbHRyRm9yY2VkRW1iZWRkaW5nTGV2ZWxWYWx1ZSksIGtD RkJvb2xlYW5UcnVlIH07Ci0gICAgICAgIHN0YXRpYyBjb25zdCB2b2lkKiBydGxPcHRpb25WYWx1 ZXNbXSA9IHsgQ0ZOdW1iZXJDcmVhdGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwga0NGTnVtYmVyU2hv cnRUeXBlLCAmcnRsRm9yY2VkRW1iZWRkaW5nTGV2ZWxWYWx1ZSksIGtDRkJvb2xlYW5UcnVlIH07 Ci0jZWxzZQogICAgICAgICBzdGF0aWMgY29uc3Qgdm9pZCogb3B0aW9uS2V5c1tdID0geyBrQ1RU eXBlc2V0dGVyT3B0aW9uRm9yY2VkRW1iZWRkaW5nTGV2ZWwgfTsKICAgICAgICAgc3RhdGljIGNv bnN0IHZvaWQqIGx0ck9wdGlvblZhbHVlc1tdID0geyBDRk51bWJlckNyZWF0ZShrQ0ZBbGxvY2F0 b3JEZWZhdWx0LCBrQ0ZOdW1iZXJTaG9ydFR5cGUsICZsdHJGb3JjZWRFbWJlZGRpbmdMZXZlbFZh bHVlKSB9OwogICAgICAgICBzdGF0aWMgY29uc3Qgdm9pZCogcnRsT3B0aW9uVmFsdWVzW10gPSB7 IENGTnVtYmVyQ3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsIGtDRk51bWJlclNob3J0VHlwZSwg JnJ0bEZvcmNlZEVtYmVkZGluZ0xldmVsVmFsdWUpIH07Ci0jZW5kaWYKICAgICAgICAgc3RhdGlj IENGRGljdGlvbmFyeVJlZiBsdHJUeXBlc2V0dGVyT3B0aW9ucyA9IENGRGljdGlvbmFyeUNyZWF0 ZShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBvcHRpb25LZXlzLCBsdHJPcHRpb25WYWx1ZXMsIFdURl9B UlJBWV9MRU5HVEgob3B0aW9uS2V5cyksICZrQ0ZDb3B5U3RyaW5nRGljdGlvbmFyeUtleUNhbGxC YWNrcywgJmtDRlR5cGVEaWN0aW9uYXJ5VmFsdWVDYWxsQmFja3MpOwogICAgICAgICBzdGF0aWMg Q0ZEaWN0aW9uYXJ5UmVmIHJ0bFR5cGVzZXR0ZXJPcHRpb25zID0gQ0ZEaWN0aW9uYXJ5Q3JlYXRl KGtDRkFsbG9jYXRvckRlZmF1bHQsIG9wdGlvbktleXMsIHJ0bE9wdGlvblZhbHVlcywgV1RGX0FS UkFZX0xFTkdUSChvcHRpb25LZXlzKSwgJmtDRkNvcHlTdHJpbmdEaWN0aW9uYXJ5S2V5Q2FsbEJh Y2tzLCAma0NGVHlwZURpY3Rpb25hcnlWYWx1ZUNhbGxCYWNrcyk7CiAK