194428 2019-02-07 21:44:45 -0800 [LFC] The used containing block width value is optional 2019-02-08 06:47:28 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1504111 0 zalan 2019-02-07 21:44:45 -0800 the input to horizontal sizing function (preferred width codepath) 1504112 1 361493 zalan 2019-02-07 21:51:09 -0800 Created attachment 361493 Patch 1504166 2 zalan 2019-02-08 06:46:42 -0800 Committed r241195: <https://trac.webkit.org/changeset/241195> 1504167 3 webkit-bug-importer 2019-02-08 06:47:28 -0800 <rdar://problem/47915799> 361493 2019-02-07 21:51:09 -0800 2019-02-08 02:48:15 -0800 Patch Patch.txt text/plain 11198 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ODQxMzk1ZjhmYy4uNjZiMjI5ZjYyZDkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNCBAQAorMjAxOS0wMi0wNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdIFRoZSB1c2VkIGNvbnRhaW5pbmcgYmxvY2sgd2lkdGggdmFsdWUgaXMg b3B0aW9uYWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5NDQyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoZSBwcmVmZXJyZWQgd2lkdGggY29kZXBhdGggY2Fubm90IHByb3ZpZGUgYSB2YWxpZCB1c2Vk IGNvbnRhaW5pbmcgYmxvY2sgd2lkdGggdmFsdWUuCisKKyAgICAgICAgIlRoZSBwZXJjZW50YWdl IGlzIGNhbGN1bGF0ZWQgd2l0aCByZXNwZWN0IHRvIHRoZSB3aWR0aCBvZiB0aGUgZ2VuZXJhdGVk IGJveCdzIGNvbnRhaW5pbmcgYmxvY2suCisgICAgICAgIElmIHRoZSBjb250YWluaW5nIGJsb2Nr J3Mgd2lkdGggZGVwZW5kcyBvbiB0aGlzIGVsZW1lbnQncyB3aWR0aCwgdGhlbiB0aGUgcmVzdWx0 aW5nIGxheW91dCBpcyB1bmRlZmluZWQgaW4gQ1NTIDIuMi4iCisKKyAgICAgICAgTGV0J3MgdXNl IDAgYXMgdXNlZCB2YWx1ZSBmb3Igbm93LgorCisgICAgICAgICogbGF5b3V0L0Zvcm1hdHRpbmdD b250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5n Q29udGV4dDo6R2VvbWV0cnk6OnNocmlua1RvRml0V2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd05vblJlcGxhY2Vk SG9yaXpvbnRhbEdlb21ldHJ5KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGlu Z0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dSZXBsYWNlZEhvcml6b250YWxHZW9tZXRyeSk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6 ZmxvYXRpbmdOb25SZXBsYWNlZFdpZHRoQW5kTWFyZ2luKToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpmbG9hdGluZ1JlcGxhY2VkV2lkdGhB bmRNYXJnaW4pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6 R2VvbWV0cnk6OmlubGluZVJlcGxhY2VkV2lkdGhBbmRNYXJnaW4pOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkUGFkZGluZyk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6 Y29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luKToKKyAgICAgICAgKiBsYXlvdXQvTGF5b3V0VW5pdHMu aDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VXNlZEhvcml6b250YWxWYWx1ZXM6OlVzZWRI b3Jpem9udGFsVmFsdWVzKToKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZFdpZHRo QW5kTWFyZ2luKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbmxpbmVCbG9ja1dpZHRoQW5kTWFyZ2lu KToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwOgorCiAyMDE5LTAy LTA3ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ10gSG9y aXpvbnRhbCBnZW9tZXRyeSBjb21wdXRlIGZ1bmN0aW9ucyBzaG91bGQgdGFrZSB0aGUgY29udGFp bmluZyBibG9jaydzIHdpZHRoIGFzIGEgdXNlZCB2YWx1ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDgwOWIwMTc1ODJi Li5hZmEwYmM0ODlkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRp bmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMjQ2LDcgKzI0Niw4IEBAIExheW91dFVuaXQgRm9y bWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpzaHJpbmtUb0ZpdFdpZHRoKExheW91dFN0YXRlJiBs YXlvdXRTdGF0CiAgICAgLy8gJ3BhZGRpbmctbGVmdCcsICdwYWRkaW5nLXJpZ2h0JywgJ2JvcmRl ci1yaWdodC13aWR0aCcsICdtYXJnaW4tcmlnaHQnLCBhbmQgdGhlIHdpZHRocyBvZiBhbnkgcmVs ZXZhbnQgc2Nyb2xsIGJhcnMuCiAKICAgICAvLyBUaGVuIHRoZSBzaHJpbmstdG8tZml0IHdpZHRo IGlzOiBtaW4obWF4KHByZWZlcnJlZCBtaW5pbXVtIHdpZHRoLCBhdmFpbGFibGUgd2lkdGgpLCBw cmVmZXJyZWQgd2lkdGgpLgotICAgIGF1dG8gYXZhaWxhYmxlV2lkdGggPSB1c2VkVmFsdWVzLmNv bnRhaW5pbmdCbG9ja1dpZHRoOworICAgIEFTU0VSVCh1c2VkVmFsdWVzLmNvbnRhaW5pbmdCbG9j a1dpZHRoLmhhc1ZhbHVlKCkpOworICAgIGF1dG8gYXZhaWxhYmxlV2lkdGggPSAqdXNlZFZhbHVl cy5jb250YWluaW5nQmxvY2tXaWR0aDsKICAgICBhdXRvIGluc3RyaW5zaWNXaWR0aENvbnN0cmFp bnRzID0gbGF5b3V0U3RhdGUuY3JlYXRlRm9ybWF0dGluZ0NvbnRleHQoZm9ybWF0dGluZ1Jvb3Qp LT5pbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cygpOwogICAgIHJldHVybiBzdGQ6Om1pbihzdGQ6 Om1heChpbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cy5taW5pbXVtLCBhdmFpbGFibGVXaWR0aCks IGluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzLm1heGltdW0pOwogfQpAQCAtNDEwLDcgKzQxMSw3 IEBAIEhvcml6b250YWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9m Rmxvd05vblJlcGxhY2VkSG9yaXpvbnRhbEdlCiAgICAgYXV0byYgZGlzcGxheUJveCA9IGxheW91 dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KTsKICAgICBhdXRvJiBjb250 YWluaW5nQmxvY2sgPSAqbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpOwogICAgIGF1dG8mIGNv bnRhaW5pbmdCbG9ja0Rpc3BsYXlCb3ggPSBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0 Qm94KGNvbnRhaW5pbmdCbG9jayk7Ci0gICAgYXV0byBjb250YWluaW5nQmxvY2tXaWR0aCA9IHVz ZWRWYWx1ZXMuY29udGFpbmluZ0Jsb2NrV2lkdGg7CisgICAgYXV0byBjb250YWluaW5nQmxvY2tX aWR0aCA9IHVzZWRWYWx1ZXMuY29udGFpbmluZ0Jsb2NrV2lkdGgudmFsdWVPcigwKTsKICAgICBh dXRvIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPSBjb250YWluaW5nQmxvY2suc3R5bGUoKS5pc0xl ZnRUb1JpZ2h0RGlyZWN0aW9uKCk7CiAgICAgCiAgICAgYXV0byBsZWZ0ID0gY29tcHV0ZWRWYWx1 ZUlmTm90QXV0byhzdHlsZS5sb2dpY2FsTGVmdCgpLCBjb250YWluaW5nQmxvY2tXaWR0aCk7CkBA IC02MzUsNyArNjM2LDcgQEAgSG9yaXpvbnRhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6b3V0T2ZGbG93UmVwbGFjZWRIb3Jpem9udGFsR2VvbWUKICAgICBhdXRvJiBzdHls ZSA9IGxheW91dEJveC5zdHlsZSgpOwogICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBsYXlvdXRTdGF0 ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7CiAgICAgYXV0byYgY29udGFpbmlu Z0Jsb2NrID0gKmxheW91dEJveC5jb250YWluaW5nQmxvY2soKTsKLSAgICBhdXRvIGNvbnRhaW5p bmdCbG9ja1dpZHRoID0gdXNlZFZhbHVlcy5jb250YWluaW5nQmxvY2tXaWR0aDsKKyAgICBhdXRv IGNvbnRhaW5pbmdCbG9ja1dpZHRoID0gdXNlZFZhbHVlcy5jb250YWluaW5nQmxvY2tXaWR0aC52 YWx1ZU9yKDApOwogICAgIGF1dG8gaXNMZWZ0VG9SaWdodERpcmVjdGlvbiA9IGNvbnRhaW5pbmdC bG9jay5zdHlsZSgpLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKTsKIAogICAgIGF1dG8gbGVmdCA9 IGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubG9naWNhbExlZnQoKSwgY29udGFpbmluZ0Js b2NrV2lkdGgpOwpAQCAtNzY2LDcgKzc2Nyw3IEBAIFdpZHRoQW5kTWFyZ2luIEZvcm1hdHRpbmdD b250ZXh0OjpHZW9tZXRyeTo6ZmxvYXRpbmdOb25SZXBsYWNlZFdpZHRoQW5kTWFyZ2luKExhCiAg ICAgLy8gIzEKICAgICBhdXRvIHVzZWRIb3Jpem9udGFsbE1hcmdpbiA9IFVzZWRIb3Jpem9udGFs TWFyZ2luIHsgY29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luLnN0YXJ0LnZhbHVlT3IoMCksIGNvbXB1 dGVkSG9yaXpvbnRhbE1hcmdpbi5lbmQudmFsdWVPcigwKSB9OwogICAgIC8vICMyCi0gICAgYXV0 byB3aWR0aCA9IGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8odXNlZFZhbHVlcy53aWR0aCA/IExlbmd0 aCB7IHVzZWRWYWx1ZXMud2lkdGgudmFsdWUoKSwgRml4ZWQgfSA6IGxheW91dEJveC5zdHlsZSgp LmxvZ2ljYWxXaWR0aCgpLCB1c2VkVmFsdWVzLmNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKKyAgICBh dXRvIHdpZHRoID0gY29tcHV0ZWRWYWx1ZUlmTm90QXV0byh1c2VkVmFsdWVzLndpZHRoID8gTGVu Z3RoIHsgdXNlZFZhbHVlcy53aWR0aC52YWx1ZSgpLCBGaXhlZCB9IDogbGF5b3V0Qm94LnN0eWxl KCkubG9naWNhbFdpZHRoKCksIHVzZWRWYWx1ZXMuY29udGFpbmluZ0Jsb2NrV2lkdGgudmFsdWVP cigwKSk7CiAgICAgaWYgKCF3aWR0aCkKICAgICAgICAgd2lkdGggPSBzaHJpbmtUb0ZpdFdpZHRo KGxheW91dFN0YXRlLCBsYXlvdXRCb3gsIHVzZWRWYWx1ZXMpOwogCkBAIC03OTUsNyArNzk2LDgg QEAgV2lkdGhBbmRNYXJnaW4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpmbG9hdGluZ1Jl cGxhY2VkV2lkdGhBbmRNYXJnaW4oY29uc3QKICAgICBhdXRvIGNvbXB1dGVkSG9yaXpvbnRhbE1h cmdpbiA9IEdlb21ldHJ5Ojpjb21wdXRlZEhvcml6b250YWxNYXJnaW4obGF5b3V0Qm94LCB1c2Vk VmFsdWVzKTsKIAogICAgIExPR19XSVRIX1NUUkVBTShGb3JtYXR0aW5nQ29udGV4dExheW91dCwg c3RyZWFtIDw8ICJbSGVpZ2h0XVtNYXJnaW5dIC0+IGZsb2F0aW5nIHJlcGxhY2VkIC0+IHJlZGly ZWN0ZWQgdG8gaW5saW5lIHJlcGxhY2VkIik7Ci0gICAgcmV0dXJuIGlubGluZVJlcGxhY2VkV2lk dGhBbmRNYXJnaW4obGF5b3V0U3RhdGUsIGxheW91dEJveCwgVXNlZEhvcml6b250YWxWYWx1ZXMg eyB1c2VkVmFsdWVzLmNvbnRhaW5pbmdCbG9ja1dpZHRoLCB1c2VkVmFsdWVzLndpZHRoLCBVc2Vk SG9yaXpvbnRhbE1hcmdpbiB7IGNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbi5zdGFydC52YWx1ZU9y KDApLCBjb21wdXRlZEhvcml6b250YWxNYXJnaW4uZW5kLnZhbHVlT3IoMCkgfSB9KTsKKyAgICBy ZXR1cm4gaW5saW5lUmVwbGFjZWRXaWR0aEFuZE1hcmdpbihsYXlvdXRTdGF0ZSwgbGF5b3V0Qm94 LCBVc2VkSG9yaXpvbnRhbFZhbHVlcyB7IHVzZWRWYWx1ZXMuY29udGFpbmluZ0Jsb2NrV2lkdGgu dmFsdWVPcigwKSwKKyAgICAgICAgdXNlZFZhbHVlcy53aWR0aCwgVXNlZEhvcml6b250YWxNYXJn aW4geyBjb21wdXRlZEhvcml6b250YWxNYXJnaW4uc3RhcnQudmFsdWVPcigwKSwgY29tcHV0ZWRI b3Jpem9udGFsTWFyZ2luLmVuZC52YWx1ZU9yKDApIH0gfSk7CiB9CiAKIFZlcnRpY2FsR2VvbWV0 cnkgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dWZXJ0aWNhbEdlb21ldHJ5 KGNvbnN0IExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgY29uc3QgQm94JiBsYXlvdXRCb3gsIFVz ZWRWZXJ0aWNhbFZhbHVlcyB1c2VkVmFsdWVzKQpAQCAtOTAzLDcgKzkwNSw3IEBAIFdpZHRoQW5k TWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5saW5lUmVwbGFjZWRXaWR0aEFu ZE1hcmdpbihjb25zdCBMCiAgICAgLy8gICAgSWYgMzAwcHggaXMgdG9vIHdpZGUgdG8gZml0IHRo ZSBkZXZpY2UsIFVBcyBzaG91bGQgdXNlIHRoZSB3aWR0aCBvZiB0aGUgbGFyZ2VzdCByZWN0YW5n bGUgdGhhdCBoYXMgYSAyOjEgcmF0aW8gYW5kIGZpdHMgdGhlIGRldmljZSBpbnN0ZWFkLgogCiAg ICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5bGUoKTsKLSAgICBhdXRvIGNvbnRhaW5pbmdC bG9ja1dpZHRoID0gdXNlZFZhbHVlcy5jb250YWluaW5nQmxvY2tXaWR0aDsKKyAgICBhdXRvIGNv bnRhaW5pbmdCbG9ja1dpZHRoID0gdXNlZFZhbHVlcy5jb250YWluaW5nQmxvY2tXaWR0aC52YWx1 ZU9yKDApOwogICAgIGF1dG8gY29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luID0gR2VvbWV0cnk6OmNv bXB1dGVkSG9yaXpvbnRhbE1hcmdpbihsYXlvdXRCb3gsIHVzZWRWYWx1ZXMpOwogCiAgICAgYXV0 byB1c2VkTWFyZ2luU3RhcnQgPSBbJl0gewpAQCAtMTA0MiwxNyArMTA0NCwxOSBAQCBPcHRpb25h bDxFZGdlcz4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFBhZGRpbmcoY29u c3QgQm94JiBsYXlvdXRCbwogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAgICAgYXV0 byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5bGUoKTsKKyAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja1dp ZHRoID0gdXNlZFZhbHVlcy5jb250YWluaW5nQmxvY2tXaWR0aC52YWx1ZU9yKDApOwogICAgIExP R19XSVRIX1NUUkVBTShGb3JtYXR0aW5nQ29udGV4dExheW91dCwgc3RyZWFtIDw8ICJbUGFkZGlu Z10gLT4gbGF5b3V0Qm94OiAiIDw8ICZsYXlvdXRCb3gpOwogICAgIHJldHVybiBFZGdlcyB7Ci0g ICAgICAgIHsgdmFsdWVGb3JMZW5ndGgoc3R5bGUucGFkZGluZ0xlZnQoKSwgdXNlZFZhbHVlcy5j b250YWluaW5nQmxvY2tXaWR0aCksIHZhbHVlRm9yTGVuZ3RoKHN0eWxlLnBhZGRpbmdSaWdodCgp LCB1c2VkVmFsdWVzLmNvbnRhaW5pbmdCbG9ja1dpZHRoKSB9LAotICAgICAgICB7IHZhbHVlRm9y TGVuZ3RoKHN0eWxlLnBhZGRpbmdUb3AoKSwgdXNlZFZhbHVlcy5jb250YWluaW5nQmxvY2tXaWR0 aCksIHZhbHVlRm9yTGVuZ3RoKHN0eWxlLnBhZGRpbmdCb3R0b20oKSwgdXNlZFZhbHVlcy5jb250 YWluaW5nQmxvY2tXaWR0aCkgfQorICAgICAgICB7IHZhbHVlRm9yTGVuZ3RoKHN0eWxlLnBhZGRp bmdMZWZ0KCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKSwgdmFsdWVGb3JMZW5ndGgoc3R5bGUucGFk ZGluZ1JpZ2h0KCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKSB9LAorICAgICAgICB7IHZhbHVlRm9y TGVuZ3RoKHN0eWxlLnBhZGRpbmdUb3AoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpLCB2YWx1ZUZv ckxlbmd0aChzdHlsZS5wYWRkaW5nQm90dG9tKCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKSB9CiAg ICAgfTsKIH0KIAogQ29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6Y29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBV c2VkSG9yaXpvbnRhbFZhbHVlcyB1c2VkVmFsdWVzKQogewogICAgIGF1dG8mIHN0eWxlID0gbGF5 b3V0Qm94LnN0eWxlKCk7Ci0gICAgcmV0dXJuIHsgY29tcHV0ZWRWYWx1ZUlmTm90QXV0byhzdHls ZS5tYXJnaW5TdGFydCgpLCB1c2VkVmFsdWVzLmNvbnRhaW5pbmdCbG9ja1dpZHRoKSwgY29tcHV0 ZWRWYWx1ZUlmTm90QXV0byhzdHlsZS5tYXJnaW5FbmQoKSwgdXNlZFZhbHVlcy5jb250YWluaW5n QmxvY2tXaWR0aCkgfTsKKyAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja1dpZHRoID0gdXNlZFZhbHVl cy5jb250YWluaW5nQmxvY2tXaWR0aC52YWx1ZU9yKDApOworICAgIHJldHVybiB7IGNvbXB1dGVk VmFsdWVJZk5vdEF1dG8oc3R5bGUubWFyZ2luU3RhcnQoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgp LCBjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLm1hcmdpbkVuZCgpLCBjb250YWluaW5nQmxv Y2tXaWR0aCkgfTsKIH0KIAogQ29tcHV0ZWRWZXJ0aWNhbE1hcmdpbiBGb3JtYXR0aW5nQ29udGV4 dDo6R2VvbWV0cnk6OmNvbXB1dGVkVmVydGljYWxNYXJnaW4oY29uc3QgTGF5b3V0U3RhdGUmIGxh eW91dFN0YXRlLCBjb25zdCBCb3gmIGxheW91dEJveCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9MYXlvdXRVbml0cy5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFVu aXRzLmgKaW5kZXggNjFiYWUyNDkyNDYuLmMzM2M1NTI3NjI2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvTGF5b3V0VW5pdHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv TGF5b3V0VW5pdHMuaApAQCAtMTI1LDE0ICsxMjUsMTQgQEAgc3RydWN0IFZlcnRpY2FsR2VvbWV0 cnkgewogfTsKIAogc3RydWN0IFVzZWRIb3Jpem9udGFsVmFsdWVzIHsKLSAgICBleHBsaWNpdCBV c2VkSG9yaXpvbnRhbFZhbHVlcyhMYXlvdXRVbml0IGNvbnRhaW5pbmdCbG9ja1dpZHRoLCBPcHRp b25hbDxMYXlvdXRVbml0PiB3aWR0aCwgT3B0aW9uYWw8VXNlZEhvcml6b250YWxNYXJnaW4+IG1h cmdpbikKKyAgICBleHBsaWNpdCBVc2VkSG9yaXpvbnRhbFZhbHVlcyhPcHRpb25hbDxMYXlvdXRV bml0PiBjb250YWluaW5nQmxvY2tXaWR0aCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gd2lkdGgsIE9w dGlvbmFsPFVzZWRIb3Jpem9udGFsTWFyZ2luPiBtYXJnaW4pCiAgICAgICAgIDogY29udGFpbmlu Z0Jsb2NrV2lkdGgoY29udGFpbmluZ0Jsb2NrV2lkdGgpCiAgICAgICAgICwgd2lkdGgod2lkdGgp CiAgICAgICAgICwgbWFyZ2luKG1hcmdpbikKICAgICAgICAgewogICAgICAgICB9CiAKLSAgICBM YXlvdXRVbml0IGNvbnRhaW5pbmdCbG9ja1dpZHRoOworICAgIE9wdGlvbmFsPExheW91dFVuaXQ+ IGNvbnRhaW5pbmdCbG9ja1dpZHRoOwogICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IHdpZHRoOwog ICAgIE9wdGlvbmFsPFVzZWRIb3Jpem9udGFsTWFyZ2luPiBtYXJnaW47CiB9OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdD b250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGlu Zy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDNkOTdiMDNlOWYwLi5k NDM1OWQyMTY5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5 LmNwcApAQCAtMTM2LDcgKzEzNiw3IEBAIFdpZHRoQW5kTWFyZ2luIEJsb2NrRm9ybWF0dGluZ0Nv bnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZFdpZHRoQW5kTWFyZ2luCiAKICAgICAg ICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5bGUoKTsKICAgICAgICAgYXV0byogY29udGFp bmluZ0Jsb2NrID0gbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpOwotICAgICAgICBhdXRvIGNv bnRhaW5pbmdCbG9ja1dpZHRoID0gdXNlZFZhbHVlcy5jb250YWluaW5nQmxvY2tXaWR0aDsKKyAg ICAgICAgYXV0byBjb250YWluaW5nQmxvY2tXaWR0aCA9IHVzZWRWYWx1ZXMuY29udGFpbmluZ0Js b2NrV2lkdGgudmFsdWVPcigwKTsKICAgICAgICAgYXV0byYgZGlzcGxheUJveCA9IGxheW91dFN0 YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KTsKIAogICAgICAgICBhdXRvIHdp ZHRoID0gY29tcHV0ZWRWYWx1ZUlmTm90QXV0byh1c2VkVmFsdWVzLndpZHRoID8gTGVuZ3RoIHsg dXNlZFZhbHVlcy53aWR0aC52YWx1ZSgpLCBGaXhlZCB9IDogc3R5bGUubG9naWNhbFdpZHRoKCks IGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHRHZW9tZXRyeS5jcHAKaW5kZXggZTc3Nzg2NGVjOTIuLmU4OTljZjYxNTgwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtNTMsNyAr NTMsNyBAQCBXaWR0aEFuZE1hcmdpbiBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6 OmlubGluZUJsb2NrV2lkdGhBbmRNYXJnaW4oTGF5bwogICAgIC8vIElmICd3aWR0aCcgaXMgJ2F1 dG8nLCB0aGUgdXNlZCB2YWx1ZSBpcyB0aGUgc2hyaW5rLXRvLWZpdCB3aWR0aCBhcyBmb3IgZmxv YXRpbmcgZWxlbWVudHMuCiAgICAgLy8gQSBjb21wdXRlZCB2YWx1ZSBvZiAnYXV0bycgZm9yICdt YXJnaW4tbGVmdCcgb3IgJ21hcmdpbi1yaWdodCcgYmVjb21lcyBhIHVzZWQgdmFsdWUgb2YgJzAn LgogICAgIC8vICMxCi0gICAgYXV0byB3aWR0aCA9IGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8oZm9y bWF0dGluZ0NvbnRleHRSb290LnN0eWxlKCkubG9naWNhbFdpZHRoKCksIHVzZWRWYWx1ZXMuY29u dGFpbmluZ0Jsb2NrV2lkdGgpOworICAgIGF1dG8gd2lkdGggPSBjb21wdXRlZFZhbHVlSWZOb3RB dXRvKGZvcm1hdHRpbmdDb250ZXh0Um9vdC5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLCB1c2VkVmFs dWVzLmNvbnRhaW5pbmdCbG9ja1dpZHRoLnZhbHVlT3IoMCkpOwogICAgIGlmICghd2lkdGgpCiAg ICAgICAgIHdpZHRoID0gc2hyaW5rVG9GaXRXaWR0aChsYXlvdXRTdGF0ZSwgZm9ybWF0dGluZ0Nv bnRleHRSb290LCB1c2VkVmFsdWVzKTsKIAo=