205606 2019-12-27 05:59:48 -0800 [LFC][Integration] Ensure layout boxes have expected display types 2019-12-27 07:23:23 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham commit-queue simon.fraser webkit-bug-importer zalan oldest_to_newest 1601598 0 koivisto 2019-12-27 05:59:48 -0800 In some cases render tree may have display property values that don't match the renderer type. This is fine since the behavior is driven by the renderer. LFC layout is driven by display property so the effective value needs to make sense. 1601601 1 386439 koivisto 2019-12-27 06:13:15 -0800 Created attachment 386439 patch 1601608 2 386439 commit-queue 2019-12-27 07:22:47 -0800 Comment on attachment 386439 patch Clearing flags on attachment: 386439 Committed r253921: <https://trac.webkit.org/changeset/253921> 1601609 3 commit-queue 2019-12-27 07:22:49 -0800 All reviewed patches have been landed. Closing bug. 1601610 4 webkit-bug-importer 2019-12-27 07:23:23 -0800 <rdar://problem/58217781> 386439 2019-12-27 06:13:15 -0800 2019-12-27 07:22:47 -0800 patch lfc-display-fixup.patch text/plain 14769 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlZTU0NDViODdjNS4uOTJmYzk4MDhhYjQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOSBAQAorMjAxOS0xMi0yNyAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+ CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25dIEVuc3VyZSBsYXlvdXQgYm94ZXMgaGF2ZSBl eHBlY3RlZCBkaXNwbGF5IHR5cGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMDU2MDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBJbiBzb21lIGNhc2VzIHJlbmRlciB0cmVlIG1heSBoYXZlIGRpc3BsYXkg cHJvcGVydHkgdmFsdWVzIHRoYXQgZG9uJ3QgbWF0Y2ggdGhlIHJlbmRlcmVyIHR5cGUuIFRoaXMg aXMgZmluZSBzaW5jZSB0aGUgYmVoYXZpb3IgaXMgZHJpdmVuIGJ5IHRoZSByZW5kZXJlci4KKwor ICAgICAgICBMRkMgbGF5b3V0IGlzIGRyaXZlbiBieSBkaXNwbGF5IHByb3BlcnR5IHNvIHRoZSBl ZmZlY3RpdmUgdmFsdWUgbmVlZHMgdG8gbWFrZSBzZW5zZS4gVGhpcyBwYXRjaCBmaXhlcyBhc3Nl cnRpb25zIHNlZW4gaW4KKworICAgICAgICBmYXN0L2Nzcy9maWVsZHNldC1kaXNwbGF5LXJvdy5o dG1sCisgICAgICAgIGZhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtc3RyaWN0LW9yZGVyaW5nLWNy YXNoLTIuaHRtbAorICAgICAgICBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3MtZGlzcGxheS9kaXNwbGF5LWZsb3ctcm9vdC0wMDEuaHRtbAorICAgICAgICBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvcmVuZGVyaW5nL25vbi1yZXBsYWNlZC1lbGVtZW50 cy90aGUtZmllbGRzZXQtYW5kLWxlZ2VuZC1lbGVtZW50cy9maWVsZHNldC1kaXNwbGF5Lmh0bWwK KyAgICAgICAgdGFibGVzL21vemlsbGEvYnVncy9idWcyNzU2MjUuaHRtbAorCisgICAgICAgICog bGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6TGluZUxheW91dCk6 CisgICAgICAgICogbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUcmVlQnVpbGRlcjo6YnVpbGRMYXlvdXRUcmVlRm9ySW50 ZWdyYXRpb24pOgorCisgICAgICAgIEFsd2F5cyBzZXQgZGlzcGxheSB0byAnYmxvY2snIGZvciB0 aGUgcm9vdCBSZW5kZXJCbG9ja0Zsb3cuCisgICAgICAgIFJlbmFtZWQgZm9yIGNsYXJpdHkuCisK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VHJlZUJ1aWxkZXI6OmNyZWF0ZUxheW91dEJveCk6 CisKKyAgICAgICAgQWx3YXlzIHNldCA8YnI+IGRpc3BsYXkgdG8gaW5saW5lLgorCisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OlRyZWVCdWlsZGVyOjpidWlsZFRhYmxlU3RydWN0dXJlKToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6VHJlZUJ1aWxkZXI6OmJ1aWxkU3ViVHJlZSk6CisKKyAg ICAgICAgUGFzcyB0aGUgcGFyZW50IGNvbnRhaW5lciBpbnN0ZWFkIG9mIHBhcmVudCByZW5kZXJl ciBzbyB3ZSBjYW4gcmVhZCBlZmZlY3RpdmUgc3R5bGUuCisKKyAgICAgICAgKiBsYXlvdXQvbGF5 b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5oOgorCiAyMDE5LTEyLTI3ICBKYW1lcyBEYXJwaW5p YW4gIDxqZGFycGluaWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBBTkdMRTogRml4IFdlYkdM IGNvbmZvcm1hbmNlIHRlc3QgZnJhbWVidWZmZXItb2JqZWN0LWF0dGFjaG1lbnQuaHRtbApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0 aW9uTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcAppbmRleCA0Zjg3YjRmNjIyMy4uMmY2YzA2MTk4 MjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJ bnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCkBAIC01Myw3ICs1Myw3IEBA IG5hbWVzcGFjZSBMYXlvdXRJbnRlZ3JhdGlvbiB7CiBMaW5lTGF5b3V0OjpMaW5lTGF5b3V0KGNv bnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdykKICAgICA6IG1fZmxvdyhmbG93KQogewotICAgIG1f dHJlZUNvbnRlbnQgPSBMYXlvdXQ6OlRyZWVCdWlsZGVyOjpidWlsZExheW91dFRyZWUoZmxvdyk7 CisgICAgbV90cmVlQ29udGVudCA9IExheW91dDo6VHJlZUJ1aWxkZXI6OmJ1aWxkTGF5b3V0VHJl ZUZvckludGVncmF0aW9uKGZsb3cpOwogfQogCiBMaW5lTGF5b3V0Ojp+TGluZUxheW91dCgpID0g ZGVmYXVsdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xh eW91dFRyZWVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xh eW91dFRyZWVCdWlsZGVyLmNwcAppbmRleCBlZDNhYzY4NmJkNC4uMGU1NjJmOWIyYmUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVp bGRlci5jcHAKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJDYWNoZWRJbWFnZS5oIgogI2lu Y2x1ZGUgIkRpc3BsYXlCb3guaCIKICNpbmNsdWRlICJEaXNwbGF5UnVuLmgiCisjaW5jbHVkZSAi SFRNTE5hbWVzLmgiCiAjaW5jbHVkZSAiSFRNTFRhYmxlQ2VsbEVsZW1lbnQuaCIKICNpbmNsdWRl ICJIVE1MVGFibGVDb2xFbGVtZW50LmgiCiAjaW5jbHVkZSAiSW5saW5lRm9ybWF0dGluZ1N0YXRl LmgiCkBAIC03Niw3ICs3Nyw2IEBAIHZvaWQgTGF5b3V0VHJlZUNvbnRlbnQ6OmFkZExheW91dEJv eEZvclJlbmRlcmVyKGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIsIEJvCiAgICAgbV9sYXlv dXRCb3hUb1JlbmRlck9iamVjdC5hZGQoJmxheW91dEJveCwgJnJlbmRlcmVyKTsKIH0KIAotCiBz dGF0aWMgdm9pZCBhcHBlbmRDaGlsZChDb250YWluZXImIHBhcmVudCwgQm94JiBuZXdDaGlsZCkK IHsKICAgICBpZiAoIXBhcmVudC5oYXNDaGlsZCgpKSB7CkBAIC0xNDgsMTIgKzE0OCwxNCBAQCBz dGQ6OnVuaXF1ZV9wdHI8TGF5b3V0OjpMYXlvdXRUcmVlQ29udGVudD4gVHJlZUJ1aWxkZXI6OmJ1 aWxkTGF5b3V0VHJlZShjb25zdCBSZQogICAgIHJldHVybiBsYXlvdXRUcmVlQ29udGVudDsKIH0K IAotc3RkOjp1bmlxdWVfcHRyPExheW91dDo6TGF5b3V0VHJlZUNvbnRlbnQ+IFRyZWVCdWlsZGVy OjpidWlsZExheW91dFRyZWUoY29uc3QgUmVuZGVyQmxvY2tGbG93JiByZW5kZXJCbG9ja0Zsb3cp CitzdGQ6OnVuaXF1ZV9wdHI8TGF5b3V0OjpMYXlvdXRUcmVlQ29udGVudD4gVHJlZUJ1aWxkZXI6 OmJ1aWxkTGF5b3V0VHJlZUZvckludGVncmF0aW9uKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgcmVu ZGVyQmxvY2tGbG93KQogewogICAgIFBoYXNlU2NvcGUgc2NvcGUoUGhhc2U6OlR5cGU6OlRyZWVC dWlsZGluZyk7CiAKLSAgICBhdXRvIHN0eWxlID0gUmVuZGVyU3R5bGU6OmNsb25lKHJlbmRlckJs b2NrRmxvdy5zdHlsZSgpKTsKLSAgICBhdXRvIGxheW91dFRyZWVDb250ZW50ID0gbWFrZVVuaXF1 ZTxMYXlvdXRUcmVlQ29udGVudD4ocmVuZGVyQmxvY2tGbG93LCBtYWtlVW5pcXVlPENvbnRhaW5l cj4oV1RGOjpudWxsb3B0LCBXVEZNb3ZlKHN0eWxlKSkpOworICAgIGF1dG8gY2xvbmVkU3R5bGUg PSBSZW5kZXJTdHlsZTo6Y2xvbmUocmVuZGVyQmxvY2tGbG93LnN0eWxlKCkpOworICAgIGNsb25l ZFN0eWxlLnNldERpc3BsYXkoRGlzcGxheVR5cGU6OkJsb2NrKTsKKworICAgIGF1dG8gbGF5b3V0 VHJlZUNvbnRlbnQgPSBtYWtlVW5pcXVlPExheW91dFRyZWVDb250ZW50PihyZW5kZXJCbG9ja0Zs b3csIG1ha2VVbmlxdWU8Q29udGFpbmVyPihXVEY6Om51bGxvcHQsIFdURk1vdmUoY2xvbmVkU3R5 bGUpKSk7CiAgICAgVHJlZUJ1aWxkZXIoKmxheW91dFRyZWVDb250ZW50KS5idWlsZFRyZWUoKTsK ICAgICByZXR1cm4gbGF5b3V0VHJlZUNvbnRlbnQ7CiB9CkBAIC0xNjgsNyArMTcwLDcgQEAgdm9p ZCBUcmVlQnVpbGRlcjo6YnVpbGRUcmVlKCkKICAgICBidWlsZFN1YlRyZWUobV9sYXlvdXRUcmVl Q29udGVudC5yb290UmVuZGVyZXIoKSwgbV9sYXlvdXRUcmVlQ29udGVudC5yb290TGF5b3V0Qm94 KCkpOwogfQogCi1zdGQ6OnVuaXF1ZV9wdHI8Qm94PiBUcmVlQnVpbGRlcjo6Y3JlYXRlTGF5b3V0 Qm94KGNvbnN0IFJlbmRlckVsZW1lbnQmIHBhcmVudFJlbmRlcmVyLCBjb25zdCBSZW5kZXJPYmpl Y3QmIGNoaWxkUmVuZGVyZXIpCitzdGQ6OnVuaXF1ZV9wdHI8Qm94PiBUcmVlQnVpbGRlcjo6Y3Jl YXRlTGF5b3V0Qm94KGNvbnN0IENvbnRhaW5lciYgcGFyZW50Q29udGFpbmVyLCBjb25zdCBSZW5k ZXJPYmplY3QmIGNoaWxkUmVuZGVyZXIpCiB7CiAgICAgYXV0byBlbGVtZW50QXR0cmlidXRlcyA9 IFtdIChjb25zdCBSZW5kZXJFbGVtZW50JiByZW5kZXJlcikgLT4gT3B0aW9uYWw8Qm94OjpFbGVt ZW50QXR0cmlidXRlcz4gewogICAgICAgICBpZiAocmVuZGVyZXIuaXNEb2N1bWVudEVsZW1lbnRS ZW5kZXJlcigpKQpAQCAtMTkxLDI3ICsxOTMsMzEgQEAgc3RkOjp1bmlxdWVfcHRyPEJveD4gVHJl ZUJ1aWxkZXI6OmNyZWF0ZUxheW91dEJveChjb25zdCBSZW5kZXJFbGVtZW50JiBwYXJlbnRSZW4K ICAgICBzdGQ6OnVuaXF1ZV9wdHI8Qm94PiBjaGlsZExheW91dEJveDsKICAgICBpZiAoaXM8UmVu ZGVyVGV4dD4oY2hpbGRSZW5kZXJlcikpIHsKICAgICAgICAgYXV0byYgdGV4dFJlbmRlcmVyID0g ZG93bmNhc3Q8UmVuZGVyVGV4dD4oY2hpbGRSZW5kZXJlcik7Ci0gICAgICAgIGF1dG8gdGV4dCA9 IGFwcGx5VGV4dFRyYW5zZm9ybSh0ZXh0UmVuZGVyZXIudGV4dCgpLCBwYXJlbnRSZW5kZXJlci5z dHlsZSgpKTsKKyAgICAgICAgYXV0byB0ZXh0ID0gYXBwbHlUZXh0VHJhbnNmb3JtKHRleHRSZW5k ZXJlci50ZXh0KCksIHBhcmVudENvbnRhaW5lci5zdHlsZSgpKTsKICAgICAgICAgLy8gRklYTUU6 IENsZWFybHkgdGhlcmUgbXVzdCBiZSBhIGhlbHBlciBmdW5jdGlvbiBmb3IgdGhpcy4KLSAgICAg ICAgYXV0byB0ZXh0Q29udGVudCA9IFRleHRDb250ZXh0IHsgdGV4dCwgY2FuVXNlU2ltcGxpZmll ZFRleHRNZWFzdXJpbmcodGV4dCwgcGFyZW50UmVuZGVyZXIuc3R5bGUoKS5mb250Q2FzY2FkZSgp LCBwYXJlbnRSZW5kZXJlci5zdHlsZSgpLmNvbGxhcHNlV2hpdGVTcGFjZSgpKSB9OwotICAgICAg ICBpZiAocGFyZW50UmVuZGVyZXIuc3R5bGUoKS5kaXNwbGF5KCkgPT0gRGlzcGxheVR5cGU6Oklu bGluZSkKLSAgICAgICAgICAgIGNoaWxkTGF5b3V0Qm94ID0gbWFrZVVuaXF1ZTxCb3g+KFdURk1v dmUodGV4dENvbnRlbnQpLCBSZW5kZXJTdHlsZTo6Y2xvbmUocGFyZW50UmVuZGVyZXIuc3R5bGUo KSkpOworICAgICAgICBhdXRvIHRleHRDb250ZW50ID0gVGV4dENvbnRleHQgeyB0ZXh0LCBjYW5V c2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyh0ZXh0LCBwYXJlbnRDb250YWluZXIuc3R5bGUoKS5m b250Q2FzY2FkZSgpLCBwYXJlbnRDb250YWluZXIuc3R5bGUoKS5jb2xsYXBzZVdoaXRlU3BhY2Uo KSkgfTsKKyAgICAgICAgaWYgKHBhcmVudENvbnRhaW5lci5zdHlsZSgpLmRpc3BsYXkoKSA9PSBE aXNwbGF5VHlwZTo6SW5saW5lKQorICAgICAgICAgICAgY2hpbGRMYXlvdXRCb3ggPSBtYWtlVW5p cXVlPEJveD4oV1RGTW92ZSh0ZXh0Q29udGVudCksIFJlbmRlclN0eWxlOjpjbG9uZShwYXJlbnRD b250YWluZXIuc3R5bGUoKSkpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBjaGlsZExheW91 dEJveCA9IG1ha2VVbmlxdWU8Qm94PihXVEZNb3ZlKHRleHRDb250ZW50KSwgUmVuZGVyU3R5bGU6 OmNyZWF0ZUFub255bW91c1N0eWxlV2l0aERpc3BsYXkocGFyZW50UmVuZGVyZXIuc3R5bGUoKSwg RGlzcGxheVR5cGU6OklubGluZSkpOworICAgICAgICAgICAgY2hpbGRMYXlvdXRCb3ggPSBtYWtl VW5pcXVlPEJveD4oV1RGTW92ZSh0ZXh0Q29udGVudCksIFJlbmRlclN0eWxlOjpjcmVhdGVBbm9u eW1vdXNTdHlsZVdpdGhEaXNwbGF5KHBhcmVudENvbnRhaW5lci5zdHlsZSgpLCBEaXNwbGF5VHlw ZTo6SW5saW5lKSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgYXV0byYgcmVuZGVyZXIgPSBkb3du Y2FzdDxSZW5kZXJFbGVtZW50PihjaGlsZFJlbmRlcmVyKTsKICAgICAgICAgYXV0byBkaXNwbGF5 VHlwZSA9IHJlbmRlcmVyLnN0eWxlKCkuZGlzcGxheSgpOwotICAgICAgICBpZiAoaXM8UmVuZGVy TGluZUJyZWFrPihyZW5kZXJlcikpCi0gICAgICAgICAgICBjaGlsZExheW91dEJveCA9IG1ha2VV bmlxdWU8Qm94PihlbGVtZW50QXR0cmlidXRlcyhyZW5kZXJlciksIFJlbmRlclN0eWxlOjpjbG9u ZShyZW5kZXJlci5zdHlsZSgpKSk7Ci0gICAgICAgIGVsc2UgaWYgKGlzPFJlbmRlclRhYmxlPihy ZW5kZXJlcikpIHsKKworICAgICAgICBhdXRvIGNsb25lZFN0eWxlID0gUmVuZGVyU3R5bGU6OmNs b25lKHJlbmRlcmVyLnN0eWxlKCkpOworCisgICAgICAgIGlmIChpczxSZW5kZXJMaW5lQnJlYWs+ KHJlbmRlcmVyKSkgeworICAgICAgICAgICAgY2xvbmVkU3R5bGUuc2V0RGlzcGxheShEaXNwbGF5 VHlwZTo6SW5saW5lKTsKKyAgICAgICAgICAgIGNoaWxkTGF5b3V0Qm94ID0gbWFrZVVuaXF1ZTxC b3g+KGVsZW1lbnRBdHRyaWJ1dGVzKHJlbmRlcmVyKSwgV1RGTW92ZShjbG9uZWRTdHlsZSkpOwor ICAgICAgICB9IGVsc2UgaWYgKGlzPFJlbmRlclRhYmxlPihyZW5kZXJlcikpIHsKICAgICAgICAg ICAgIC8vIENvbnN0cnVjdCB0aGUgcHJpbmNpcGFsIHRhYmxlIHdyYXBwZXIgYm94IChhbmQgbm90 IHRoZSB0YWJsZSBib3ggaXRzZWxmKS4KLSAgICAgICAgICAgIGNoaWxkTGF5b3V0Qm94ID0gbWFr ZVVuaXF1ZTxDb250YWluZXI+KEJveDo6RWxlbWVudEF0dHJpYnV0ZXMgeyBCb3g6OkVsZW1lbnRU eXBlOjpUYWJsZVdyYXBwZXJCb3ggfSwgUmVuZGVyU3R5bGU6OmNsb25lKHJlbmRlcmVyLnN0eWxl KCkpKTsKKyAgICAgICAgICAgIGNoaWxkTGF5b3V0Qm94ID0gbWFrZVVuaXF1ZTxDb250YWluZXI+ KEJveDo6RWxlbWVudEF0dHJpYnV0ZXMgeyBCb3g6OkVsZW1lbnRUeXBlOjpUYWJsZVdyYXBwZXJC b3ggfSwgV1RGTW92ZShjbG9uZWRTdHlsZSkpOwogICAgICAgICAgICAgY2hpbGRMYXlvdXRCb3gt PnNldElzQW5vbnltb3VzKCk7CiAgICAgICAgIH0gZWxzZSBpZiAoaXM8UmVuZGVyUmVwbGFjZWQ+ KHJlbmRlcmVyKSkgewogICAgICAgICAgICAgaWYgKGRpc3BsYXlUeXBlID09IERpc3BsYXlUeXBl OjpCbG9jaykKLSAgICAgICAgICAgICAgICBjaGlsZExheW91dEJveCA9IG1ha2VVbmlxdWU8Qm94 PihlbGVtZW50QXR0cmlidXRlcyhyZW5kZXJlciksIFJlbmRlclN0eWxlOjpjbG9uZShyZW5kZXJl ci5zdHlsZSgpKSk7CisgICAgICAgICAgICAgICAgY2hpbGRMYXlvdXRCb3ggPSBtYWtlVW5pcXVl PEJveD4oZWxlbWVudEF0dHJpYnV0ZXMocmVuZGVyZXIpLCBXVEZNb3ZlKGNsb25lZFN0eWxlKSk7 CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgY2hpbGRMYXlvdXRCb3ggPSBtYWtl VW5pcXVlPEJveD4oZWxlbWVudEF0dHJpYnV0ZXMocmVuZGVyZXIpLCBSZW5kZXJTdHlsZTo6Y2xv bmUocmVuZGVyZXIuc3R5bGUoKSkpOworICAgICAgICAgICAgICAgIGNoaWxkTGF5b3V0Qm94ID0g bWFrZVVuaXF1ZTxCb3g+KGVsZW1lbnRBdHRyaWJ1dGVzKHJlbmRlcmVyKSwgV1RGTW92ZShjbG9u ZWRTdHlsZSkpOwogICAgICAgICAgICAgLy8gRklYTUU6IFdlIGRvbid0IHlldCBzdXBwb3J0IGFs bCByZXBsYWNlZCBlbGVtZW50cyBhbmQgdGhpcyBpcyB0ZW1wb3JhcnkgYW55d2F5LgogICAgICAg ICAgICAgaWYgKGNoaWxkTGF5b3V0Qm94LT5yZXBsYWNlZCgpKQogICAgICAgICAgICAgICAgIGNo aWxkTGF5b3V0Qm94LT5yZXBsYWNlZCgpLT5zZXRJbnRyaW5zaWNTaXplKGRvd25jYXN0PFJlbmRl clJlcGxhY2VkPihyZW5kZXJlcikuaW50cmluc2ljU2l6ZSgpKTsKQEAgLTIyNSwyMyArMjMxLDIy IEBAIHN0ZDo6dW5pcXVlX3B0cjxCb3g+IFRyZWVCdWlsZGVyOjpjcmVhdGVMYXlvdXRCb3goY29u c3QgUmVuZGVyRWxlbWVudCYgcGFyZW50UmVuCiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAg ICBpZiAoZGlzcGxheVR5cGUgPT0gRGlzcGxheVR5cGU6OkJsb2NrKSB7CiAgICAgICAgICAgICAg ICAgaWYgKGF1dG8gb2Zmc2V0ID0gYWNjdW11bGF0ZWRPZmZzZXRGb3JJbkZsb3dQb3NpdGlvbmVk Q29udGludWF0aW9uKGRvd25jYXN0PFJlbmRlckJveD4ocmVuZGVyZXIpKSkgewotICAgICAgICAg ICAgICAgICAgICBhdXRvIHN0eWxlID0gUmVuZGVyU3R5bGU6OmNsb25lUHRyKHJlbmRlcmVyLnN0 eWxlKCkpOwotICAgICAgICAgICAgICAgICAgICBzdHlsZS0+c2V0VG9wKHsgb2Zmc2V0LT5oZWln aHQoKSwgRml4ZWQgfSk7Ci0gICAgICAgICAgICAgICAgICAgIHN0eWxlLT5zZXRMZWZ0KHsgb2Zm c2V0LT53aWR0aCgpLCBGaXhlZCB9KTsKLSAgICAgICAgICAgICAgICAgICAgY2hpbGRMYXlvdXRC b3ggPSBtYWtlVW5pcXVlPENvbnRhaW5lcj4oZWxlbWVudEF0dHJpYnV0ZXMocmVuZGVyZXIpLCBX VEZNb3ZlKCpzdHlsZSkpOworICAgICAgICAgICAgICAgICAgICBjbG9uZWRTdHlsZS5zZXRUb3Ao eyBvZmZzZXQtPmhlaWdodCgpLCBGaXhlZCB9KTsKKyAgICAgICAgICAgICAgICAgICAgY2xvbmVk U3R5bGUuc2V0TGVmdCh7IG9mZnNldC0+d2lkdGgoKSwgRml4ZWQgfSk7CisgICAgICAgICAgICAg ICAgICAgIGNoaWxkTGF5b3V0Qm94ID0gbWFrZVVuaXF1ZTxDb250YWluZXI+KGVsZW1lbnRBdHRy aWJ1dGVzKHJlbmRlcmVyKSwgV1RGTW92ZShjbG9uZWRTdHlsZSkpOwogICAgICAgICAgICAgICAg IH0gZWxzZQotICAgICAgICAgICAgICAgICAgICBjaGlsZExheW91dEJveCA9IG1ha2VVbmlxdWU8 Q29udGFpbmVyPihlbGVtZW50QXR0cmlidXRlcyhyZW5kZXJlciksIFJlbmRlclN0eWxlOjpjbG9u ZShyZW5kZXJlci5zdHlsZSgpKSk7CisgICAgICAgICAgICAgICAgICAgIGNoaWxkTGF5b3V0Qm94 ID0gbWFrZVVuaXF1ZTxDb250YWluZXI+KGVsZW1lbnRBdHRyaWJ1dGVzKHJlbmRlcmVyKSwgV1RG TW92ZShjbG9uZWRTdHlsZSkpOwogICAgICAgICAgICAgfSBlbHNlIGlmIChkaXNwbGF5VHlwZSA9 PSBEaXNwbGF5VHlwZTo6SW5saW5lKQotICAgICAgICAgICAgICAgIGNoaWxkTGF5b3V0Qm94ID0g bWFrZVVuaXF1ZTxDb250YWluZXI+KGVsZW1lbnRBdHRyaWJ1dGVzKHJlbmRlcmVyKSwgUmVuZGVy U3R5bGU6OmNsb25lKHJlbmRlcmVyLnN0eWxlKCkpKTsKKyAgICAgICAgICAgICAgICBjaGlsZExh eW91dEJveCA9IG1ha2VVbmlxdWU8Q29udGFpbmVyPihlbGVtZW50QXR0cmlidXRlcyhyZW5kZXJl ciksIFdURk1vdmUoY2xvbmVkU3R5bGUpKTsKICAgICAgICAgICAgIGVsc2UgaWYgKGRpc3BsYXlU eXBlID09IERpc3BsYXlUeXBlOjpJbmxpbmVCbG9jaykKLSAgICAgICAgICAgICAgICBjaGlsZExh eW91dEJveCA9IG1ha2VVbmlxdWU8Q29udGFpbmVyPihlbGVtZW50QXR0cmlidXRlcyhyZW5kZXJl ciksIFJlbmRlclN0eWxlOjpjbG9uZShyZW5kZXJlci5zdHlsZSgpKSk7CisgICAgICAgICAgICAg ICAgY2hpbGRMYXlvdXRCb3ggPSBtYWtlVW5pcXVlPENvbnRhaW5lcj4oZWxlbWVudEF0dHJpYnV0 ZXMocmVuZGVyZXIpLCBXVEZNb3ZlKGNsb25lZFN0eWxlKSk7CiAgICAgICAgICAgICBlbHNlIGlm IChkaXNwbGF5VHlwZSA9PSBEaXNwbGF5VHlwZTo6VGFibGVDYXB0aW9uIHx8IGRpc3BsYXlUeXBl ID09IERpc3BsYXlUeXBlOjpUYWJsZUNlbGwpIHsKLSAgICAgICAgICAgICAgICBjaGlsZExheW91 dEJveCA9IG1ha2VVbmlxdWU8Q29udGFpbmVyPihlbGVtZW50QXR0cmlidXRlcyhyZW5kZXJlciks IFJlbmRlclN0eWxlOjpjbG9uZShyZW5kZXJlci5zdHlsZSgpKSk7CisgICAgICAgICAgICAgICAg Y2hpbGRMYXlvdXRCb3ggPSBtYWtlVW5pcXVlPENvbnRhaW5lcj4oZWxlbWVudEF0dHJpYnV0ZXMo cmVuZGVyZXIpLCBXVEZNb3ZlKGNsb25lZFN0eWxlKSk7CiAgICAgICAgICAgICB9IGVsc2UgaWYg KGRpc3BsYXlUeXBlID09IERpc3BsYXlUeXBlOjpUYWJsZVJvd0dyb3VwIHx8IGRpc3BsYXlUeXBl ID09IERpc3BsYXlUeXBlOjpUYWJsZUhlYWRlckdyb3VwIHx8IGRpc3BsYXlUeXBlID09IERpc3Bs YXlUeXBlOjpUYWJsZUZvb3Rlckdyb3VwCiAgICAgICAgICAgICAgICAgfHwgZGlzcGxheVR5cGUg PT0gRGlzcGxheVR5cGU6OlRhYmxlUm93IHx8IGRpc3BsYXlUeXBlID09IERpc3BsYXlUeXBlOjpU YWJsZUNvbHVtbkdyb3VwKSB7Ci0gICAgICAgICAgICAgICAgY2hpbGRMYXlvdXRCb3ggPSBtYWtl VW5pcXVlPENvbnRhaW5lcj4oZWxlbWVudEF0dHJpYnV0ZXMocmVuZGVyZXIpLCBSZW5kZXJTdHls ZTo6Y2xvbmUocmVuZGVyZXIuc3R5bGUoKSkpOworICAgICAgICAgICAgICAgIGNoaWxkTGF5b3V0 Qm94ID0gbWFrZVVuaXF1ZTxDb250YWluZXI+KGVsZW1lbnRBdHRyaWJ1dGVzKHJlbmRlcmVyKSwg V1RGTW92ZShjbG9uZWRTdHlsZSkpOwogICAgICAgICAgICAgfSBlbHNlIGlmIChkaXNwbGF5VHlw ZSA9PSBEaXNwbGF5VHlwZTo6VGFibGVDb2x1bW4pIHsKLSAgICAgICAgICAgICAgICBjaGlsZExh eW91dEJveCA9IG1ha2VVbmlxdWU8Q29udGFpbmVyPihlbGVtZW50QXR0cmlidXRlcyhyZW5kZXJl ciksIFJlbmRlclN0eWxlOjpjbG9uZShyZW5kZXJlci5zdHlsZSgpKSk7CisgICAgICAgICAgICAg ICAgY2hpbGRMYXlvdXRCb3ggPSBtYWtlVW5pcXVlPENvbnRhaW5lcj4oZWxlbWVudEF0dHJpYnV0 ZXMocmVuZGVyZXIpLCBXVEZNb3ZlKGNsb25lZFN0eWxlKSk7CiAgICAgICAgICAgICAgICAgYXV0 byYgdGFibGVDb2xFbGVtZW50ID0gc3RhdGljX2Nhc3Q8SFRNTFRhYmxlQ29sRWxlbWVudCY+KCpy ZW5kZXJlci5lbGVtZW50KCkpOwogICAgICAgICAgICAgICAgIGF1dG8gY29sdW1uV2lkdGggPSB0 YWJsZUNvbEVsZW1lbnQud2lkdGgoKTsKICAgICAgICAgICAgICAgICBpZiAoIWNvbHVtbldpZHRo LmlzRW1wdHkoKSkKQEAgLTI3OCw3ICsyODMsNyBAQCB2b2lkIFRyZWVCdWlsZGVyOjpidWlsZFRh YmxlU3RydWN0dXJlKGNvbnN0IFJlbmRlclRhYmxlJiB0YWJsZVJlbmRlcmVyLCBDb250YWluZQog ICAgIGF1dG8qIHRhYmxlQ2hpbGQgPSB0YWJsZVJlbmRlcmVyLmZpcnN0Q2hpbGQoKTsKICAgICB3 aGlsZSAoaXM8UmVuZGVyVGFibGVDYXB0aW9uPih0YWJsZUNoaWxkKSkgewogICAgICAgICBhdXRv JiBjYXB0aW9uUmVuZGVyZXIgPSAqdGFibGVDaGlsZDsKLSAgICAgICAgYXV0byBjYXB0aW9uQm94 ID0gY3JlYXRlTGF5b3V0Qm94KHRhYmxlUmVuZGVyZXIsIGNhcHRpb25SZW5kZXJlcik7CisgICAg ICAgIGF1dG8gY2FwdGlvbkJveCA9IGNyZWF0ZUxheW91dEJveCh0YWJsZVdyYXBwZXJCb3gsIGNh cHRpb25SZW5kZXJlcik7CiAgICAgICAgIGFwcGVuZENoaWxkKHRhYmxlV3JhcHBlckJveCwgKmNh cHRpb25Cb3gpOwogICAgICAgICBhdXRvJiBjYXB0aW9uQ29udGFpbmVyID0gZG93bmNhc3Q8Q29u dGFpbmVyPigqY2FwdGlvbkJveCk7CiAgICAgICAgIGJ1aWxkU3ViVHJlZShkb3duY2FzdDxSZW5k ZXJFbGVtZW50PihjYXB0aW9uUmVuZGVyZXIpLCBjYXB0aW9uQ29udGFpbmVyKTsKQEAgLTI5MCw3 ICsyOTUsNyBAQCB2b2lkIFRyZWVCdWlsZGVyOjpidWlsZFRhYmxlU3RydWN0dXJlKGNvbnN0IFJl bmRlclRhYmxlJiB0YWJsZVJlbmRlcmVyLCBDb250YWluZQogICAgIGFwcGVuZENoaWxkKHRhYmxl V3JhcHBlckJveCwgKnRhYmxlQm94KTsKICAgICBhdXRvKiBzZWN0aW9uUmVuZGVyZXIgPSB0YWJs ZUNoaWxkOwogICAgIHdoaWxlIChzZWN0aW9uUmVuZGVyZXIpIHsKLSAgICAgICAgYXV0byBzZWN0 aW9uQm94ID0gY3JlYXRlTGF5b3V0Qm94KHRhYmxlUmVuZGVyZXIsICpzZWN0aW9uUmVuZGVyZXIp OworICAgICAgICBhdXRvIHNlY3Rpb25Cb3ggPSBjcmVhdGVMYXlvdXRCb3goKnRhYmxlQm94LCAq c2VjdGlvblJlbmRlcmVyKTsKICAgICAgICAgYXBwZW5kQ2hpbGQoKnRhYmxlQm94LCAqc2VjdGlv bkJveCk7CiAgICAgICAgIGF1dG8mIHNlY3Rpb25Db250YWluZXIgPSBkb3duY2FzdDxDb250YWlu ZXI+KCpzZWN0aW9uQm94KTsKICAgICAgICAgYnVpbGRTdWJUcmVlKGRvd25jYXN0PFJlbmRlckVs ZW1lbnQ+KCpzZWN0aW9uUmVuZGVyZXIpLCBzZWN0aW9uQ29udGFpbmVyKTsKQEAgLTMwMCwxMSAr MzA1LDExIEBAIHZvaWQgVHJlZUJ1aWxkZXI6OmJ1aWxkVGFibGVTdHJ1Y3R1cmUoY29uc3QgUmVu ZGVyVGFibGUmIHRhYmxlUmVuZGVyZXIsIENvbnRhaW5lCiAgICAgbV9sYXlvdXRUcmVlQ29udGVu dC5hZGRCb3goV1RGTW92ZSh0YWJsZUJveCkpOwogfQogCi12b2lkIFRyZWVCdWlsZGVyOjpidWls ZFN1YlRyZWUoY29uc3QgUmVuZGVyRWxlbWVudCYgcm9vdFJlbmRlcmVyLCBDb250YWluZXImIHJv b3RDb250YWluZXIpCit2b2lkIFRyZWVCdWlsZGVyOjpidWlsZFN1YlRyZWUoY29uc3QgUmVuZGVy RWxlbWVudCYgcGFyZW50UmVuZGVyZXIsIENvbnRhaW5lciYgcGFyZW50Q29udGFpbmVyKQogewot ICAgIGZvciAoYXV0byYgY2hpbGRSZW5kZXJlciA6IGNoaWxkcmVuT2ZUeXBlPFJlbmRlck9iamVj dD4ocm9vdFJlbmRlcmVyKSkgewotICAgICAgICBhdXRvIGNoaWxkTGF5b3V0Qm94ID0gY3JlYXRl TGF5b3V0Qm94KHJvb3RSZW5kZXJlciwgY2hpbGRSZW5kZXJlcik7Ci0gICAgICAgIGFwcGVuZENo aWxkKHJvb3RDb250YWluZXIsICpjaGlsZExheW91dEJveCk7CisgICAgZm9yIChhdXRvJiBjaGls ZFJlbmRlcmVyIDogY2hpbGRyZW5PZlR5cGU8UmVuZGVyT2JqZWN0PihwYXJlbnRSZW5kZXJlcikp IHsKKyAgICAgICAgYXV0byBjaGlsZExheW91dEJveCA9IGNyZWF0ZUxheW91dEJveChwYXJlbnRD b250YWluZXIsIGNoaWxkUmVuZGVyZXIpOworICAgICAgICBhcHBlbmRDaGlsZChwYXJlbnRDb250 YWluZXIsICpjaGlsZExheW91dEJveCk7CiAgICAgICAgIGlmIChjaGlsZExheW91dEJveC0+aXNU YWJsZVdyYXBwZXJCb3goKSkKICAgICAgICAgICAgIGJ1aWxkVGFibGVTdHJ1Y3R1cmUoZG93bmNh c3Q8UmVuZGVyVGFibGU+KGNoaWxkUmVuZGVyZXIpLCBkb3duY2FzdDxDb250YWluZXI+KCpjaGls ZExheW91dEJveCkpOwogICAgICAgICBlbHNlIGlmIChpczxDb250YWluZXI+KCpjaGlsZExheW91 dEJveCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlv dXRUcmVlQnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0 VHJlZUJ1aWxkZXIuaAppbmRleCAyOTc2MTc0YzdiYi4uNzRjNDU1MzA3NDQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuaApA QCAtNzYsMTUgKzc2LDE1IEBAIHByaXZhdGU6CiBjbGFzcyBUcmVlQnVpbGRlciB7CiBwdWJsaWM6 CiAgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxMYXlvdXQ6OkxheW91dFRyZWVDb250ZW50PiBi dWlsZExheW91dFRyZWUoY29uc3QgUmVuZGVyVmlldyYpOwotICAgIHN0YXRpYyBzdGQ6OnVuaXF1 ZV9wdHI8TGF5b3V0OjpMYXlvdXRUcmVlQ29udGVudD4gYnVpbGRMYXlvdXRUcmVlKGNvbnN0IFJl bmRlckJsb2NrRmxvdyYpOworICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8TGF5b3V0OjpMYXlv dXRUcmVlQ29udGVudD4gYnVpbGRMYXlvdXRUcmVlRm9ySW50ZWdyYXRpb24oY29uc3QgUmVuZGVy QmxvY2tGbG93Jik7CiAKIHByaXZhdGU6CiAgICAgVHJlZUJ1aWxkZXIoTGF5b3V0VHJlZUNvbnRl bnQmKTsKIAogICAgIHZvaWQgYnVpbGRUcmVlKCk7Ci0gICAgdm9pZCBidWlsZFN1YlRyZWUoY29u c3QgUmVuZGVyRWxlbWVudCYgcm9vdFJlbmRlcmVyLCBDb250YWluZXImIHJvb3RDb250YWluZXIp OworICAgIHZvaWQgYnVpbGRTdWJUcmVlKGNvbnN0IFJlbmRlckVsZW1lbnQmIHBhcmVudFJlbmRl cmVyLCBDb250YWluZXImIHBhcmVudENvbnRhaW5lcik7CiAgICAgdm9pZCBidWlsZFRhYmxlU3Ry dWN0dXJlKGNvbnN0IFJlbmRlclRhYmxlJiB0YWJsZVJlbmRlcmVyLCBDb250YWluZXImIHRhYmxl V3JhcHBlckJveCk7Ci0gICAgc3RkOjp1bmlxdWVfcHRyPEJveD4gY3JlYXRlTGF5b3V0Qm94KGNv bnN0IFJlbmRlckVsZW1lbnQmIHBhcmVudFJlbmRlcmVyLCBjb25zdCBSZW5kZXJPYmplY3QmIGNo aWxkUmVuZGVyZXIpOworICAgIHN0ZDo6dW5pcXVlX3B0cjxCb3g+IGNyZWF0ZUxheW91dEJveChj b25zdCBDb250YWluZXImIHBhcmVudENvbnRhaW5lciwgY29uc3QgUmVuZGVyT2JqZWN0JiBjaGls ZFJlbmRlcmVyKTsKIAogICAgIExheW91dFRyZWVDb250ZW50JiBtX2xheW91dFRyZWVDb250ZW50 OwogfTsK