201896 2019-09-17 20:47:48 -0700 [LFC] Shrink-to-fit-width needs the available width constraint value only 2019-09-18 08:38:25 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1571793 0 zalan 2019-09-17 20:47:48 -0700 ssia 1571794 1 webkit-bug-importer 2019-09-17 20:48:11 -0700 <rdar://problem/55465382> 1571795 2 379016 zalan 2019-09-17 20:50:07 -0700 Created attachment 379016 Patch 1571904 3 379016 commit-queue 2019-09-18 08:38:24 -0700 Comment on attachment 379016 Patch Clearing flags on attachment: 379016 Committed r250033: <https://trac.webkit.org/changeset/250033> 1571905 4 commit-queue 2019-09-18 08:38:25 -0700 All reviewed patches have been landed. Closing bug. 379016 2019-09-17 20:50:07 -0700 2019-09-18 08:38:24 -0700 Patch bug-201896-20190917205003.patch text/plain 9422 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5OTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Q1MjNmMWZkNGQwZWUw ZGZhODZkNWU0M2I3MDU0OTBhMDRiOGFlNC4uMjc3MWJjZTAyZDNlN2NhMzA0MjQxOWY0NjZmMDEz ZGU5ZDFlODIyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTA5LTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gU2hyaW5rLXRvLWZp dC13aWR0aCBuZWVkcyB0aGUgYXZhaWxhYmxlIHdpZHRoIGNvbnN0cmFpbnQgdmFsdWUgb25seQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxODk2Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NTQ2NTM4Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oOgor ICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpzaHJpbmtUb0Zp dFdpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdl b21ldHJ5OjpvdXRPZkZsb3dOb25SZXBsYWNlZEhvcml6b250YWxHZW9tZXRyeSk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6ZmxvYXRpbmdO b25SZXBsYWNlZFdpZHRoQW5kTWFyZ2luKToKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dXaWR0aEFu ZE1hcmdpbik6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGlu ZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5saW5lQmxvY2tXaWR0aEFuZE1hcmdpbik6 CisKIDIwMTktMDktMTcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTEZDXSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkSGVpZ2h0KiBmdW5j dGlvbnMgbmVlZCBjb250YWluaW5nQmxvY2tIZWlnaHQgb25seS4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggZGZlYWZhYTc0ZjNjZTA5OGEyZmFkZWI5ZjIw NmU5OTBmYTI0ODQwMi4uZDdkZDAyODIwZjM4NWVlYjFiNTM3ODFlOWFiMmU1ZDAxYWJkNDBjMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTEwNSw3ICsx MDUsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgIExheW91dFNpemUgaW5GbG93UG9zaXRpb25lZFBv c2l0aW9uT2Zmc2V0KGNvbnN0IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzKSBjb25zdDsKIAog ICAgICAgICBIZWlnaHRBbmRNYXJnaW4gY29tcGxpY2F0ZWRDYXNlcyhjb25zdCBCb3gmLCBVc2Vk SG9yaXpvbnRhbFZhbHVlcywgVXNlZFZlcnRpY2FsVmFsdWVzKSBjb25zdDsKLSAgICAgICAgTGF5 b3V0VW5pdCBzaHJpbmtUb0ZpdFdpZHRoKGNvbnN0IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVz KTsKKyAgICAgICAgTGF5b3V0VW5pdCBzaHJpbmtUb0ZpdFdpZHRoKGNvbnN0IEJveCYsIExheW91 dFVuaXQgYXZhaWxhYmxlV2lkdGgpOwogCiAgICAgICAgIEVkZ2VzIGNvbXB1dGVkQm9yZGVyKGNv bnN0IEJveCYpIGNvbnN0OwogICAgICAgICBPcHRpb25hbDxFZGdlcz4gY29tcHV0ZWRQYWRkaW5n KGNvbnN0IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzKSBjb25zdDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCA4OTg4 NGQ2YTM2ZTVmM2I1MjM3NGUzZTg5ODQ4NmUxYzRhMjNlNDdmLi4zNGUzODFlMTI2ZThlMWMxZDAx MTVjNDk5NmE5ZjdjM2IyMTQyYTE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Rm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0yNDIsNyArMjQyLDcgQEAgTGF5b3V0 VW5pdCBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OnN0YXRpY0hvcml6b250YWxQb3NpdGlv bkZvck91dE9mRmxvd1Bvc2kKICAgICByZXR1cm4gbGVmdCAtIHBhZGRpbmdCb3hMZWZ0OwogfQog Ci1MYXlvdXRVbml0IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6c2hyaW5rVG9GaXRXaWR0 aChjb25zdCBCb3gmIGZvcm1hdHRpbmdSb290LCBVc2VkSG9yaXpvbnRhbFZhbHVlcyB1c2VkSG9y aXpvbnRhbFZhbHVlcykKK0xheW91dFVuaXQgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpz aHJpbmtUb0ZpdFdpZHRoKGNvbnN0IEJveCYgZm9ybWF0dGluZ1Jvb3QsIExheW91dFVuaXQgYXZh aWxhYmxlV2lkdGgpCiB7CiAgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5 b3V0LCBzdHJlYW0gPDwgIltXaWR0aF0gLT4gc2hyaW5rIHRvIGZpdCAtPiB1bnN1cHBvcnRlZCAt PiB3aWR0aCgiIDw8IExheW91dFVuaXQgeyB9IDw8ICJweCkgbGF5b3V0Qm94OiAiIDw8ICZmb3Jt YXR0aW5nUm9vdCA8PCAiKSIpOwogICAgIEFTU0VSVChmb3JtYXR0aW5nUm9vdC5lc3RhYmxpc2hl c0Zvcm1hdHRpbmdDb250ZXh0KCkpOwpAQCAtMjY0LDcgKzI2NCw2IEBAIExheW91dFVuaXQgRm9y bWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpzaHJpbmtUb0ZpdFdpZHRoKGNvbnN0IEJveCYgZm9y bWF0dGluZ1JvCiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGludHJpbnNpY1dpZHRoQ29uc3Ry YWludHMgPSAqcHJlY29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzOwogICAgIH0KLSAg ICBhdXRvIGF2YWlsYWJsZVdpZHRoID0gdXNlZEhvcml6b250YWxWYWx1ZXMuY29udGFpbmluZ0Js b2NrV2lkdGg7CiAgICAgcmV0dXJuIHN0ZDo6bWluKHN0ZDo6bWF4KGludHJpbnNpY1dpZHRoQ29u c3RyYWludHMubWluaW11bSwgYXZhaWxhYmxlV2lkdGgpLCBpbnRyaW5zaWNXaWR0aENvbnN0cmFp bnRzLm1heGltdW0pOwogfQogCkBAIC00OTUsNyArNDk0LDcgQEAgSG9yaXpvbnRhbEdlb21ldHJ5 IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93Tm9uUmVwbGFjZWRIb3Jpem9u dGFsR2UKICAgICAgICAgLy8gQ2FsY3VsYXRlIHRoZSBhdmFpbGFibGUgd2lkdGggYnkgc29sdmlu ZyBmb3IgJ3dpZHRoJyBhZnRlciBzZXR0aW5nICdsZWZ0JyAoaW4gY2FzZSAxKSB0byAwCiAgICAg ICAgIGxlZnQgPSBMYXlvdXRVbml0IHsgMCB9OwogICAgICAgICBhdXRvIGF2YWlsYWJsZVdpZHRo ID0gY29udGFpbmluZ0Jsb2NrV2lkdGggLSAoKmxlZnQgKyB1c2VkSG9yaXpvbnRhbE1hcmdpbi5z dGFydCArIGJvcmRlckxlZnQgKyBwYWRkaW5nTGVmdCArIHBhZGRpbmdSaWdodCArIGJvcmRlclJp Z2h0ICsgdXNlZEhvcml6b250YWxNYXJnaW4uZW5kICsgKnJpZ2h0KTsKLSAgICAgICAgd2lkdGgg PSBzaHJpbmtUb0ZpdFdpZHRoKGxheW91dEJveCwgVXNlZEhvcml6b250YWxWYWx1ZXMgeyBhdmFp bGFibGVXaWR0aCwgdXNlZEhvcml6b250YWxWYWx1ZXMud2lkdGgsIHVzZWRIb3Jpem9udGFsVmFs dWVzLm1hcmdpbiB9KTsKKyAgICAgICAgd2lkdGggPSBzaHJpbmtUb0ZpdFdpZHRoKGxheW91dEJv eCwgYXZhaWxhYmxlV2lkdGgpOwogICAgICAgICBsZWZ0ID0gY29udGFpbmluZ0Jsb2NrV2lkdGgg LSAodXNlZEhvcml6b250YWxNYXJnaW4uc3RhcnQgKyBib3JkZXJMZWZ0ICsgcGFkZGluZ0xlZnQg KyAqd2lkdGggKyBwYWRkaW5nUmlnaHQgICsgYm9yZGVyUmlnaHQgKyB1c2VkSG9yaXpvbnRhbE1h cmdpbi5lbmQgKyAqcmlnaHQpOwogICAgIH0gZWxzZSBpZiAoIWxlZnQgJiYgIXJpZ2h0ICYmIHdp ZHRoKSB7CiAgICAgICAgIC8vICMyCkBAIC01MTIsNyArNTExLDcgQEAgSG9yaXpvbnRhbEdlb21l dHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93Tm9uUmVwbGFjZWRIb3Jp em9udGFsR2UKICAgICAgICAgLy8gQ2FsY3VsYXRlIHRoZSBhdmFpbGFibGUgd2lkdGggYnkgc29s dmluZyBmb3IgJ3dpZHRoJyBhZnRlciBzZXR0aW5nICdyaWdodCcgKGluIGNhc2UgMykgdG8gMAog ICAgICAgICByaWdodCA9IExheW91dFVuaXQgeyAwIH07CiAgICAgICAgIGF1dG8gYXZhaWxhYmxl V2lkdGggPSBjb250YWluaW5nQmxvY2tXaWR0aCAtICgqbGVmdCArIHVzZWRIb3Jpem9udGFsTWFy Z2luLnN0YXJ0ICsgYm9yZGVyTGVmdCArIHBhZGRpbmdMZWZ0ICsgcGFkZGluZ1JpZ2h0ICsgYm9y ZGVyUmlnaHQgKyB1c2VkSG9yaXpvbnRhbE1hcmdpbi5lbmQgKyAqcmlnaHQpOwotICAgICAgICB3 aWR0aCA9IHNocmlua1RvRml0V2lkdGgobGF5b3V0Qm94LCBVc2VkSG9yaXpvbnRhbFZhbHVlcyB7 IGF2YWlsYWJsZVdpZHRoLCB1c2VkSG9yaXpvbnRhbFZhbHVlcy53aWR0aCwgdXNlZEhvcml6b250 YWxWYWx1ZXMubWFyZ2luIH0pOworICAgICAgICB3aWR0aCA9IHNocmlua1RvRml0V2lkdGgobGF5 b3V0Qm94LCBhdmFpbGFibGVXaWR0aCk7CiAgICAgICAgIHJpZ2h0ID0gY29udGFpbmluZ0Jsb2Nr V2lkdGggLSAoKmxlZnQgKyB1c2VkSG9yaXpvbnRhbE1hcmdpbi5zdGFydCArIGJvcmRlckxlZnQg KyBwYWRkaW5nTGVmdCArICp3aWR0aCArIHBhZGRpbmdSaWdodCArIGJvcmRlclJpZ2h0ICsgdXNl ZEhvcml6b250YWxNYXJnaW4uZW5kKTsKICAgICB9IGVsc2UgaWYgKCFsZWZ0ICYmIHdpZHRoICYm IHJpZ2h0KSB7CiAgICAgICAgIC8vICM0CkBAIC03NzIsNyArNzcxLDcgQEAgV2lkdGhBbmRNYXJn aW4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpmbG9hdGluZ05vblJlcGxhY2VkV2lkdGhB bmRNYXJnaW4oY28KICAgICAvLyAjMgogICAgIGF1dG8gd2lkdGggPSBjb21wdXRlZFZhbHVlSWZO b3RBdXRvKHVzZWRIb3Jpem9udGFsVmFsdWVzLndpZHRoID8gTGVuZ3RoIHsgdXNlZEhvcml6b250 YWxWYWx1ZXMud2lkdGgudmFsdWUoKSwgRml4ZWQgfSA6IGxheW91dEJveC5zdHlsZSgpLmxvZ2lj YWxXaWR0aCgpLCB1c2VkSG9yaXpvbnRhbFZhbHVlcy5jb250YWluaW5nQmxvY2tXaWR0aCk7CiAg ICAgaWYgKCF3aWR0aCkKLSAgICAgICAgd2lkdGggPSBzaHJpbmtUb0ZpdFdpZHRoKGxheW91dEJv eCwgdXNlZEhvcml6b250YWxWYWx1ZXMpOworICAgICAgICB3aWR0aCA9IHNocmlua1RvRml0V2lk dGgobGF5b3V0Qm94LCB1c2VkSG9yaXpvbnRhbFZhbHVlcy5jb250YWluaW5nQmxvY2tXaWR0aCk7 CiAKICAgICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVhbSA8 PCAiW1dpZHRoXVtNYXJnaW5dIC0+IGZsb2F0aW5nIG5vbi1yZXBsYWNlZCAtPiB3aWR0aCgiIDw8 ICp3aWR0aCA8PCAicHgpIG1hcmdpbigiIDw8IHVzZWRIb3Jpem9udGFsbE1hcmdpbi5zdGFydCA8 PCAicHgsICIgPDwgdXNlZEhvcml6b250YWxsTWFyZ2luLmVuZCA8PCAicHgpIC0+IGxheW91dEJv eCgiIDw8ICZsYXlvdXRCb3ggPDwgIikiKTsKICAgICByZXR1cm4gV2lkdGhBbmRNYXJnaW4geyAq d2lkdGgsIHVzZWRIb3Jpem9udGFsbE1hcmdpbiwgY29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luIH07 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxv Y2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggNzUz MTkxYzU4OGUxMzcwZGQyYjZjYmZjMjAyYjcwNDZkOThlZDc1ZS4uMjJhOWM4YWRmODk2YTgyYWFj NjFjYzlhNTE5ZTk0NDU0YmY4NjgxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29u dGV4dEdlb21ldHJ5LmNwcApAQCAtMjg2LDcgKzI4Niw3IEBAIFdpZHRoQW5kTWFyZ2luIEJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dXaWR0aEFuZE1hcmdpbihjb25zdCBC b3gmCiAgICAgICAgIGlmIChsYXlvdXRCb3guZXN0YWJsaXNoZXNUYWJsZUZvcm1hdHRpbmdDb250 ZXh0KCkpIHsKICAgICAgICAgICAgIC8vIFRoaXMgaXMgYSBzcGVjaWFsIHRhYmxlICJmaXQtY29u dGVudCBzaXplIiBiZWhhdmlvciBoYW5kbGluZy4gTm90IGluIHRoZSBzcGVjIHRob3VnaC4KICAg ICAgICAgICAgIC8vIFRhYmxlIHJldHVybnMgaXRzIGZpbmFsIHdpZHRoIGFzIG1pbi9tYXguIFVz ZSB0aGlzIGZpbmFsIHdpZHRoIHZhbHVlIHRvIGNvbXB1dGVkIGhvcml6b250YWwgbWFyZ2lucyBl dGMuCi0gICAgICAgICAgICB1c2VkVmFsdWVzLndpZHRoID0gc2hyaW5rVG9GaXRXaWR0aChsYXlv dXRCb3gsIHVzZWRWYWx1ZXMpOworICAgICAgICAgICAgdXNlZFZhbHVlcy53aWR0aCA9IHNocmlu a1RvRml0V2lkdGgobGF5b3V0Qm94LCB1c2VkVmFsdWVzLmNvbnRhaW5pbmdCbG9ja1dpZHRoKTsK ICAgICAgICAgfQogICAgICAgICByZXR1cm4gaW5GbG93Tm9uUmVwbGFjZWRXaWR0aEFuZE1hcmdp bihsYXlvdXRCb3gsIHVzZWRWYWx1ZXMpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0 cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9y bWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggYjFkZjFlZDQwN2IzZGRjMmExNjQ5NmY4 Nzg4YjI0NTIwZDQwMWY4ZC4uMGQxYWM3NTc2MjAwZDM3MmUxMzI0MmFiYTJhNjViMmU0ZWU5NDJm NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAK QEAgLTM4LDcgKzM4LDcgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQg ewogCi1XaWR0aEFuZE1hcmdpbiBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Omlu bGluZUJsb2NrV2lkdGhBbmRNYXJnaW4oY29uc3QgQm94JiBmb3JtYXR0aW5nQ29udGV4dFJvb3Qs IFVzZWRIb3Jpem9udGFsVmFsdWVzIHVzZWRWYWx1ZXMpCitXaWR0aEFuZE1hcmdpbiBJbmxpbmVG b3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmlubGluZUJsb2NrV2lkdGhBbmRNYXJnaW4oY29u c3QgQm94JiBmb3JtYXR0aW5nQ29udGV4dFJvb3QsIFVzZWRIb3Jpem9udGFsVmFsdWVzIHVzZWRI b3Jpem9udGFsVmFsdWVzKQogewogICAgIEFTU0VSVChmb3JtYXR0aW5nQ29udGV4dFJvb3QuaXNJ bkZsb3coKSk7CiAKQEAgLTQ2LDE5ICs0NiwxOSBAQCBXaWR0aEFuZE1hcmdpbiBJbmxpbmVGb3Jt YXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmlubGluZUJsb2NrV2lkdGhBbmRNYXJnaW4oY29ucwog CiAgICAgLy8gRXhhY3RseSBhcyBpbmxpbmUgcmVwbGFjZWQgZWxlbWVudHMuCiAgICAgaWYgKGZv cm1hdHRpbmdDb250ZXh0Um9vdC5yZXBsYWNlZCgpKQotICAgICAgICByZXR1cm4gaW5saW5lUmVw bGFjZWRXaWR0aEFuZE1hcmdpbihmb3JtYXR0aW5nQ29udGV4dFJvb3QsIHVzZWRWYWx1ZXMpOwor ICAgICAgICByZXR1cm4gaW5saW5lUmVwbGFjZWRXaWR0aEFuZE1hcmdpbihmb3JtYXR0aW5nQ29u dGV4dFJvb3QsIHVzZWRIb3Jpem9udGFsVmFsdWVzKTsKIAogICAgIC8vIDEwLjMuOSAnSW5saW5l LWJsb2NrJywgbm9uLXJlcGxhY2VkIGVsZW1lbnRzIGluIG5vcm1hbCBmbG93CiAKICAgICAvLyBJ ZiAnd2lkdGgnIGlzICdhdXRvJywgdGhlIHVzZWQgdmFsdWUgaXMgdGhlIHNocmluay10by1maXQg d2lkdGggYXMgZm9yIGZsb2F0aW5nIGVsZW1lbnRzLgogICAgIC8vIEEgY29tcHV0ZWQgdmFsdWUg b2YgJ2F1dG8nIGZvciAnbWFyZ2luLWxlZnQnIG9yICdtYXJnaW4tcmlnaHQnIGJlY29tZXMgYSB1 c2VkIHZhbHVlIG9mICcwJy4KICAgICAvLyAjMQotICAgIGF1dG8gd2lkdGggPSBjb21wdXRlZFZh bHVlSWZOb3RBdXRvKGZvcm1hdHRpbmdDb250ZXh0Um9vdC5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgp LCB1c2VkVmFsdWVzLmNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKKyAgICBhdXRvIHdpZHRoID0gY29t cHV0ZWRWYWx1ZUlmTm90QXV0byhmb3JtYXR0aW5nQ29udGV4dFJvb3Quc3R5bGUoKS5sb2dpY2Fs V2lkdGgoKSwgdXNlZEhvcml6b250YWxWYWx1ZXMuY29udGFpbmluZ0Jsb2NrV2lkdGgpOwogICAg IGlmICghd2lkdGgpCi0gICAgICAgIHdpZHRoID0gc2hyaW5rVG9GaXRXaWR0aChmb3JtYXR0aW5n Q29udGV4dFJvb3QsIHVzZWRWYWx1ZXMpOworICAgICAgICB3aWR0aCA9IHNocmlua1RvRml0V2lk dGgoZm9ybWF0dGluZ0NvbnRleHRSb290LCB1c2VkSG9yaXpvbnRhbFZhbHVlcy5jb250YWluaW5n QmxvY2tXaWR0aCk7CiAKICAgICAvLyAjMgotICAgIGF1dG8gY29tcHV0ZWRIb3Jpem9udGFsTWFy Z2luID0gR2VvbWV0cnk6OmNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbihmb3JtYXR0aW5nQ29udGV4 dFJvb3QsIHVzZWRWYWx1ZXMpOworICAgIGF1dG8gY29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luID0g R2VvbWV0cnk6OmNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbihmb3JtYXR0aW5nQ29udGV4dFJvb3Qs IHVzZWRIb3Jpem9udGFsVmFsdWVzKTsKIAogICAgIHJldHVybiBXaWR0aEFuZE1hcmdpbiB7ICp3 aWR0aCwgeyBjb21wdXRlZEhvcml6b250YWxNYXJnaW4uc3RhcnQudmFsdWVPcigwX2x1KSwgY29t cHV0ZWRIb3Jpem9udGFsTWFyZ2luLmVuZC52YWx1ZU9yKDBfbHUpIH0sIGNvbXB1dGVkSG9yaXpv bnRhbE1hcmdpbiB9OwogfQo=