181004 2017-12-19 15:20:37 -0800 [Meta][Win] Support ICU 59.1+ 2019-03-06 10:19:25 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=195346 InRadar P2 Normal --- 180963 1 don.olmstead fujii achristensen annulen basuke bfulgham commit-queue fujii pvollan webkit-bug-importer oldest_to_newest 1383363 0 don.olmstead 2017-12-19 15:20:37 -0800 ICU 59 changed the value of UChar from wchar_t to char16_t. This causes a number of compilation issues when building on Windows. https://bugs.webkit.org/show_bug.cgi?id=172729 started the migration but it does not handle all cases for Windows ports. 1397462 1 333357 fujii 2018-02-07 22:50:33 -0800 Created attachment 333357 WIP patch This is a half-baked WIP patch. We need a lot of conversions between UChar* and wchar_t*. I think this is a bad idea. wchar_t and char16_t has the identical internal representation in Windows. I think we should define -DUCHAR_TYPE=wchar_t for Windows port. http://icu-project.org/apiref/icu4c/umachine_8h.html#a6bb9fad572d65b305324ef288165e2ac 1397467 2 333359 fujii 2018-02-07 23:22:46 -0800 Created attachment 333359 Patch 1397641 3 don.olmstead 2018-02-08 12:12:11 -0800 (In reply to Fujii Hironori from comment #2) > Created attachment 333359 [details] > Patch Does this require ICU to be compiled with that option as well? 1397689 4 don.olmstead 2018-02-08 13:20:04 -0800 (In reply to Don Olmstead from comment #3) > (In reply to Fujii Hironori from comment #2) > > Created attachment 333359 [details] > > Patch > > Does this require ICU to be compiled with that option as well? I'll cq+ it if you can confirm whether or not this is the case Fujii 1397769 5 fujii 2018-02-08 17:05:58 -0800 (In reply to Don Olmstead from comment #3) > Does this require ICU to be compiled with that option as well? No, it doesn't. 1397781 6 don.olmstead 2018-02-08 17:32:29 -0800 (In reply to Fujii Hironori from comment #5) > (In reply to Don Olmstead from comment #3) > > Does this require ICU to be compiled with that option as well? > > No, it doesn't. Ok cq+ on it. I still think we need to figure out what we should be doing for this though to actually fix it. I'm not sure that this will be available for an extended period of time. 1397789 7 333359 commit-queue 2018-02-08 17:58:28 -0800 Comment on attachment 333359 Patch Clearing flags on attachment: 333359 Committed r228305: <https://trac.webkit.org/changeset/228305> 1397790 8 commit-queue 2018-02-08 17:58:30 -0800 All reviewed patches have been landed. Closing bug. 1397791 9 webkit-bug-importer 2018-02-08 17:59:28 -0800 <rdar://problem/37374476> 333357 2018-02-07 22:50:33 -0800 2018-02-07 23:22:40 -0800 WIP patch wip.patch text/plain 10135 fujii ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL3dpbi9MYW5ndWFnZVdpbi5jcHAgYi9Tb3VyY2Uv V1RGL3d0Zi93aW4vTGFuZ3VhZ2VXaW4uY3BwCmluZGV4IDc2MDEwOTg1NTAwLi5lZTU0ODE1NTY1 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvd2luL0xhbmd1YWdlV2luLmNwcAorKysgYi9T b3VyY2UvV1RGL3d0Zi93aW4vTGFuZ3VhZ2VXaW4uY3BwCkBAIC00NCw3ICs0NCw3IEBAIHN0YXRp YyBTdHJpbmcgbG9jYWxlSW5mbyhMQ1RZUEUgbG9jYWxlVHlwZSwgY29uc3QgU3RyaW5nJiBmYWxs YmFjaykKICAgICAgICAgcmV0dXJuIGZhbGxiYWNrOwogICAgIFVDaGFyKiBsb2NhbGVOYW1lQnVm OwogICAgIFN0cmluZyBsb2NhbGVOYW1lID0gU3RyaW5nOjpjcmVhdGVVbmluaXRpYWxpemVkKGxv Y2FsZUNoYXJzLCBsb2NhbGVOYW1lQnVmKTsKLSAgICBsb2NhbGVDaGFycyA9IEdldExvY2FsZUlu Zm8obGFuZ0lELCBsb2NhbGVUeXBlLCBsb2NhbGVOYW1lQnVmLCBsb2NhbGVDaGFycyk7CisgICAg bG9jYWxlQ2hhcnMgPSBHZXRMb2NhbGVJbmZvKGxhbmdJRCwgbG9jYWxlVHlwZSwgcmVpbnRlcnBy ZXRfY2FzdDxMUFRTVFI+KGxvY2FsZU5hbWVCdWYpLCBsb2NhbGVDaGFycyk7CiAgICAgaWYgKCFs b2NhbGVDaGFycykKICAgICAgICAgcmV0dXJuIGZhbGxiYWNrOwogICAgIGlmIChsb2NhbGVOYW1l LmlzRW1wdHkoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3dpbi9Gb250Q2FjaGVXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv d2luL0ZvbnRDYWNoZVdpbi5jcHAKaW5kZXggYjc2NzVjYWI4ZDQuLmM5MTE3NDFjMDg4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2lu LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hl V2luLmNwcApAQCAtMzAzLDcgKzMwMyw3IEBAIFJlZlB0cjxGb250PiBGb250Q2FjaGU6OnN5c3Rl bUZhbGxiYWNrRm9yQ2hhcmFjdGVycyhjb25zdCBGb250RGVzY3JpcHRpb24mIGRlc2NyCiAKICAg ICAgICAgTE9HRk9OVCBsb2dGb250OwogICAgICAgICBsb2dGb250LmxmQ2hhclNldCA9IERFRkFV TFRfQ0hBUlNFVDsKLSAgICAgICAgU3RyaW5nVmlldyhsaW5rZWRGb250cy0+YXQobGlua2VkRm9u dEluZGV4KSkuZ2V0Q2hhcmFjdGVyc1dpdGhVcGNvbnZlcnQobG9nRm9udC5sZkZhY2VOYW1lKTsK KyAgICAgICAgU3RyaW5nVmlldyhsaW5rZWRGb250cy0+YXQobGlua2VkRm9udEluZGV4KSkuZ2V0 Q2hhcmFjdGVyc1dpdGhVcGNvbnZlcnQocmVpbnRlcnByZXRfY2FzdDxVQ2hhcio+KGxvZ0ZvbnQu bGZGYWNlTmFtZSkpOwogICAgICAgICBsb2dGb250LmxmRmFjZU5hbWVbbGlua2VkRm9udHMtPmF0 KGxpbmtlZEZvbnRJbmRleCkubGVuZ3RoKCldID0gMDsKICAgICAgICAgRW51bUZvbnRGYW1pbGll c0V4KGhkYywgJmxvZ0ZvbnQsIGxpbmtlZEZvbnRFbnVtUHJvYywgcmVpbnRlcnByZXRfY2FzdDxM UEFSQU0+KCZoZm9udCksIDApOwogICAgICAgICBsaW5rZWRGb250SW5kZXgrKzsKQEAgLTQ4Niw3 ICs0ODYsNyBAQCBzdGF0aWMgR0RJT2JqZWN0PEhGT05UPiBjcmVhdGVHRElGb250KGNvbnN0IEF0 b21pY1N0cmluZyYgZmFtaWx5LCBMT05HIGRlc2lyZWRXZQogICAgIExPR0ZPTlQgbG9nRm9udDsK ICAgICBsb2dGb250LmxmQ2hhclNldCA9IERFRkFVTFRfQ0hBUlNFVDsKICAgICBTdHJpbmdWaWV3 IHRydW5jYXRlZEZhbWlseSA9IFN0cmluZ1ZpZXcoZmFtaWx5KS5zdWJzdHJpbmcoMCwgc3RhdGlj X2Nhc3Q8dW5zaWduZWQ+KExGX0ZBQ0VTSVpFIC0gMSkpOwotICAgIHRydW5jYXRlZEZhbWlseS5n ZXRDaGFyYWN0ZXJzV2l0aFVwY29udmVydChsb2dGb250LmxmRmFjZU5hbWUpOworICAgIHRydW5j YXRlZEZhbWlseS5nZXRDaGFyYWN0ZXJzV2l0aFVwY29udmVydChyZWludGVycHJldF9jYXN0PFVD aGFyKj4obG9nRm9udC5sZkZhY2VOYW1lKSk7CiAgICAgbG9nRm9udC5sZkZhY2VOYW1lW3RydW5j YXRlZEZhbWlseS5sZW5ndGgoKV0gPSAwOwogICAgIGxvZ0ZvbnQubGZQaXRjaEFuZEZhbWlseSA9 IDA7CiAKQEAgLTYwMCw3ICs2MDAsNyBAQCBWZWN0b3I8Rm9udFNlbGVjdGlvbkNhcGFiaWxpdGll cz4gRm9udENhY2hlOjpnZXRGb250U2VsZWN0aW9uQ2FwYWJpbGl0aWVzSW5GYW1pbAogICAgIExP R0ZPTlQgbG9nRm9udDsKICAgICBsb2dGb250LmxmQ2hhclNldCA9IERFRkFVTFRfQ0hBUlNFVDsK ICAgICBTdHJpbmdWaWV3IHRydW5jYXRlZEZhbWlseSA9IFN0cmluZ1ZpZXcoZmFtaWx5TmFtZSku c3Vic3RyaW5nKDAsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihMRl9GQUNFU0laRSAtIDEpKTsKLSAg ICB0cnVuY2F0ZWRGYW1pbHkuZ2V0Q2hhcmFjdGVyc1dpdGhVcGNvbnZlcnQobG9nRm9udC5sZkZh Y2VOYW1lKTsKKyAgICB0cnVuY2F0ZWRGYW1pbHkuZ2V0Q2hhcmFjdGVyc1dpdGhVcGNvbnZlcnQo cmVpbnRlcnByZXRfY2FzdDxVQ2hhcio+KGxvZ0ZvbnQubGZGYWNlTmFtZSkpOwogICAgIGxvZ0Zv bnQubGZGYWNlTmFtZVt0cnVuY2F0ZWRGYW1pbHkubGVuZ3RoKCldID0gMDsKICAgICBsb2dGb250 LmxmUGl0Y2hBbmRGYW1pbHkgPSAwOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy93aW4vR2x5cGhQYWdlVHJlZU5vZGVDYWlyb1dpbi5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR2x5cGhQYWdlVHJlZU5vZGVDYWlyb1dpbi5j cHAKaW5kZXggNGE1OWUxYmJiZmEuLmE1YTEyMGEwOTAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR2x5cGhQYWdlVHJlZU5vZGVDYWlyb1dpbi5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dseXBoUGFnZVRyZWVO b2RlQ2Fpcm9XaW4uY3BwCkBAIC00OSw3ICs0OSw3IEBAIGJvb2wgR2x5cGhQYWdlOjpmaWxsKFVD aGFyKiBidWZmZXIsIHVuc2lnbmVkIGJ1ZmZlckxlbmd0aCkKICAgICBTZWxlY3RPYmplY3QoZGMs IGZvbnQucGxhdGZvcm1EYXRhKCkuaGZvbnQoKSk7CiAKICAgICBXT1JEIGxvY2FsR2x5cGhCdWZm ZXJbR2x5cGhQYWdlOjpzaXplICogMl07Ci0gICAgRFdPUkQgcmVzdWx0ID0gR2V0R2x5cGhJbmRp Y2VzKGRjLCBidWZmZXIsIGJ1ZmZlckxlbmd0aCwgbG9jYWxHbHlwaEJ1ZmZlciwgR0dJX01BUktf Tk9ORVhJU1RJTkdfR0xZUEhTKTsKKyAgICBEV09SRCByZXN1bHQgPSBHZXRHbHlwaEluZGljZXMo ZGMsIHJlaW50ZXJwcmV0X2Nhc3Q8TFBUU1RSPihidWZmZXIpLCBidWZmZXJMZW5ndGgsIGxvY2Fs R2x5cGhCdWZmZXIsIEdHSV9NQVJLX05PTkVYSVNUSU5HX0dMWVBIUyk7CiAgICAgYm9vbCBzdWNj ZXNzID0gcmVzdWx0ICE9IEdESV9FUlJPUiAmJiBzdGF0aWNfY2FzdDx1bnNpZ25lZD4ocmVzdWx0 KSA9PSBidWZmZXJMZW5ndGg7CiAgICAgaWYgKHN1Y2Nlc3MpIHsKICAgICAgICAgZm9yICh1bnNp Z25lZCBpID0gMDsgaSA8IEdseXBoUGFnZTo6c2l6ZTsgaSsrKSB7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vRmlsZVN5c3RlbVdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS93aW4vRmlsZVN5c3RlbVdpbi5jcHAKaW5kZXggZDg2YTNmM2JkZmIuLjc0ZTY5 OWY4MDYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vRmlsZVN5c3Rl bVdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL0ZpbGVTeXN0ZW1XaW4u Y3BwCkBAIC0xNTEsMTMgKzE1MSwxMyBAQCBzdGF0aWMgU3RyaW5nIGdldEZpbmFsUGF0aE5hbWUo Y29uc3QgU3RyaW5nJiBwYXRoKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CiAKICAgICBTdHJp bmdWZWN0b3I8VUNoYXI+IGJ1ZmZlcihNQVhfUEFUSCk7Ci0gICAgaWYgKDo6R2V0RmluYWxQYXRo TmFtZUJ5SGFuZGxlVyhoYW5kbGUsIGJ1ZmZlci5kYXRhKCksIGJ1ZmZlci5zaXplKCksIFZPTFVN RV9OQU1FX05UKSA+PSBNQVhfUEFUSCkgeworICAgIGlmICg6OkdldEZpbmFsUGF0aE5hbWVCeUhh bmRsZVcoaGFuZGxlLCByZWludGVycHJldF9jYXN0PExQVFNUUj4oYnVmZmVyLmRhdGEoKSksIGJ1 ZmZlci5zaXplKCksIFZPTFVNRV9OQU1FX05UKSA+PSBNQVhfUEFUSCkgewogICAgICAgICBjbG9z ZUZpbGUoaGFuZGxlKTsKICAgICAgICAgcmV0dXJuIFN0cmluZygpOwogICAgIH0KICAgICBjbG9z ZUZpbGUoaGFuZGxlKTsKIAotICAgIGJ1ZmZlci5zaHJpbmsod2NzbGVuKGJ1ZmZlci5kYXRhKCkp KTsKKyAgICBidWZmZXIuc2hyaW5rKHdjc2xlbihyZWludGVycHJldF9jYXN0PExQVFNUUj4oYnVm ZmVyLmRhdGEoKSkpKTsKICAgICByZXR1cm4gU3RyaW5nOjphZG9wdChXVEZNb3ZlKGJ1ZmZlcikp OwogfQogCkBAIC0yNTgsMTAgKzI1OCwxMCBAQCBTdHJpbmcgcGF0aEJ5QXBwZW5kaW5nQ29tcG9u ZW50KGNvbnN0IFN0cmluZyYgcGF0aCwgY29uc3QgU3RyaW5nJiBjb21wb25lbnQpCiAgICAgU3Ry aW5nVmlldyhwYXRoKS5nZXRDaGFyYWN0ZXJzV2l0aFVwY29udmVydChidWZmZXIuZGF0YSgpKTsK ICAgICBidWZmZXJbcGF0aC5sZW5ndGgoKV0gPSAnXDAnOwogCi0gICAgaWYgKCFQYXRoQXBwZW5k VyhidWZmZXIuZGF0YSgpLCBzdHJpbmdUb051bGxUZXJtaW5hdGVkV0NoYXIoY29tcG9uZW50KS5k YXRhKCkpKQorICAgIGlmICghUGF0aEFwcGVuZFcocmVpbnRlcnByZXRfY2FzdDxMUFRTVFI+KGJ1 ZmZlci5kYXRhKCkpLCBzdHJpbmdUb051bGxUZXJtaW5hdGVkV0NoYXIoY29tcG9uZW50KS5kYXRh KCkpKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CiAKLSAgICBidWZmZXIuc2hyaW5rKHdjc2xl bihidWZmZXIuZGF0YSgpKSk7CisgICAgYnVmZmVyLnNocmluayh3Y3NsZW4ocmVpbnRlcnByZXRf Y2FzdDxMUFRTVFI+KGJ1ZmZlci5kYXRhKCkpKSk7CiAKICAgICByZXR1cm4gU3RyaW5nOjphZG9w dChXVEZNb3ZlKGJ1ZmZlcikpOwogfQpAQCAtMzUwLDkgKzM1MCw5IEBAIHN0YXRpYyBTdHJpbmcg YnVuZGxlTmFtZSgpCiBzdGF0aWMgU3RyaW5nIHN0b3JhZ2VEaXJlY3RvcnkoRFdPUkQgcGF0aElk ZW50aWZpZXIpCiB7CiAgICAgU3RyaW5nVmVjdG9yPFVDaGFyPiBidWZmZXIoTUFYX1BBVEgpOwot ICAgIGlmIChGQUlMRUQoU0hHZXRGb2xkZXJQYXRoVygwLCBwYXRoSWRlbnRpZmllciB8IENTSURM X0ZMQUdfQ1JFQVRFLCAwLCAwLCBidWZmZXIuZGF0YSgpKSkpCisgICAgaWYgKEZBSUxFRChTSEdl dEZvbGRlclBhdGhXKDAsIHBhdGhJZGVudGlmaWVyIHwgQ1NJRExfRkxBR19DUkVBVEUsIDAsIDAs IHJlaW50ZXJwcmV0X2Nhc3Q8TFBUU1RSPihidWZmZXIuZGF0YSgpKSkpKQogICAgICAgICByZXR1 cm4gU3RyaW5nKCk7Ci0gICAgYnVmZmVyLnJlc2l6ZSh3Y3NsZW4oYnVmZmVyLmRhdGEoKSkpOwor ICAgIGJ1ZmZlci5yZXNpemUod2NzbGVuKHJlaW50ZXJwcmV0X2Nhc3Q8TFBUU1RSPihidWZmZXIu ZGF0YSgpKSkpOwogICAgIFN0cmluZyBkaXJlY3RvcnkgPSBTdHJpbmc6OmFkb3B0KFdURk1vdmUo YnVmZmVyKSk7CiAKICAgICBkaXJlY3RvcnkgPSBwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQoZGly ZWN0b3J5LCAiQXBwbGUgQ29tcHV0ZXJcXCIgKyBidW5kbGVOYW1lKCkpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1Bhc3RlYm9hcmRXaW4uY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vd2luL1Bhc3RlYm9hcmRXaW4uY3BwCmluZGV4IGM5YTBkMmRmN2M0Li43 NTYxYjcyZTBjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1Bhc3Rl Ym9hcmRXaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9QYXN0ZWJvYXJk V2luLmNwcApAQCAtNTU3LDE5ICs1NTcsMTkgQEAgc3RhdGljIFN0cmluZyBmaWxlc3lzdGVtUGF0 aEZyb21VcmxPclRpdGxlKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHRpdGwKIHsK ICAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IGZzUGF0aE1heExlbmd0aEV4Y2x1ZGluZ051bGxUZXJt aW5hdG9yID0gTUFYX1BBVEggLSAxOwogICAgIGJvb2wgdXNlZFVSTCA9IGZhbHNlOwotICAgIFdD SEFSIGZzUGF0aEJ1ZmZlcltNQVhfUEFUSF07CisgICAgVUNoYXIgZnNQYXRoQnVmZmVyW01BWF9Q QVRIXTsKICAgICBmc1BhdGhCdWZmZXJbMF0gPSAwOwotICAgIGludCBleHRlbnNpb25MZW4gPSBl eHRlbnNpb24gPyBsc3RybGVuKGV4dGVuc2lvbikgOiAwOworICAgIGludCBleHRlbnNpb25MZW4g PSBleHRlbnNpb24gPyBsc3RybGVuKHJlaW50ZXJwcmV0X2Nhc3Q8TFBDVFNUUj4oZXh0ZW5zaW9u KSkgOiAwOwogICAgIGludCBmc1BhdGhNYXhMZW5ndGhFeGNsdWRpbmdFeHRlbnNpb24gPSBmc1Bh dGhNYXhMZW5ndGhFeGNsdWRpbmdOdWxsVGVybWluYXRvciAtIGV4dGVuc2lvbkxlbjsKIAogICAg IGlmICghdGl0bGUuaXNFbXB0eSgpKSB7CiAgICAgICAgIHNpemVfdCBsZW4gPSBzdGQ6Om1pbjxz aXplX3Q+KHRpdGxlLmxlbmd0aCgpLCBmc1BhdGhNYXhMZW5ndGhFeGNsdWRpbmdFeHRlbnNpb24p OwogICAgICAgICBTdHJpbmdWaWV3KHRpdGxlKS5zdWJzdHJpbmcoMCwgbGVuKS5nZXRDaGFyYWN0 ZXJzV2l0aFVwY29udmVydChmc1BhdGhCdWZmZXIpOwogICAgICAgICBmc1BhdGhCdWZmZXJbbGVu XSA9IDA7Ci0gICAgICAgIHBhdGhSZW1vdmVCYWRGU0NoYXJhY3RlcnMoZnNQYXRoQnVmZmVyLCBs ZW4pOworICAgICAgICBwYXRoUmVtb3ZlQmFkRlNDaGFyYWN0ZXJzKHJlaW50ZXJwcmV0X2Nhc3Q8 TFBUU1RSPihmc1BhdGhCdWZmZXIpLCBsZW4pOwogICAgIH0KIAotICAgIGlmICghbHN0cmxlbihm c1BhdGhCdWZmZXIpKSB7CisgICAgaWYgKCFsc3RybGVuKHJlaW50ZXJwcmV0X2Nhc3Q8TFBUU1RS Pihmc1BhdGhCdWZmZXIpKSkgewogICAgICAgICBVUkwga3VybChVUkwoKSwgdXJsKTsKICAgICAg ICAgdXNlZFVSTCA9IHRydWU7CiAgICAgICAgIC8vIFRoZSBmaWxlbmFtZSBmb3IgYW55IGNvbnRl bnQgYmFzZWQgZHJhZyBvciBmaWxlIHVybCBzaG91bGQgYmUgdGhlIGxhc3QgZWxlbWVudCBvZiAK QEAgLTU4NSwxNSArNTg1LDE1IEBAIHN0YXRpYyBTdHJpbmcgZmlsZXN5c3RlbVBhdGhGcm9tVXJs T3JUaXRsZShjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiB0aXRsCiAgICAgICAgICAg ICBTdHJpbmdWaWV3KHVybCkuc3Vic3RyaW5nKDAsIGxlbikuZ2V0Q2hhcmFjdGVyc1dpdGhVcGNv bnZlcnQoZnNQYXRoQnVmZmVyKTsKICAgICAgICAgfQogICAgICAgICBmc1BhdGhCdWZmZXJbbGVu XSA9IDA7Ci0gICAgICAgIHBhdGhSZW1vdmVCYWRGU0NoYXJhY3RlcnMoZnNQYXRoQnVmZmVyLCBs ZW4pOworICAgICAgICBwYXRoUmVtb3ZlQmFkRlNDaGFyYWN0ZXJzKHJlaW50ZXJwcmV0X2Nhc3Q8 TFBUU1RSPihmc1BhdGhCdWZmZXIpLCBsZW4pOwogICAgIH0KIAogICAgIGlmICghZXh0ZW5zaW9u KQotICAgICAgICByZXR1cm4gU3RyaW5nKHN0YXRpY19jYXN0PFVDaGFyKj4oZnNQYXRoQnVmZmVy KSk7CisgICAgICAgIHJldHVybiBTdHJpbmcoZnNQYXRoQnVmZmVyKTsKIAogICAgIGlmICghaXNM aW5rICYmIHVzZWRVUkwpIHsKLSAgICAgICAgUGF0aFJlbmFtZUV4dGVuc2lvbihmc1BhdGhCdWZm ZXIsIGV4dGVuc2lvbik7Ci0gICAgICAgIHJldHVybiBTdHJpbmcoc3RhdGljX2Nhc3Q8VUNoYXIq Pihmc1BhdGhCdWZmZXIpKTsKKyAgICAgICAgUGF0aFJlbmFtZUV4dGVuc2lvbihyZWludGVycHJl dF9jYXN0PExQVFNUUj4oZnNQYXRoQnVmZmVyKSwgcmVpbnRlcnByZXRfY2FzdDxMUENUU1RSPihl eHRlbnNpb24pKTsKKyAgICAgICAgcmV0dXJuIFN0cmluZyhmc1BhdGhCdWZmZXIpOwogICAgIH0K IAogICAgIHJldHVybiBtYWtlU3RyaW5nKHN0YXRpY19jYXN0PGNvbnN0IFVDaGFyKj4oZnNQYXRo QnVmZmVyKSwgZXh0ZW5zaW9uKTsKQEAgLTY1Myw3ICs2NTMsNyBAQCB2b2lkIFBhc3RlYm9hcmQ6 OndyaXRlVVJMVG9EYXRhT2JqZWN0KGNvbnN0IFVSTCYga3VybCwgY29uc3QgU3RyaW5nJiB0aXRs ZVN0cikKICAgICBTdHJpbmcgdXJsID0ga3VybC5zdHJpbmcoKTsKICAgICBBU1NFUlQodXJsLmlz QWxsQVNDSUkoKSk7IC8vIFVSTDo6c3RyaW5nKCkgaXMgVVJMIGVuY29kZWQuCiAKLSAgICBTdHJp bmcgZnNQYXRoID0gZmlsZXN5c3RlbVBhdGhGcm9tVXJsT3JUaXRsZSh1cmwsIHRpdGxlU3RyLCBM Ii5VUkwiLCB0cnVlKTsKKyAgICBTdHJpbmcgZnNQYXRoID0gZmlsZXN5c3RlbVBhdGhGcm9tVXJs T3JUaXRsZSh1cmwsIHRpdGxlU3RyLCByZWludGVycHJldF9jYXN0PFVDaGFyKj4oTCIuVVJMIiks IHRydWUpOwogICAgIFN0cmluZyBjb250ZW50U3RyaW5nKCJbSW50ZXJuZXRTaG9ydGN1dF1cclxu VVJMPSIgKyB1cmwgKyAiXHJcbiIpOwogICAgIENTdHJpbmcgY29udGVudCA9IGNvbnRlbnRTdHJp bmcubGF0aW4xKCk7CiAKQEAgLTY4Miw3ICs2ODIsNyBAQCB2b2lkIFBhc3RlYm9hcmQ6OndyaXRl VVJMVG9EYXRhT2JqZWN0KGNvbnN0IFVSTCYga3VybCwgY29uc3QgU3RyaW5nJiB0aXRsZVN0cikK ICAgICBmZ2QtPmZnZFswXS5uRmlsZVNpemVMb3cgPSBjb250ZW50Lmxlbmd0aCgpOwogCiAgICAg dW5zaWduZWQgbWF4U2l6ZSA9IHN0ZDo6bWluPHVuc2lnbmVkPihmc1BhdGgubGVuZ3RoKCksIFdU Rl9BUlJBWV9MRU5HVEgoZmdkLT5mZ2RbMF0uY0ZpbGVOYW1lKSk7Ci0gICAgU3RyaW5nVmlldyhm c1BhdGgpLnN1YnN0cmluZygwLCBtYXhTaXplKS5nZXRDaGFyYWN0ZXJzV2l0aFVwY29udmVydChm Z2QtPmZnZFswXS5jRmlsZU5hbWUpOworICAgIFN0cmluZ1ZpZXcoZnNQYXRoKS5zdWJzdHJpbmco MCwgbWF4U2l6ZSkuZ2V0Q2hhcmFjdGVyc1dpdGhVcGNvbnZlcnQocmVpbnRlcnByZXRfY2FzdDxV Q2hhcio+KGZnZC0+ZmdkWzBdLmNGaWxlTmFtZSkpOwogICAgIEdsb2JhbFVubG9jayh1cmxGaWxl RGVzY3JpcHRvcik7CiAKICAgICBjaGFyKiBmaWxlQ29udGVudHMgPSBzdGF0aWNfY2FzdDxjaGFy Kj4oR2xvYmFsTG9jayh1cmxGaWxlQ29udGVudCkpOwpAQCAtOTIyLDcgKzkyMiw3IEBAIHN0YXRp YyBIR0xPQkFMIGNyZWF0ZUdsb2JhbEltYWdlRmlsZURlc2NyaXB0b3IoY29uc3QgU3RyaW5nJiB1 cmwsIGNvbnN0IFN0cmluZyYKICAgICB9CiAKICAgICBpbnQgbWF4U2l6ZSA9IHN0ZDo6bWluPGlu dD4oZnNQYXRoLmxlbmd0aCgpLCBXVEZfQVJSQVlfTEVOR1RIKGZnZC0+ZmdkWzBdLmNGaWxlTmFt ZSkpOwotICAgIFN0cmluZ1ZpZXcoZnNQYXRoKS5zdWJzdHJpbmcoMCwgbWF4U2l6ZSkuZ2V0Q2hh cmFjdGVyc1dpdGhVcGNvbnZlcnQoZmdkLT5mZ2RbMF0uY0ZpbGVOYW1lKTsKKyAgICBTdHJpbmdW aWV3KGZzUGF0aCkuc3Vic3RyaW5nKDAsIG1heFNpemUpLmdldENoYXJhY3RlcnNXaXRoVXBjb252 ZXJ0KHJlaW50ZXJwcmV0X2Nhc3Q8VUNoYXIqPihmZ2QtPmZnZFswXS5jRmlsZU5hbWUpKTsKICAg ICBHbG9iYWxVbmxvY2sobWVtT2JqKTsKIAogICAgIHJldHVybiBtZW1PYmo7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9BY2Nlc3NpYmxlQmFzZS5jcHAgYi9Tb3VyY2UvV2Vi S2l0TGVnYWN5L3dpbi9BY2Nlc3NpYmxlQmFzZS5jcHAKaW5kZXggN2UzYjE4MzE5ZmIuLjU1Njlh OTI3ZmZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9BY2Nlc3NpYmxlQmFz ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQWNjZXNzaWJsZUJhc2UuY3BwCkBA IC0xNDMsNyArMTQzLDcgQEAgSFJFU1VMVCBBY2Nlc3NpYmxlQmFzZTo6Z2V0X2F0dHJpYnV0ZShf SW5fIEJTVFIga2V5LCBfT3V0XyBWQVJJQU5UKiB2YWx1ZSkKICAgICBpZiAoIXZhbHVlKQogICAg ICAgICByZXR1cm4gRV9QT0lOVEVSOwogCi0gICAgQXRvbWljU3RyaW5nIGtleUF0b21pYyhrZXks IDo6U3lzU3RyaW5nTGVuKGtleSkpOworICAgIEF0b21pY1N0cmluZyBrZXlBdG9taWMocmVpbnRl cnByZXRfY2FzdDxVQ2hhcio+KGtleSksIDo6U3lzU3RyaW5nTGVuKGtleSkpOwogCiAgICAgYWNj ZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlKGtleUF0b21pYywgdmFsdWUpOwogCg== 333359 2018-02-07 23:22:46 -0800 2018-02-08 17:58:28 -0800 Patch bug-181004-20180208162243.patch text/plain 1432 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4MjYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0 aW9uc1dpbi5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zV2luLmNtYWtlCmluZGV4IGJlYWQw YmZjNzM0ZGFmMTJjMDFmZTdjNjM1YWEwYjFhMjBkOGZkZjEuLmVlYTIwNTQ3NTc2NDMyMTE4Nzcw NjgzOGI5OWE0ODE3ODc4MjNmOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zV2lu LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zV2luLmNtYWtlCkBAIC0xNDUsMyArMTQ1 LDQgQEAgc2V0KFBBTF9MSUJSQVJZX1RZUEUgU1RBVElDKQogc2V0KFdlYktpdExlZ2FjeV9MSUJS QVJZX1RZUEUgU0hBUkVEKQogCiBmaW5kX3BhY2thZ2UoSUNVIFJFUVVJUkVEKQorYWRkX2RlZmlu aXRpb25zKC1EVUNIQVJfVFlQRT13Y2hhcl90KQpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hh bmdlTG9nCmluZGV4IDg4ZTljYjA1YmEwNjMzMWJhOGVlOWNiYzMwMWYxNjZmN2FhNjY0MDguLmIz M2FjMDkxNzZkMDAyOWUyMmU2ODM3MDlmYTVmNDU4NmRmOWQzODcgMTAwNjQ0Ci0tLSBhL0NoYW5n ZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxOC0wMi0wNyAgRnVqaWkg SGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KKworICAgICAgICBbTWV0YV1bV2lu XSBTdXBwb3J0IElDVSA1OS4xKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTgxMDA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgSUNVIDU5IGNoYW5nZWQgdGhlIHR5cGUgb2YgVUNoYXIgZnJvbSB3Y2hhcl90 IHRvIGNoYXIxNl90IG9uCisgICAgICAgIFdpbmRvd3MuIFdlIG5lZWQgYSBsb3Qgb2YgY29udmVy c2lvbnMgYmV0d2VlbiBVQ2hhciogYW5kIHdjaGFyX3QqCisgICAgICAgIHRvIGNhbGwgV2luZG93 cyBBUEkgYmVjYXVzZSBpdCB0YWtlcyBzdHJpbmcgYXMgd2NoYXJfdCouCisKKyAgICAgICAgRm9y dHVuYXRlbHksIElDVSBpcyBjb25maWd1cmFibGUgdG8gZGVmaW5lIFVDaGFyIGFzIHdjaGFyX3Qg YXMKKyAgICAgICAgd2VsbCBhcyB0aGUgcHJpb3IgSUNVLgorICAgICAgICA8aHR0cDovL2ljdS1w cm9qZWN0Lm9yZy9hcGlyZWYvaWN1NGMvdW1hY2hpbmVfOGguaHRtbCNhNmJiOWZhZDU3MmQ2NWIz MDUzMjRlZjI4ODE2NWUyYWM+CisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc1dpbi5j bWFrZTogQWRkIGEgY29tcGlsZSBvcHRpb24gLURVQ0hBUl9UWVBFPXdjaGFyX3QuCisKIDIwMTgt MDItMDUgIFlvdXN1a2UgS2ltb3RvICA8eW91c3VrZS5raW1vdG9Ac29ueS5jb20+CiAKICAgICAg ICAgW1dpbkNhaXJvXSBSZWZpbmUgV2ViS2l0TGVnYWN5IGFuZCBXZWJLaXQgYnVpbGQgZm9yIHdp bmNhaXJvCg==