205345 2019-12-17 10:12:00 -0800 [LFC][Painting] Add basic support for z-index based painting 2019-12-17 10:31:36 -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 1599453 0 zalan 2019-12-17 10:12:00 -0800 to be able to run WPT where z-index is heavily used for hiding/revealing content. 1599454 1 webkit-bug-importer 2019-12-17 10:12:23 -0800 <rdar://problem/58010942> 1599456 2 385899 zalan 2019-12-17 10:22:06 -0800 Created attachment 385899 Patch 1599457 3 zalan 2019-12-17 10:31:36 -0800 Committed r253631: <https://trac.webkit.org/changeset/253631> 385899 2019-12-17 10:22:06 -0800 2019-12-17 10:27:04 -0800 Patch bug-205345-20191217102205.patch text/plain 9668 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjhjNTRhMmM0MWIzZDE4 ZDUzYmM3NzNkYjY3ZWYxOTk5MzU3MDBiNS4uMThkZDE1MWMyMGFhY2IyNzA0MjlkZTAwMjVmNTU1 ZDdkNWUwNjY3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE5LTEyLTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bUGFpbnRpbmddIEFk ZCBiYXNpYyBzdXBwb3J0IGZvciB6LWluZGV4IGJhc2VkIHBhaW50aW5nCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDUzNDUKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzU4MDEwOTQyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgaXMganVzdCBhIHZlcnkgc2ltcGxlIHotaW5kZXggYmFzZWQgcGFp bnRpbmcgdG8gYmUgYWJsZSB0byBydW4gV1BUIHdoZXJlCisgICAgICAgIHotaW5kZXggaXMgaGVh dmlseSB1c2VkIHRvIGhpZGUvcmV2ZWFsIHJlZC9ncmVlbiBib3hlcy4KKworICAgICAgICAqIGxh eW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5UGFpbnRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpE aXNwbGF5OjphYnNvbHV0ZURpc3BsYXlCb3gpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6 aXNQYWludFJvb3RDYW5kaWRhdGUpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6cGFpbnRT dWJ0cmVlKToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OmNvbGxlY3RQYWludFJvb3RzQW5k Q29udGVudFJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6UGFpbnRlcjo6cGFpbnQp OgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6cGFpbnRCb3hEZWNvcmF0aW9uQW5kQ2hpbGRy ZW4pOiBEZWxldGVkLgorCiAyMDE5LTEyLTE2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBGaXggaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXRleHQvbGluZS1icmVhay9saW5lLWJyZWFrLWFueXdoZXJlLTAwNC5odG1s CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheVBh aW50ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlQYWlu dGVyLmNwcAppbmRleCA0YjhlZjY4NWM0MTUwZDFhMzU3YTBlMWY0NzkyOTU2M2I1MjU3NzI2Li42 YTc3NDg3MGEwMzdhNWQ1NWQ0ZWJjYmM0MTRlMzM2ZmE0OWEwN2U2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheVBhaW50ZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5UGFpbnRlci5jcHAKQEAgLTE0 Niw2ICsxNDYsOCBAQCBzdGF0aWMgQm94IGFic29sdXRlRGlzcGxheUJveChjb25zdCBMYXlvdXQ6 OkxheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgY29uc3QgTGF5bwogICAgIC8vIFNob3VsZCBuZXZl ciByZWFsbHkgaGFwcGVuIGJ1dCB0YWJsZSBjb2RlIGlzIHdheSB0b28gaW5jb21wbGV0ZS4KICAg ICBpZiAoIWxheW91dFN0YXRlLmhhc0Rpc3BsYXlCb3gobGF5b3V0Qm94KSkKICAgICAgICAgcmV0 dXJuIHsgfTsKKyAgICBpZiAobGF5b3V0Qm94LmlzSW5pdGlhbENvbnRhaW5pbmdCbG9jaygpKQor ICAgICAgICByZXR1cm4gbGF5b3V0U3RhdGUuZGlzcGxheUJveEZvckxheW91dEJveChsYXlvdXRC b3gpOwogCiAgICAgYXV0byBhYnNvbHV0ZUJveCA9IEJveCB7IGxheW91dFN0YXRlLmRpc3BsYXlC b3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KSB9OwogICAgIGZvciAoYXV0byogY29udGFpbmVyID0g bGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpOyBjb250YWluZXIgIT0gJmxheW91dEJveC5pbml0 aWFsQ29udGFpbmluZ0Jsb2NrKCk7IGNvbnRhaW5lciA9IGNvbnRhaW5lci0+Y29udGFpbmluZ0Js b2NrKCkpCkBAIC0xNTMsNTAgKzE1NSwxMzIgQEAgc3RhdGljIEJveCBhYnNvbHV0ZURpc3BsYXlC b3goY29uc3QgTGF5b3V0OjpMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGNvbnN0IExheW8KICAg ICByZXR1cm4gYWJzb2x1dGVCb3g7CiB9CiAKLXN0YXRpYyB2b2lkIHBhaW50Qm94RGVjb3JhdGlv bkFuZENoaWxkcmVuKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgTGF5b3V0OjpMYXlv dXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGNvbnN0IExheW91dDo6Qm94JiBsYXlvdXRCb3gsIGNvbnN0 IEludFJlY3QmIGRpcnR5UmVjdCkKK3N0YXRpYyBib29sIGlzUGFpbnRSb290Q2FuZGlkYXRlKGNv bnN0IExheW91dDo6Qm94JiBsYXlvdXRCb3gpCiB7Ci0gICAgaWYgKCFsYXlvdXRCb3guaXNBbm9u eW1vdXMoKSkgeworICAgIHJldHVybiBsYXlvdXRCb3guaXNQb3NpdGlvbmVkKCk7Cit9CisKK3Vz aW5nIExheW91dEJveExpc3QgPSBWZWN0b3I8Y29uc3QgTGF5b3V0OjpCb3gqPjsKKworZW51bSBQ YWludFBoYXNlIHsgRGVjb3JhdGlvbiwgQ29udGVudCB9Oworc3RhdGljIHZvaWQgcGFpbnRTdWJ0 cmVlKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgTGF5b3V0OjpMYXlvdXRTdGF0ZSYg bGF5b3V0U3RhdGUsIGNvbnN0IExheW91dDo6Qm94JiBwYWludFJvb3RCb3gsIGNvbnN0IEludFJl Y3QmIGRpcnR5UmVjdCwgUGFpbnRQaGFzZSBwYWludFBoYXNlKQoreworICAgIGF1dG8gcGFpbnQg PSBbJl0gKGF1dG8mIGxheW91dEJveCkgeworICAgICAgICBpZiAobGF5b3V0Qm94LnN0eWxlKCku dmlzaWJpbGl0eSgpICE9IFZpc2liaWxpdHk6OlZpc2libGUpCisgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIGF1dG8gYWJzb2x1dGVEaXNwbGF5Qm94ID0gRGlzcGxheTo6YWJzb2x1dGVEaXNw bGF5Qm94KGxheW91dFN0YXRlLCBsYXlvdXRCb3gpOwotICAgICAgICBpZiAoZGlydHlSZWN0Lmlu dGVyc2VjdHMoc25hcHBlZEludFJlY3QoYWJzb2x1dGVEaXNwbGF5Qm94LnJlY3QoKSkpKQorICAg ICAgICBpZiAoIWRpcnR5UmVjdC5pbnRlcnNlY3RzKHNuYXBwZWRJbnRSZWN0KGFic29sdXRlRGlz cGxheUJveC5yZWN0KCkpKSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBpZiAocGFp bnRQaGFzZSA9PSBQYWludFBoYXNlOjpEZWNvcmF0aW9uKSB7CisgICAgICAgICAgICBpZiAobGF5 b3V0Qm94LmlzQW5vbnltb3VzKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAg ICAgcGFpbnRCb3hEZWNvcmF0aW9uKGNvbnRleHQsIGFic29sdXRlRGlzcGxheUJveCwgbGF5b3V0 Qm94LnN0eWxlKCksIGxheW91dEJveC5pc0JvZHlCb3goKSk7Ci0gICAgfQorICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB9CisgICAgICAgIC8vIE9ubHkgaW5saW5lIGNvbnRlbnQgZm9yIG5v dy4KKyAgICAgICAgaWYgKGxheW91dEJveC5lc3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250 ZXh0KCkpIHsKKyAgICAgICAgICAgIGF1dG8mIGNvbnRhaW5lciA9IGRvd25jYXN0PExheW91dDo6 Q29udGFpbmVyPihsYXlvdXRCb3gpOworICAgICAgICAgICAgcGFpbnRJbmxpbmVDb250ZW50KGNv bnRleHQsIGFic29sdXRlRGlzcGxheUJveC50b3BMZWZ0KCksIGRvd25jYXN0PExheW91dDo6SW5s aW5lRm9ybWF0dGluZ1N0YXRlPihsYXlvdXRTdGF0ZS5lc3RhYmxpc2hlZEZvcm1hdHRpbmdTdGF0 ZShjb250YWluZXIpKSk7CisgICAgICAgIH0KKyAgICB9OwogCi0gICAgaWYgKCFpczxMYXlvdXQ6 OkNvbnRhaW5lcj4obGF5b3V0Qm94KSkKKyAgICBwYWludChwYWludFJvb3RCb3gpOworICAgIGlm ICghaXM8TGF5b3V0OjpDb250YWluZXI+KHBhaW50Um9vdEJveCkgfHwgIWRvd25jYXN0PExheW91 dDo6Q29udGFpbmVyPihwYWludFJvb3RCb3gpLmhhc0NoaWxkKCkpCiAgICAgICAgIHJldHVybjsK LSAgICBmb3IgKGF1dG8mIGNoaWxkTGF5b3V0Qm94IDogTGF5b3V0OjpjaGlsZHJlbk9mVHlwZTxM YXlvdXQ6OkJveD4oZG93bmNhc3Q8TGF5b3V0OjpDb250YWluZXI+KGxheW91dEJveCkpKSB7Ci0g ICAgICAgIGlmIChjaGlsZExheW91dEJveC5zdHlsZSgpLnZpc2liaWxpdHkoKSAhPSBWaXNpYmls aXR5OjpWaXNpYmxlKQotICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIHBhaW50Qm94RGVj b3JhdGlvbkFuZENoaWxkcmVuKGNvbnRleHQsIGxheW91dFN0YXRlLCBjaGlsZExheW91dEJveCwg ZGlydHlSZWN0KTsKKworICAgIExheW91dEJveExpc3QgbGF5b3V0Qm94TGlzdDsKKyAgICBsYXlv dXRCb3hMaXN0LmFwcGVuZChkb3duY2FzdDxMYXlvdXQ6OkNvbnRhaW5lcj4ocGFpbnRSb290Qm94 KS5maXJzdENoaWxkKCkpOworICAgIHdoaWxlICghbGF5b3V0Qm94TGlzdC5pc0VtcHR5KCkpIHsK KyAgICAgICAgd2hpbGUgKHRydWUpIHsKKyAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9ICps YXlvdXRCb3hMaXN0Lmxhc3QoKTsKKyAgICAgICAgICAgIGlmIChpc1BhaW50Um9vdENhbmRpZGF0 ZShsYXlvdXRCb3gpKQorICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgcGFpbnQo bGF5b3V0Qm94KTsKKyAgICAgICAgICAgIGlmICghaXM8TGF5b3V0OjpDb250YWluZXI+KGxheW91 dEJveCkgfHwgIWRvd25jYXN0PExheW91dDo6Q29udGFpbmVyPihsYXlvdXRCb3gpLmhhc0NoaWxk KCkpCisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBsYXlvdXRCb3hMaXN0LmFw cGVuZChkb3duY2FzdDxMYXlvdXQ6OkNvbnRhaW5lcj4obGF5b3V0Qm94KS5maXJzdENoaWxkKCkp OworICAgICAgICB9CisgICAgICAgIHdoaWxlICghbGF5b3V0Qm94TGlzdC5pc0VtcHR5KCkpIHsK KyAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9ICpsYXlvdXRCb3hMaXN0LnRha2VMYXN0KCk7 CisgICAgICAgICAgICAvLyBTdGF5IHdpdGhpbi4KKyAgICAgICAgICAgIGlmICgmbGF5b3V0Qm94 ID09ICZwYWludFJvb3RCb3gpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAg aWYgKGF1dG8qIG5leHRTaWJsaW5nID0gbGF5b3V0Qm94Lm5leHRTaWJsaW5nKCkpIHsKKyAgICAg ICAgICAgICAgICBsYXlvdXRCb3hMaXN0LmFwcGVuZChuZXh0U2libGluZyk7CisgICAgICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9Cit9CisKK3N0YXRp YyBMYXlvdXRSZWN0IGNvbGxlY3RQYWludFJvb3RzQW5kQ29udGVudFJlY3QoY29uc3QgTGF5b3V0 OjpMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGNvbnN0IExheW91dDo6Qm94JiByb290TGF5b3V0 Qm94LCBMYXlvdXRCb3hMaXN0JiBwb3NpdGl2ZVpPcmRlckxpc3QsIExheW91dEJveExpc3QmIG5l Z2F0aXZlWk9yZGVyTGlzdCkKK3sKKyAgICBhdXRvIGFwcGVuZFBhaW50Um9vdCA9IFsmXSAoY29u c3QgYXV0byYgbGF5b3V0Qm94KSB7CisgICAgICAgIGlmIChsYXlvdXRCb3guc3R5bGUoKS51c2Vk WkluZGV4KCkgPCAwKSB7CisgICAgICAgICAgICBuZWdhdGl2ZVpPcmRlckxpc3QuYXBwZW5kKCZs YXlvdXRCb3gpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIHBvc2l0 aXZlWk9yZGVyTGlzdC5hcHBlbmQoJmxheW91dEJveCk7CisgICAgfTsKKworICAgIGF1dG8gY29u dGVudFJlY3QgPSBMYXlvdXRSZWN0IHsgbGF5b3V0U3RhdGUuZGlzcGxheUJveEZvckxheW91dEJv eChyb290TGF5b3V0Qm94KS5yZWN0KCkgfTsKKworICAgIC8vIEluaXRpYWwgQkZDIGlzIGFsd2F5 cyBhIHBhaW50IHJvb3QuCisgICAgYXBwZW5kUGFpbnRSb290KHJvb3RMYXlvdXRCb3gpOworICAg IExheW91dEJveExpc3QgbGF5b3V0Qm94TGlzdDsKKyAgICBsYXlvdXRCb3hMaXN0LmFwcGVuZCgm cm9vdExheW91dEJveCk7CisgICAgd2hpbGUgKCFsYXlvdXRCb3hMaXN0LmlzRW1wdHkoKSkgewor ICAgICAgICB3aGlsZSAodHJ1ZSkgeworICAgICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gKmxh eW91dEJveExpc3QubGFzdCgpOworICAgICAgICAgICAgaWYgKGxheW91dEJveC5zdHlsZSgpLnZp c2liaWxpdHkoKSAhPSBWaXNpYmlsaXR5OjpWaXNpYmxlKQorICAgICAgICAgICAgICAgIGJyZWFr OworICAgICAgICAgICAgaWYgKGlzUGFpbnRSb290Q2FuZGlkYXRlKGxheW91dEJveCkpCisgICAg ICAgICAgICAgICAgYXBwZW5kUGFpbnRSb290KGxheW91dEJveCk7CisgICAgICAgICAgICBjb250 ZW50UmVjdC51bml0ZUlmTm9uWmVybyhEaXNwbGF5OjphYnNvbHV0ZURpc3BsYXlCb3gobGF5b3V0 U3RhdGUsIGxheW91dEJveCkucmVjdCgpKTsKKyAgICAgICAgICAgIGlmICghaXM8TGF5b3V0OjpD b250YWluZXI+KGxheW91dEJveCkgfHwgIWRvd25jYXN0PExheW91dDo6Q29udGFpbmVyPihsYXlv dXRCb3gpLmhhc0NoaWxkKCkpCisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBs YXlvdXRCb3hMaXN0LmFwcGVuZChkb3duY2FzdDxMYXlvdXQ6OkNvbnRhaW5lcj4obGF5b3V0Qm94 KS5maXJzdENoaWxkKCkpOworICAgICAgICB9CisgICAgICAgIHdoaWxlICghbGF5b3V0Qm94TGlz dC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9ICpsYXlvdXRCb3hM aXN0LnRha2VMYXN0KCk7CisgICAgICAgICAgICBpZiAoYXV0byogbmV4dFNpYmxpbmcgPSBsYXlv dXRCb3gubmV4dFNpYmxpbmcoKSkgeworICAgICAgICAgICAgICAgIGxheW91dEJveExpc3QuYXBw ZW5kKG5leHRTaWJsaW5nKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0K KyAgICAgICAgfQogICAgIH0KKworICAgIGF1dG8gY29tcGFyZVpJbmRleCA9IFtdIChjb25zdCBM YXlvdXQ6OkJveCogYSwgY29uc3QgTGF5b3V0OjpCb3gqIGIpIHsKKyAgICAgICAgcmV0dXJuIGEt PnN0eWxlKCkudXNlZFpJbmRleCgpIDwgYi0+c3R5bGUoKS51c2VkWkluZGV4KCk7CisgICAgfTsK KworICAgIHN0ZDo6c3RhYmxlX3NvcnQocG9zaXRpdmVaT3JkZXJMaXN0LmJlZ2luKCksIHBvc2l0 aXZlWk9yZGVyTGlzdC5lbmQoKSwgY29tcGFyZVpJbmRleCk7CisgICAgc3RkOjpzdGFibGVfc29y dChuZWdhdGl2ZVpPcmRlckxpc3QuYmVnaW4oKSwgbmVnYXRpdmVaT3JkZXJMaXN0LmVuZCgpLCBj b21wYXJlWkluZGV4KTsKKyAgICByZXR1cm4gY29udGVudFJlY3Q7CiB9CiAKIHZvaWQgUGFpbnRl cjo6cGFpbnQoY29uc3QgTGF5b3V0OjpMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIEdyYXBoaWNz Q29udGV4dCYgY29udGV4dCwgY29uc3QgSW50UmVjdCYgZGlydHlSZWN0KQogewotICAgIGF1dG8m IGxheW91dFJvb3QgPSBsYXlvdXRTdGF0ZS5yb290KCk7Ci0gICAgaWYgKCFsYXlvdXRSb290LmZp cnN0Q2hpbGQoKSkKKyAgICBhdXRvJiByb290TGF5b3V0Qm94ID0gbGF5b3V0U3RhdGUucm9vdCgp OworICAgIGlmICghcm9vdExheW91dEJveC5maXJzdENoaWxkKCkpCiAgICAgICAgIHJldHVybjsK KworICAgIFZlY3Rvcjxjb25zdCBMYXlvdXQ6OkJveCo+IG5lZ2F0aXZlWk9yZGVyTGlzdDsKKyAg ICBWZWN0b3I8Y29uc3QgTGF5b3V0OjpCb3gqPiBwb3NpdGl2ZVpPcmRlckxpc3Q7CisgICAgYXV0 byBjb250ZW50UmVjdCA9IGNvbGxlY3RQYWludFJvb3RzQW5kQ29udGVudFJlY3QobGF5b3V0U3Rh dGUsIHJvb3RMYXlvdXRCb3gsIHBvc2l0aXZlWk9yZGVyTGlzdCwgbmVnYXRpdmVaT3JkZXJMaXN0 KTsKKwogICAgIC8vIEZpbGwgdGhlIGVudGlyZSBjb250ZW50IGFyZWEuCi0gICAgYXV0byByb290 UmVjdCA9IExheW91dFJlY3QgeyBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGxh eW91dFJvb3QpLnJlY3QoKSB9OwotICAgIGZvciAoYXV0byYgbGF5b3V0Qm94IDogTGF5b3V0Ojpk ZXNjZW5kYW50c09mVHlwZTxMYXlvdXQ6OkJveD4obGF5b3V0Um9vdCkpCi0gICAgICAgIHJvb3RS ZWN0LnVuaXRlSWZOb25aZXJvKERpc3BsYXk6OmFic29sdXRlRGlzcGxheUJveChsYXlvdXRTdGF0 ZSwgbGF5b3V0Qm94KS5yZWN0KCkpOwotICAgIGNvbnRleHQuZmlsbFJlY3Qocm9vdFJlY3QsIENv bG9yOjp3aGl0ZSk7CisgICAgY29udGV4dC5maWxsUmVjdChjb250ZW50UmVjdCwgQ29sb3I6Ondo aXRlKTsKIAotICAgIC8vIDEuIFBhaW50IGJveCBkZWNvcmF0aW9uIChib3RoIGJsb2NrIGFuZCBp bmxpbmUpLgotICAgIHBhaW50Qm94RGVjb3JhdGlvbkFuZENoaWxkcmVuKGNvbnRleHQsIGxheW91 dFN0YXRlLCAqbGF5b3V0Um9vdC5maXJzdENoaWxkKCksIGRpcnR5UmVjdCk7CisgICAgZm9yIChh dXRvJiBwYWludFJvb3RCb3ggOiBuZWdhdGl2ZVpPcmRlckxpc3QpIHsKKyAgICAgICAgcGFpbnRT dWJ0cmVlKGNvbnRleHQsIGxheW91dFN0YXRlLCAqcGFpbnRSb290Qm94LCBkaXJ0eVJlY3QsIFBh aW50UGhhc2U6OkRlY29yYXRpb24pOworICAgICAgICBwYWludFN1YnRyZWUoY29udGV4dCwgbGF5 b3V0U3RhdGUsICpwYWludFJvb3RCb3gsIGRpcnR5UmVjdCwgUGFpbnRQaGFzZTo6Q29udGVudCk7 CisgICAgfQogCi0gICAgLy8gMi4gUGFpbnQgY29udGVudAotICAgIGZvciAoYXV0byYgbGF5b3V0 Qm94IDogTGF5b3V0OjpkZXNjZW5kYW50c09mVHlwZTxMYXlvdXQ6OkJveD4obGF5b3V0Um9vdCkp IHsKLSAgICAgICAgYXV0byBhYnNvbHV0ZURpc3BsYXlCb3ggPSBEaXNwbGF5OjphYnNvbHV0ZURp c3BsYXlCb3gobGF5b3V0U3RhdGUsIGxheW91dEJveCk7Ci0gICAgICAgIC8vIEZJWE1FOiBUaGlz IGlzIHRoZSBiZXN0IHdlIGNhbiBkbyB3aXRoIG5vIGxheW91dCBvdmVyZmxvdyBzdXBwb3J0Lgot ICAgICAgICBpZiAoIWRpcnR5UmVjdC5pbnRlcnNlY3RzKHNuYXBwZWRJbnRSZWN0KGFic29sdXRl RGlzcGxheUJveC5yZWN0KCkpKSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBpZiAo bGF5b3V0Qm94LnN0eWxlKCkudmlzaWJpbGl0eSgpICE9IFZpc2liaWxpdHk6OlZpc2libGUpCi0g ICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgaWYgKGxheW91dEJveC5lc3RhYmxpc2hlc0lu bGluZUZvcm1hdHRpbmdDb250ZXh0KCkpIHsKLSAgICAgICAgICAgIGF1dG8mIGNvbnRhaW5lciA9 IGRvd25jYXN0PExheW91dDo6Q29udGFpbmVyPihsYXlvdXRCb3gpOwotICAgICAgICAgICAgcGFp bnRJbmxpbmVDb250ZW50KGNvbnRleHQsIGFic29sdXRlRGlzcGxheUJveC50b3BMZWZ0KCksIGRv d25jYXN0PExheW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXRlPihsYXlvdXRTdGF0ZS5lc3RhYmxp c2hlZEZvcm1hdHRpbmdTdGF0ZShjb250YWluZXIpKSk7Ci0gICAgICAgICAgICBjb250aW51ZTsK LSAgICAgICAgfQorICAgIGZvciAoYXV0byYgcGFpbnRSb290Qm94IDogcG9zaXRpdmVaT3JkZXJM aXN0KSB7CisgICAgICAgIHBhaW50U3VidHJlZShjb250ZXh0LCBsYXlvdXRTdGF0ZSwgKnBhaW50 Um9vdEJveCwgZGlydHlSZWN0LCBQYWludFBoYXNlOjpEZWNvcmF0aW9uKTsKKyAgICAgICAgcGFp bnRTdWJ0cmVlKGNvbnRleHQsIGxheW91dFN0YXRlLCAqcGFpbnRSb290Qm94LCBkaXJ0eVJlY3Qs IFBhaW50UGhhc2U6OkNvbnRlbnQpOwogICAgIH0KIH0KIAo=