133055 2014-05-18 14:28:25 -0700 Bring back two NSString category methods on iOS 2014-05-18 14:37:18 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1010107 0 andersca 2014-05-18 14:28:25 -0700 Bring back two NSString category methods on iOS 1010108 1 231666 andersca 2014-05-18 14:29:50 -0700 Created attachment 231666 Patch 1010110 2 andersca 2014-05-18 14:37:18 -0700 Committed r169018: <http://trac.webkit.org/changeset/169018> 231666 2014-05-18 14:29:50 -0700 2014-05-18 14:33:17 -0700 Patch bug-133055-20140518212927.patch text/plain 4649 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5MDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggNTZhNjE4MTM1 NjdiOTZkOGM3MmEyNjY1YmMxZGM3NTZhNTlhY2JkNy4uZDgzZGQxYjYyYzJiZDM0ZjRkNDExZjA3 N2QzZDg5OTJiNzY3YzE2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0 LTA1LTE4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAg QnJpbmcgYmFjayB0d28gTlNTdHJpbmcgY2F0ZWdvcnkgbWV0aG9kcyBvbiBpT1MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzA1NQorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMTY5NTE5ODM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBNaXNjL1dlYk5TVVJMRXh0cmFzLmg6CisgICAgICAgICogTWlz Yy9XZWJOU1VSTEV4dHJhcy5tbToKKyAgICAgICAgKC1bTlNTdHJpbmcgX3dlYmtpdF91bmVzY2Fw ZWRRdWVyeVZhbHVlXSk6CisgICAgICAgICgtW05TU3RyaW5nIF93ZWJraXRfcXVlcnlLZXlzQW5k VmFsdWVzXSk6CisKIDIwMTQtMDUtMTcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K IAogICAgICAgICBTdWJwaXhlbCByZW5kZXJpbmc6IEFkZCBzdWJwaXhlbENTU09NRWxlbWVudE1l dHJpY3NFbmFibGVkIHRvIFdLMSBXZWJQcmVmZXJlbmNlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvbWFjL01pc2MvV2ViTlNVUkxFeHRyYXMuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL01pc2Mv V2ViTlNVUkxFeHRyYXMuaAppbmRleCA5MjhhODcyZjk0YzM0ZDQ5YWRhNGRmMDY0MTE2NGExYjlj YjgyNDM0Li40NWFjM2FlYjliNWQ3YzA0MzExMTM3NTYxZWE0ZDhlYjg5YjVhMTAxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9NaXNjL1dlYk5TVVJMRXh0cmFzLmgKKysrIGIvU291cmNl L1dlYktpdC9tYWMvTWlzYy9XZWJOU1VSTEV4dHJhcy5oCkBAIC05Nyw0ICs5Nyw5IEBACiAtIChO U1N0cmluZyAqKV93ZWJraXRfVVJMRnJhZ21lbnQ7CiAtIChOU1N0cmluZyAqKV93ZWJraXRfc2Ny aXB0SWZKYXZhU2NyaXB0VVJMOwogCisjaWYgVEFSR0VUX09TX0lQSE9ORQorLSAoTlNTdHJpbmcg Kilfd2Via2l0X3VuZXNjYXBlZFF1ZXJ5VmFsdWU7CistIChOU0RpY3Rpb25hcnkgKilfd2Via2l0 X3F1ZXJ5S2V5c0FuZFZhbHVlczsKKyNlbmRpZgorCiBAZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L21hYy9NaXNjL1dlYk5TVVJMRXh0cmFzLm1tIGIvU291cmNlL1dlYktpdC9tYWMvTWlz Yy9XZWJOU1VSTEV4dHJhcy5tbQppbmRleCA2OWFjNGIxYmNmMDMwYmNiOTNiYTQwMzM2ZGExZmZj OGJjODZkNzhiLi45MGQxZjBjZjFlNTY1NzZlYjA4NmM5OGIzODgxNDAzZTc1NjQ3ZDMzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9NaXNjL1dlYk5TVVJMRXh0cmFzLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvbWFjL01pc2MvV2ViTlNVUkxFeHRyYXMubW0KQEAgLTM5Niw0ICszOTYsNzMg QEAgdXNpbmcgbmFtZXNwYWNlIFdURjsKICAgICByZXR1cm4gW3NlbGYgc3Vic3RyaW5nRnJvbUlu ZGV4OmZyYWdtZW50UmFuZ2UubG9jYXRpb24gKyAxXTsKIH0KIAorI2lmIFBMQVRGT1JNKElPUykK KworLSAoTlNTdHJpbmcgKilfd2Via2l0X3VuZXNjYXBlZFF1ZXJ5VmFsdWUKK3sKKyAgICBOU011 dGFibGVTdHJpbmcgKnN0cmluZyA9IFtbW3NlbGYgc3RyaW5nQnlSZXBsYWNpbmdQZXJjZW50RXNj YXBlc1VzaW5nRW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmddIG11dGFibGVDb3B5XSBhdXRv cmVsZWFzZV07CisgICAgaWYgKCFzdHJpbmcpIC8vIElmIHdlIGZhaWxlZCB0byBkZWNvZGUgdGhl IFVSTCBhcyBVVEY4LCBmYWxsIGJhY2sgdG8gTGF0aW4xCisgICAgICAgIHN0cmluZyA9IFtbW3Nl bGYgc3RyaW5nQnlSZXBsYWNpbmdQZXJjZW50RXNjYXBlc1VzaW5nRW5jb2Rpbmc6TlNJU09MYXRp bjFTdHJpbmdFbmNvZGluZ10gbXV0YWJsZUNvcHldIGF1dG9yZWxlYXNlXTsKKyAgICBbc3RyaW5n IHJlcGxhY2VPY2N1cnJlbmNlc09mU3RyaW5nOkAiKyIgd2l0aFN0cmluZzpAIiAiIG9wdGlvbnM6 TlNMaXRlcmFsU2VhcmNoIHJhbmdlOk5TTWFrZVJhbmdlKDAsIFtzdHJpbmcgbGVuZ3RoXSldOwor ICAgIHJldHVybiBzdHJpbmc7Cit9CisKKy0gKE5TRGljdGlvbmFyeSAqKV93ZWJraXRfcXVlcnlL ZXlzQW5kVmFsdWVzCit7CisgICAgdW5zaWduZWQgcXVlcnlMZW5ndGggPSBbc2VsZiBsZW5ndGhd OworICAgIGlmICghcXVlcnlMZW5ndGgpCisgICAgICAgIHJldHVybiBuaWw7CisKKyAgICBOU011 dGFibGVEaWN0aW9uYXJ5ICpxdWVyeUtleXNBbmRWYWx1ZXMgPSBuaWw7CisgICAgTlNSYW5nZSBl cXVhbFNlYXJjaFJhbmdlID0gTlNNYWtlUmFuZ2UoMCwgcXVlcnlMZW5ndGgpOworCisgICAgd2hp bGUgKGVxdWFsU2VhcmNoUmFuZ2UubG9jYXRpb24gPCBxdWVyeUxlbmd0aCAtIDEgJiYgZXF1YWxT ZWFyY2hSYW5nZS5sZW5ndGgpIHsKKworICAgICAgICAvLyBTZWFyY2ggZm9yICI9Ii4KKyAgICAg ICAgTlNSYW5nZSBlcXVhbFJhbmdlID0gW3NlbGYgcmFuZ2VPZlN0cmluZzpAIj0iIG9wdGlvbnM6 TlNMaXRlcmFsU2VhcmNoIHJhbmdlOmVxdWFsU2VhcmNoUmFuZ2VdOworICAgICAgICBpZiAoZXF1 YWxSYW5nZS5sb2NhdGlvbiA9PSBOU05vdEZvdW5kKQorICAgICAgICAgICAgYnJlYWs7CisKKyAg ICAgICAgdW5zaWduZWQgaW5kZXhBZnRlckVxdWFsID0gZXF1YWxSYW5nZS5sb2NhdGlvbiArIDE7 CisgICAgICAgIGlmIChpbmRleEFmdGVyRXF1YWwgPiBxdWVyeUxlbmd0aCAtIDEpCisgICAgICAg ICAgICBicmVhazsKKworICAgICAgICAvLyBHZXQgdGhlIGtleSBiZWZvcmUgdGhlICI9Ii4KKyAg ICAgICAgTlNSYW5nZSBrZXlSYW5nZSA9IE5TTWFrZVJhbmdlKGVxdWFsU2VhcmNoUmFuZ2UubG9j YXRpb24sIGVxdWFsUmFuZ2UubG9jYXRpb24gLSBlcXVhbFNlYXJjaFJhbmdlLmxvY2F0aW9uKTsK KworICAgICAgICAvLyBTZWFjaCBmb3IgdGhlIGFtcGVyc2FuZC4KKyAgICAgICAgTlNSYW5nZSBh bXBlcnNhbmRTZWFyY2hSYW5nZSA9IE5TTWFrZVJhbmdlKGluZGV4QWZ0ZXJFcXVhbCwgcXVlcnlM ZW5ndGggLSBpbmRleEFmdGVyRXF1YWwpOworICAgICAgICBOU1JhbmdlIGFtcGVyc2FuZFJhbmdl ID0gW3NlbGYgcmFuZ2VPZlN0cmluZzpAIiYiIG9wdGlvbnM6TlNMaXRlcmFsU2VhcmNoIHJhbmdl OmFtcGVyc2FuZFNlYXJjaFJhbmdlXTsKKworICAgICAgICAvLyBHZXQgdGhlIHZhbHVlIGFmdGVy IHRoZSAiPSIsIGJlZm9yZSB0aGUgYW1wZXJzYW5kLgorICAgICAgICBOU1JhbmdlIHZhbHVlUmFu Z2U7CisgICAgICAgIGlmIChhbXBlcnNhbmRSYW5nZS5sb2NhdGlvbiAhPSBOU05vdEZvdW5kKQor ICAgICAgICAgICAgdmFsdWVSYW5nZSA9IE5TTWFrZVJhbmdlKGluZGV4QWZ0ZXJFcXVhbCwgYW1w ZXJzYW5kUmFuZ2UubG9jYXRpb24gLSBpbmRleEFmdGVyRXF1YWwpOworICAgICAgICBlbHNlCisg ICAgICAgICAgICB2YWx1ZVJhbmdlID0gTlNNYWtlUmFuZ2UoaW5kZXhBZnRlckVxdWFsLCBxdWVy eUxlbmd0aCAtIGluZGV4QWZ0ZXJFcXVhbCk7CisKKyAgICAgICAgLy8gU2F2ZSB0aGUga2V5IGFu ZCB0aGUgdmFsdWUuCisgICAgICAgIGlmIChrZXlSYW5nZS5sZW5ndGggJiYgdmFsdWVSYW5nZS5s ZW5ndGgpIHsKKyAgICAgICAgICAgIGlmIChxdWVyeUtleXNBbmRWYWx1ZXMgPT0gbmlsKQorICAg ICAgICAgICAgICAgIHF1ZXJ5S2V5c0FuZFZhbHVlcyA9IFtOU011dGFibGVEaWN0aW9uYXJ5IGRp Y3Rpb25hcnldOworICAgICAgICAgICAgTlNTdHJpbmcgKmtleSA9IFtbc2VsZiBzdWJzdHJpbmdX aXRoUmFuZ2U6a2V5UmFuZ2VdIGxvd2VyY2FzZVN0cmluZ107CisgICAgICAgICAgICBOU1N0cmlu ZyAqdmFsdWUgPSBbW3NlbGYgc3Vic3RyaW5nV2l0aFJhbmdlOnZhbHVlUmFuZ2VdIF93ZWJraXRf dW5lc2NhcGVkUXVlcnlWYWx1ZV07CisgICAgICAgICAgICBpZiAoW2tleSBsZW5ndGhdICYmIFt2 YWx1ZSBsZW5ndGhdKQorICAgICAgICAgICAgICAgIFtxdWVyeUtleXNBbmRWYWx1ZXMgc2V0T2Jq ZWN0OnZhbHVlIGZvcktleTprZXldOworICAgICAgICB9CisKKyAgICAgICAgLy8gQXQgdGhlIGVu ZC4KKyAgICAgICAgaWYgKGFtcGVyc2FuZFJhbmdlLmxvY2F0aW9uID09IE5TTm90Rm91bmQpCisg ICAgICAgICAgICBicmVhazsKKworICAgICAgICAvLyBDb250aW51ZSBzZWFyY2hpbmcgYWZ0ZXIg dGhlIGFtcGVyc2FuZC4KKyAgICAgICAgdW5zaWduZWQgaW5kZXhBZnRlckFtcGVyc2FuZCA9IGFt cGVyc2FuZFJhbmdlLmxvY2F0aW9uICsgMTsKKyAgICAgICAgZXF1YWxTZWFyY2hSYW5nZSA9IE5T TWFrZVJhbmdlKGluZGV4QWZ0ZXJBbXBlcnNhbmQsIHF1ZXJ5TGVuZ3RoIC0gaW5kZXhBZnRlckFt cGVyc2FuZCk7CisgICAgfQorCisgICAgcmV0dXJuIHF1ZXJ5S2V5c0FuZFZhbHVlczsKK30KKwor I2VuZGlmIC8vIFBMQVRGT1JNKElPUykKKwogQGVuZAo=