186616 2018-06-13 22:03:42 -0700 [LFC] Miscellaneous fixes to be able to layout <div> with fixed width/height 2018-06-14 07:28:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1432931 0 zalan 2018-06-13 22:03:42 -0700 ssia. 1432932 1 342726 zalan 2018-06-13 22:13:33 -0700 Created attachment 342726 Patch 1432933 2 zalan 2018-06-13 22:14:30 -0700 I am sure other, a tiny bit more complex content works fine as well. I just haven't tried them yet. 1432980 3 zalan 2018-06-14 07:27:35 -0700 Committed r232839: <https://trac.webkit.org/changeset/232839> 1432981 4 webkit-bug-importer 2018-06-14 07:28:20 -0700 <rdar://problem/41124262> 342726 2018-06-13 22:13:33 -0700 2018-06-14 06:45:32 -0700 Patch bug-186616-20180613221332.patch text/plain 13482 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNzUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjcwZGI5Njc5MTdlZGM0 NzllOWUxMmEzMTI2OWQ0YmE2ZTQ4ZmQwMS4uNzRiZmQ3ODI4NmIyYWYzMmNmMjAzNDFhZjI1MGIy YzJiZTFlNmUzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE4LTA2LTEzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gTWlzY2VsbGFuZW91 cyBmaXhlcyB0byBiZSBhYmxlIHRvIGxheW91dCA8ZGl2PiB3aXRoIGZpeGVkIHdpZHRoL2hlaWdo dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg2NjE2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgMS4gTW92 ZSBib3ggaG9yaXpvbnRhbGx5L3ZlcnRpY2FsbHkgd2hlbiByZWxldmFudCBtYXJnaW4gaXMgY29t cHV0ZWQuCisgICAgICAgIDIuIEZpeCBpc1N0cmV0Y2hlZFRvVmlld3BvcnQoKSBsb2dpYyBhbmQg bWFrZSBzdXJlIHRoYXQgdGhlIHdpZHRoL2hlaWdodCBpcyBhZGp1c3RlZCB3aXRoIHRoZSBtYXJn aW4gd2hlbiB0aGUgYm94IGlzIHN0cmV0Y2h5LgorICAgICAgICAzLiBGaXggaXNQYWRkaW5nQXBw bGljYWJsZSgpIGFuZCBhZGQgIkdlbmVyaWNFbGVtZW50IiBmb3IgZWxlbWVudHMgdGhhdCBkb24n dCBuZWVkIHNwZWNpYWwgaGFuZGxpbmcuCisKKyAgICAgICAgV2l0aCB0aGlzIHBhdGNoIExGQyBw cm9kdWNlcyB0aGUgY29ycmVjdCBnZW9tZXRyeSBmb3IgdGhlIGZvbGxvd2luZyBjb250ZW50Ogor ICAgICAgICA8aHRtbD48Ym9keT48ZGl2IHN0eWxlPSJ3aWR0aDogMTAwcHg7IGhlaWdodDogMTAw cHg7Ij48L2Rpdj48L2JvZHk+PC9odG1sPiAKKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5n Q29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0 Ojpjb21wdXRlRmxvYXRpbmdIZWlnaHRBbmRNYXJnaW4gY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUZsb2F0aW5nV2lkdGhBbmRNYXJn aW4gY29uc3QpOgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0 aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGlu Z0NvbnRleHQ6OmxheW91dCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVJbkZsb3dIZWlnaHRBbmRNYXJnaW4gY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRl SW5GbG93V2lkdGhBbmRNYXJnaW4gY29uc3QpOgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6aXNTdHJldGNoZWRUb1ZpZXdwb3J0KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd05vblJlcGxhY2Vk SGVpZ2h0QW5kTWFyZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0 aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd05vblJlcGxhY2VkV2lkdGhBbmRNYXJnaW4pOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRy eTo6c3RhdGljUG9zaXRpb24pOgorICAgICAgICAqIGxheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5 Qm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpCb3g6Om1vdmVIb3Jpem9udGFsbHkp OgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6Qm94Ojptb3ZlVmVydGljYWxseSk6CisgICAg ICAgIChXZWJDb3JlOjpEaXNwbGF5OjpCb3g6OlJlY3Q6OnNldFdpZHRoKToKKyAgICAgICAgKFdl YkNvcmU6OkRpc3BsYXk6OkJveDo6UmVjdDo6c2V0SGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6 OkRpc3BsYXk6OkJveDo6UmVjdDo6bW92ZUhvcml6b250YWxseSk6CisgICAgICAgIChXZWJDb3Jl OjpEaXNwbGF5OjpCb3g6OlJlY3Q6Om1vdmVWZXJ0aWNhbGx5KToKKyAgICAgICAgKiBsYXlvdXQv bGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCb3g6 OmlzUGFkZGluZ0FwcGxpY2FibGUgY29uc3QpOgorICAgICAgICAqIGxheW91dC9sYXlvdXR0cmVl L0xheW91dEJveC5oOgorICAgICAgICAqIGxheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWls ZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VHJlZUJ1aWxkZXI6OmNyZWF0ZVN1 YlRyZWUpOgorCiAyMDE4LTA2LTEyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQ10gQWRkIHZlcnRpY2FsIG1hcmdpbiBjb21wdXRhdGlvbiBmb3IgaW5mbG93 IG5vbi1yZXBsYWNlZCBib3ggYW5kIGZvciB0aGUgKDEwLjYuNikgY29tcGxpY2F0ZWQgY2FzZXMu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA3M2E1 MDRhMmY5NTY0NjFiY2I5ZmVkOTY5ZGQzZTJhOTY2ZWQxMjY0Li4wZDllYTNhZjg4NjIwYjAzOTc5 ZTNjYTBlM2JmMmRhNWMzZWJiMzUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Rm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0 aW5nQ29udGV4dC5jcHAKQEAgLTUzLDYgKzUzLDcgQEAgdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6 Y29tcHV0ZUZsb2F0aW5nSGVpZ2h0QW5kTWFyZ2luKExheW91dENvbnRleHQmIGxheW91dENvbnQK IHsKICAgICBhdXRvIGhlaWdodEFuZE1hcmdpbiA9IEdlb21ldHJ5OjpmbG9hdGluZ0hlaWdodEFu ZE1hcmdpbihsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpOwogICAgIGRpc3BsYXlCb3guc2V0SGVp Z2h0KGhlaWdodEFuZE1hcmdpbi5oZWlnaHQpOworICAgIGRpc3BsYXlCb3gubW92ZVZlcnRpY2Fs bHkoaGVpZ2h0QW5kTWFyZ2luLm1hcmdpbi50b3ApOwogICAgIGRpc3BsYXlCb3guc2V0VmVydGlj YWxNYXJnaW4oaGVpZ2h0QW5kTWFyZ2luLm1hcmdpbik7CiB9CiAKQEAgLTYwLDYgKzYxLDcgQEAg dm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUZsb2F0aW5nV2lkdGhBbmRNYXJnaW4oTGF5 b3V0Q29udGV4dCYgbGF5b3V0Q29udGUKIHsKICAgICBhdXRvIHdpZHRoQW5kTWFyZ2luID0gR2Vv bWV0cnk6OmZsb2F0aW5nV2lkdGhBbmRNYXJnaW4obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsK ICAgICBkaXNwbGF5Qm94LnNldFdpZHRoKHdpZHRoQW5kTWFyZ2luLndpZHRoKTsKKyAgICBkaXNw bGF5Qm94Lm1vdmVIb3Jpem9udGFsbHkod2lkdGhBbmRNYXJnaW4ubWFyZ2luLmxlZnQpOwogICAg IGRpc3BsYXlCb3guc2V0SG9yaXpvbnRhbE1hcmdpbih3aWR0aEFuZE1hcmdpbi5tYXJnaW4pOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCAzYzQyZjRjZWFkOTYzMjBk ZTljMWNjZmIyY2QxYTUxNWUwODBlNjUzLi43ZTAzY2Q2NzJhYmQxMGU0ZWQ1MmZiNzQ0YjA1OTcz NTM2Y2I4MTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTczLDkgKzcz LDkgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXQoTGF5b3V0Q29udGV4dCYg bGF5b3V0Q29udGV4dCwgRm9ybWF0dGluZ1N0YXQKICAgICAgICAgICAgIGF1dG8mIGxheW91dEJv eCA9IGxheW91dFBhaXIubGF5b3V0Qm94OwogICAgICAgICAgICAgYXV0byYgZGlzcGxheUJveCA9 IGxheW91dFBhaXIuZGlzcGxheUJveDsKICAgICAgICAgICAgIAorICAgICAgICAgICAgY29tcHV0 ZVN0YXRpY1Bvc2l0aW9uKGxheW91dENvbnRleHQsIGxheW91dEJveCwgZGlzcGxheUJveCk7CiAg ICAgICAgICAgICBjb21wdXRlQm9yZGVyQW5kUGFkZGluZyhsYXlvdXRDb250ZXh0LCBsYXlvdXRC b3gsIGRpc3BsYXlCb3gpOwogICAgICAgICAgICAgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKGxheW91 dENvbnRleHQsIGxheW91dEJveCwgZGlzcGxheUJveCk7Ci0gICAgICAgICAgICBjb21wdXRlU3Rh dGljUG9zaXRpb24obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKICAgICAg ICAgICAgIGlmIChsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKSB7CiAg ICAgICAgICAgICAgICAgYXV0byBmb3JtYXR0aW5nQ29udGV4dCA9IGxheW91dENvbnRleHQuZm9y bWF0dGluZ0NvbnRleHQobGF5b3V0Qm94KTsKICAgICAgICAgICAgICAgICBmb3JtYXR0aW5nQ29u dGV4dC0+bGF5b3V0KGxheW91dENvbnRleHQsIGxheW91dENvbnRleHQuZXN0YWJsaXNoZWRGb3Jt YXR0aW5nU3RhdGUobGF5b3V0Qm94LCAqZm9ybWF0dGluZ0NvbnRleHQpKTsKQEAgLTE2NCw2ICsx NjQsNyBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVJbkZsb3dIZWlnaHRB bmRNYXJnaW4oTGF5b3V0Q29udGV4dCYgbGF5b3V0QwogewogICAgIGF1dG8gaGVpZ2h0QW5kTWFy Z2luID0gR2VvbWV0cnk6OmluRmxvd0hlaWdodEFuZE1hcmdpbihsYXlvdXRDb250ZXh0LCBsYXlv dXRCb3gpOwogICAgIGRpc3BsYXlCb3guc2V0SGVpZ2h0KGhlaWdodEFuZE1hcmdpbi5oZWlnaHQp OworICAgIGRpc3BsYXlCb3gubW92ZVZlcnRpY2FsbHkoaGVpZ2h0QW5kTWFyZ2luLm1hcmdpbi50 b3ApOwogICAgIGRpc3BsYXlCb3guc2V0VmVydGljYWxNYXJnaW4oaGVpZ2h0QW5kTWFyZ2luLm1h cmdpbik7CiB9CiAKQEAgLTE3MSw2ICsxNzIsNyBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRl eHQ6OmNvbXB1dGVJbkZsb3dXaWR0aEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDbwog ewogICAgIGF1dG8gd2lkdGhBbmRNYXJnaW4gPSBHZW9tZXRyeTo6aW5GbG93V2lkdGhBbmRNYXJn aW4obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsKICAgICBkaXNwbGF5Qm94LnNldFdpZHRoKHdp ZHRoQW5kTWFyZ2luLndpZHRoKTsKKyAgICBkaXNwbGF5Qm94Lm1vdmVIb3Jpem9udGFsbHkod2lk dGhBbmRNYXJnaW4ubWFyZ2luLmxlZnQpOwogICAgIGRpc3BsYXlCb3guc2V0SG9yaXpvbnRhbE1h cmdpbih3aWR0aEFuZE1hcmdpbi5tYXJnaW4pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRy eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0 dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggNzdkNGU3YTQ1NTgwNjc2MTcyZWI2Njk0MmQ2 MTNiNjlhZDIxMWU0Mi4uMWJjOTQ1YTY5OTVhM2Y5ZjJmMGMxODRjYTEyMDc4ZTkxYTdkYjdmYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtNDAs NyArNDAsNyBAQCBzdGF0aWMgYm9vbCBpc1N0cmV0Y2hlZFRvVmlld3BvcnQoY29uc3QgTGF5b3V0 Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JgogICAgIGlmICghbGF5b3V0Q29udGV4 dC5pblF1aXJrc01vZGUoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKCFsYXlv dXRCb3guaXNEb2N1bWVudEJveCgpIHx8ICFsYXlvdXRCb3guaXNCb2R5Qm94KCkpCisgICAgaWYg KCFsYXlvdXRCb3guaXNEb2N1bWVudEJveCgpICYmICFsYXlvdXRCb3guaXNCb2R5Qm94KCkpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHJldHVybiBsYXlvdXRCb3guc3R5bGUoKS5sb2dp Y2FsSGVpZ2h0KCkuaXNBdXRvKCk7CkBAIC0xMTQsOCArMTE0LDEzIEBAIEZvcm1hdHRpbmdDb250 ZXh0OjpHZW9tZXRyeTo6SGVpZ2h0QW5kTWFyZ2luIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdl b21ldHJ5OjppCiAKICAgICBpZiAoIWlzU3RyZXRjaGVkVG9WaWV3cG9ydChsYXlvdXRDb250ZXh0 LCBsYXlvdXRCb3gpKQogICAgICAgICByZXR1cm4geyBoZWlnaHQsIHsgbWFyZ2luVG9wLCBtYXJn aW5Cb3R0b20gfSB9OworCiAgICAgYXV0byBpbml0aWFsQ29udGFpbmluZ0Jsb2NrSGVpZ2h0ID0g bGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGluaXRpYWxDb250YWluaW5nQmxv Y2sobGF5b3V0Qm94KSktPmNvbnRlbnRCb3goKS5oZWlnaHQoKTsKLSAgICByZXR1cm4geyBzdGQ6 Om1heChoZWlnaHQsIGluaXRpYWxDb250YWluaW5nQmxvY2tIZWlnaHQpLCB7IG1hcmdpblRvcCwg bWFyZ2luQm90dG9tIH0gfTsKKyAgICAvLyBTdHJldGNoIGJ1dCBuZXZlciBvdmVyc3RyZXRjaCB3 aXRoIHRoZSBtYXJnaW5zLgorICAgIGlmIChoZWlnaHQgKyBtYXJnaW5Ub3AgKyBtYXJnaW5Cb3R0 b20gPCBpbml0aWFsQ29udGFpbmluZ0Jsb2NrSGVpZ2h0KQorICAgICAgICBoZWlnaHQgPSBpbml0 aWFsQ29udGFpbmluZ0Jsb2NrSGVpZ2h0IC0gbWFyZ2luVG9wIC0gbWFyZ2luQm90dG9tOworCisg ICAgcmV0dXJuIHsgaGVpZ2h0LCB7IG1hcmdpblRvcCwgbWFyZ2luQm90dG9tIH0gfTsKIH0KIAog Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpXaWR0aEFuZE1hcmdpbiBCbG9ja0Zvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93Tm9uUmVwbGFjZWRXaWR0aEFuZE1hcmdpbihMYXlv dXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCwKQEAgLTIyMCw4 ICsyMjUsMTQgQEAgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpXaWR0aEFuZE1hcmdpbiBC bG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW4KICAgICBhdXRvIGNvbXB1dGVkV2lk dGhBbmRNYXJnaW5WYWx1ZSA9IGNvbXB1dGUoKTsKICAgICBpZiAoIWlzU3RyZXRjaGVkVG9WaWV3 cG9ydChsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpKQogICAgICAgICByZXR1cm4gY29tcHV0ZWRX aWR0aEFuZE1hcmdpblZhbHVlOworCiAgICAgYXV0byBpbml0aWFsQ29udGFpbmluZ0Jsb2NrV2lk dGggPSBsYXlvdXRDb250ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRCb3goaW5pdGlhbENvbnRhaW5p bmdCbG9jayhsYXlvdXRCb3gpKS0+Y29udGVudEJveCgpLndpZHRoKCk7Ci0gICAgcmV0dXJuIEZv cm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6V2lkdGhBbmRNYXJnaW4geyBzdGQ6Om1heChjb21w dXRlZFdpZHRoQW5kTWFyZ2luVmFsdWUud2lkdGgsIGluaXRpYWxDb250YWluaW5nQmxvY2tXaWR0 aCksIHsgY29tcHV0ZWRXaWR0aEFuZE1hcmdpblZhbHVlLm1hcmdpbiB9IH07CisgICAgYXV0byBo b3Jpem9udGFsTWFyZ2lucyA9IGNvbXB1dGVkV2lkdGhBbmRNYXJnaW5WYWx1ZS5tYXJnaW4ubGVm dCArIGNvbXB1dGVkV2lkdGhBbmRNYXJnaW5WYWx1ZS5tYXJnaW4ucmlnaHQ7IAorICAgIC8vIFN0 cmV0Y2ggYnV0IG5ldmVyIG92ZXJzdHJldGNoIHdpdGggdGhlIG1hcmdpbnMuCisgICAgaWYgKGNv bXB1dGVkV2lkdGhBbmRNYXJnaW5WYWx1ZS53aWR0aCArIGhvcml6b250YWxNYXJnaW5zIDwgaW5p dGlhbENvbnRhaW5pbmdCbG9ja1dpZHRoKQorICAgICAgICBjb21wdXRlZFdpZHRoQW5kTWFyZ2lu VmFsdWUud2lkdGggPSBpbml0aWFsQ29udGFpbmluZ0Jsb2NrV2lkdGggLSBob3Jpem9udGFsTWFy Z2luczsKKworICAgIHJldHVybiB7IGNvbXB1dGVkV2lkdGhBbmRNYXJnaW5WYWx1ZS53aWR0aCwg Y29tcHV0ZWRXaWR0aEFuZE1hcmdpblZhbHVlLm1hcmdpbiB9OwogfQogCiBGb3JtYXR0aW5nQ29u dGV4dDo6R2VvbWV0cnk6OldpZHRoQW5kTWFyZ2luIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdl b21ldHJ5OjppbkZsb3dSZXBsYWNlZFdpZHRoQW5kTWFyZ2luKExheW91dENvbnRleHQmIGxheW91 dENvbnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94KQpAQCAtMjU2LDEwICsyNjcsNyBAQCBMYXlv dXRQb2ludCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6c3RhdGljUG9zaXRpb24o TGF5b3V0Q29udGV4dCYgbGF5bwogICAgICAgICBhdXRvJiBwcmV2aW91c0luRmxvd0Rpc3BsYXlC b3ggPSAqbGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCpwcmV2aW91c0luRmxv d1NpYmxpbmcpOwogICAgICAgICB0b3AgPSBwcmV2aW91c0luRmxvd0Rpc3BsYXlCb3guYm90dG9t KCkgKyBwcmV2aW91c0luRmxvd0Rpc3BsYXlCb3gubWFyZ2luQm90dG9tKCk7CiAgICAgfQotICAg IGF1dG8mIGRpc3BsYXlCb3ggPSAqbGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94 KGxheW91dEJveCk7Ci0gICAgTGF5b3V0UG9pbnQgdG9wTGVmdCA9IHsgdG9wLCBsZWZ0IH07Ci0g ICAgdG9wTGVmdC5tb3ZlQnkoeyBkaXNwbGF5Qm94Lm1hcmdpbkxlZnQoKSwgZGlzcGxheUJveC5t YXJnaW5Ub3AoKSB9KTsKLSAgICByZXR1cm4gdG9wTGVmdDsKKyAgICByZXR1cm4geyB0b3AsIGxl ZnQgfTsKIH0KIAogTGF5b3V0UG9pbnQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6 OmluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBj b25zdCBCb3gmIGxheW91dEJveCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9k aXNwbGF5dHJlZS9EaXNwbGF5Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRy ZWUvRGlzcGxheUJveC5oCmluZGV4IGY3MTdhYTVjNDdlOWFkOGI4MGJjOTIzNDBlMmQ2OWY4N2Rj MWJhZjYuLmVhY2QyNmY0ZjA0NGNlYjZhMzE3NjY3ZTA5OTMzMzJjZTEyNTFkYWUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaApAQCAtODAsNiAr ODAsOSBAQCBwdWJsaWM6CiAgICAgICAgIHZvaWQgc2hpZnRUb3BUbyhMYXlvdXRVbml0KTsKICAg ICAgICAgdm9pZCBzaGlmdEJvdHRvbVRvKExheW91dFVuaXQpOwogCisgICAgICAgIHZvaWQgbW92 ZUhvcml6b250YWxseShMYXlvdXRVbml0KTsKKyAgICAgICAgdm9pZCBtb3ZlVmVydGljYWxseShM YXlvdXRVbml0KTsKKwogICAgICAgICB2b2lkIGV4cGFuZChMYXlvdXRVbml0LCBMYXlvdXRVbml0 KTsKIAogICAgICAgICBSZWN0IGNsb25lKCkgY29uc3Q7CkBAIC0xNTYsNiArMTU5LDggQEAgcHJp dmF0ZToKICAgICB2b2lkIHNldFRvcExlZnQoY29uc3QgTGF5b3V0UG9pbnQmIHRvcExlZnQpIHsg bV9yZWN0LnNldFRvcExlZnQodG9wTGVmdCk7IH0KICAgICB2b2lkIHNldFRvcChMYXlvdXRVbml0 IHRvcCkgeyBtX3JlY3Quc2V0VG9wKHRvcCk7IH0KICAgICB2b2lkIHNldExlZnQoTGF5b3V0VW5p dCBsZWZ0KSB7IG1fcmVjdC5zZXRMZWZ0KGxlZnQpOyB9CisgICAgdm9pZCBtb3ZlSG9yaXpvbnRh bGx5KExheW91dFVuaXQgb2Zmc2V0KSB7IG1fcmVjdC5tb3ZlSG9yaXpvbnRhbGx5KG9mZnNldCk7 IH0KKyAgICB2b2lkIG1vdmVWZXJ0aWNhbGx5KExheW91dFVuaXQgb2Zmc2V0KSB7IG1fcmVjdC5t b3ZlVmVydGljYWxseShvZmZzZXQpOyB9CiAgICAgdm9pZCBzZXRXaWR0aChMYXlvdXRVbml0IHdp ZHRoKSB7IG1fcmVjdC5zZXRXaWR0aCh3aWR0aCk7IH0KICAgICB2b2lkIHNldEhlaWdodChMYXlv dXRVbml0IGhlaWdodCkgeyBtX3JlY3Quc2V0SGVpZ2h0KGhlaWdodCk7IH0KICAgICB2b2lkIHNl dFNpemUoY29uc3QgTGF5b3V0U2l6ZSYgc2l6ZSkgeyBtX3JlY3Quc2V0U2l6ZShzaXplKTsgfQpA QCAtMzE3LDcgKzMyMiw2IEBAIGlubGluZSB2b2lkIEJveDo6UmVjdDo6c2V0V2lkdGgoTGF5b3V0 VW5pdCB3aWR0aCkKICNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAgbV9oYXNWYWxpZFdpZHRoID0g dHJ1ZTsKICNlbmRpZgotICAgIEFTU0VSVChtX2hhc1ZhbGlkTGVmdCk7CiAgICAgbV9yZWN0LnNl dFdpZHRoKHdpZHRoKTsKIH0KIApAQCAtMzI2LDcgKzMzMCw2IEBAIGlubGluZSB2b2lkIEJveDo6 UmVjdDo6c2V0SGVpZ2h0KExheW91dFVuaXQgaGVpZ2h0KQogI2lmICFBU1NFUlRfRElTQUJMRUQK ICAgICBtX2hhc1ZhbGlkSGVpZ2h0ID0gdHJ1ZTsKICNlbmRpZgotICAgIEFTU0VSVChtX2hhc1Zh bGlkVG9wKTsKICAgICBtX3JlY3Quc2V0SGVpZ2h0KGhlaWdodCk7CiB9CiAKQEAgLTM2Miw2ICsz NjUsMTggQEAgaW5saW5lIHZvaWQgQm94OjpSZWN0OjpzaGlmdEJvdHRvbVRvKExheW91dFVuaXQg Ym90dG9tKQogICAgIG1fcmVjdC5zaGlmdE1heFlFZGdlVG8oYm90dG9tKTsKIH0KIAoraW5saW5l IHZvaWQgQm94OjpSZWN0Ojptb3ZlSG9yaXpvbnRhbGx5KExheW91dFVuaXQgb2Zmc2V0KQorewor ICAgIEFTU0VSVChtX2hhc1ZhbGlkTGVmdCk7CisgICAgbV9yZWN0Lm1vdmUob2Zmc2V0LCB7IH0p OworfQorCitpbmxpbmUgdm9pZCBCb3g6OlJlY3Q6Om1vdmVWZXJ0aWNhbGx5KExheW91dFVuaXQg b2Zmc2V0KQoreworICAgIEFTU0VSVChtX2hhc1ZhbGlkVG9wKTsKKyAgICBtX3JlY3QubW92ZSh7 IH0sIG9mZnNldCk7Cit9CisKIGlubGluZSB2b2lkIEJveDo6UmVjdDo6ZXhwYW5kKExheW91dFVu aXQgd2lkdGgsIExheW91dFVuaXQgaGVpZ2h0KQogewogICAgIEFTU0VSVChoYXNWYWxpZEdlb21l dHJ5KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5 b3V0Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5j cHAKaW5kZXggZGVmYWQyYzUwOWUzY2M2YTMyMGMxOGFjMWU5MWQyYmM0MjYxMzE5Yy4uNzFjMDlj MjY1MTFlZDg5NDg1N2M5NzlmMmU3N2JmMjJmYzJiZjI3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwCkBAIC0yMzAsOCArMjMwLDkgQEAgYm9v bCBCb3g6OmlzUGFkZGluZ0FwcGxpY2FibGUoKSBjb25zdAogewogICAgIC8vIDguNCBQYWRkaW5n IHByb3BlcnRpZXM6CiAgICAgLy8gQXBwbGllcyB0bzogYWxsIGVsZW1lbnRzIGV4Y2VwdCB0YWJs ZS1yb3ctZ3JvdXAsIHRhYmxlLWhlYWRlci1ncm91cCwgdGFibGUtZm9vdGVyLWdyb3VwLCB0YWJs ZS1yb3csIHRhYmxlLWNvbHVtbi1ncm91cCBhbmQgdGFibGUtY29sdW1uCi0gICAgaWYgKCFtX2Vs ZW1lbnRBdHRyaWJ1dGVzKQorICAgIGlmIChpc0Fub255bW91cygpKQogICAgICAgICByZXR1cm4g ZmFsc2U7CisKICAgICBhdXRvIGVsZW1lbnRUeXBlID0gbV9lbGVtZW50QXR0cmlidXRlcy52YWx1 ZSgpLmVsZW1lbnRUeXBlOwogICAgIHJldHVybiBlbGVtZW50VHlwZSAhPSBFbGVtZW50VHlwZTo6 VGFibGVSb3dHcm91cAogICAgICAgICAmJiBlbGVtZW50VHlwZSAhPSBFbGVtZW50VHlwZTo6VGFi bGVIZWFkZXJHcm91cApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRy ZWUvTGF5b3V0Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRC b3guaAppbmRleCA5ZGIyMDYwMTYyMjA3ODk2ZWNhZWEyMGM0MGE1NTJlMTczYjc1ZThjLi43MThh ZTg1NDQ2Y2U1YjdkNmUzNTgxZWQ0NDRjZDM1OGU4ODIzMGI0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaApAQCAtMTA2LDcgKzEwNiw4IEBAIHByb3Rl Y3RlZDoKICAgICAgICAgVGFibGVDb2x1bW5Hcm91cCwKICAgICAgICAgVGFibGVSb3dHcm91cCwK ICAgICAgICAgVGFibGVIZWFkZXJHcm91cCwKLSAgICAgICAgVGFibGVGb290ZXJHcm91cCAKKyAg ICAgICAgVGFibGVGb290ZXJHcm91cCwKKyAgICAgICAgR2VuZXJpY0VsZW1lbnQKICAgICB9Owog CiAgICAgc3RydWN0IEVsZW1lbnRBdHRyaWJ1dGVzIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcAppbmRleCBkODg5OGVm NzZlOGVhYzRkY2UwODQ3NTkyYTk3ODY2ODg0M2ZlMjhmLi5hZTM0YTMwMjE1ZDY3NWE0NTQ3N2I5 ZWMyZjU5ZGRmNmY0MDA0ODgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5 b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuY3BwCkBAIC03Miw3ICs3MiwxMCBAQCB2b2lk IFRyZWVCdWlsZGVyOjpjcmVhdGVTdWJUcmVlKGNvbnN0IFJlbmRlckVsZW1lbnQmIHJvb3RSZW5k ZXJlciwgQ29udGFpbmVyJiBybwogICAgICAgICAgICAgICAgIHJldHVybiBCb3g6OkVsZW1lbnRB dHRyaWJ1dGVzIHsgQm94OjpFbGVtZW50VHlwZTo6VGFibGVIZWFkZXJHcm91cCB9OwogICAgICAg ICAgICAgaWYgKGVsZW1lbnQtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjp0Zm9vdFRhZykpCiAgICAg ICAgICAgICAgICAgcmV0dXJuIEJveDo6RWxlbWVudEF0dHJpYnV0ZXMgeyBCb3g6OkVsZW1lbnRU eXBlOjpUYWJsZUZvb3Rlckdyb3VwIH07Ci0gICAgICAgIH0gCisgICAgICAgICAgICBpZiAoZWxl bWVudC0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OnRmb290VGFnKSkKKyAgICAgICAgICAgICAgICBy ZXR1cm4gQm94OjpFbGVtZW50QXR0cmlidXRlcyB7IEJveDo6RWxlbWVudFR5cGU6OlRhYmxlRm9v dGVyR3JvdXAgfTsKKyAgICAgICAgICAgIHJldHVybiBCb3g6OkVsZW1lbnRBdHRyaWJ1dGVzIHsg Qm94OjpFbGVtZW50VHlwZTo6R2VuZXJpY0VsZW1lbnQgfTsKKyAgICAgICAgfQogICAgICAgICBy ZXR1cm4gc3RkOjpudWxsb3B0OwogICAgIH07CiAK