218947 2020-11-14 14:35:52 -0800 [LFC Display] Implement propagation background style from body to root 2020-11-14 20:35:16 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1707544 0 simon.fraser 2020-11-14 14:35:52 -0800 [LFC Display] Implement propagation background style from body to root 1707545 1 414144 simon.fraser 2020-11-14 14:40:06 -0800 Created attachment 414144 Patch 1707554 2 ews-feeder 2020-11-14 17:38:34 -0800 Committed r269822: <https://trac.webkit.org/changeset/269822> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414144. 1707555 3 webkit-bug-importer 2020-11-14 17:39:16 -0800 <rdar://problem/71406676> 414144 2020-11-14 14:40:06 -0800 2020-11-14 17:38:35 -0800 Patch bug-218947-20201114144005.patch text/plain 21247 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5ODE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWExNGU0ZTc1OGIwOGE1 MDllZGEyZjBkYjExMjM3ZTZhNTljOWY2Ny4uMWZkOTFmYTA1NzI0MWY4YTYyYzU5Y2IzMjA2NzEy Y2ExMzBhZjM4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDIwLTExLTE0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtMRkMgRGlzcGxh eV0gSW1wbGVtZW50IHByb3BhZ2F0aW9uIGJhY2tncm91bmQgc3R5bGUgZnJvbSBib2R5IHRvIHJv b3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODk0 NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBy b290IGRpc3BsYXkgYm94IG5lZWRzIHRvIGdldCBpdHMgYmFja2dyb3VuZCBzdHlsZSBmcm9tIHRo ZSBkb2N1bWVudCBlbGVtZW50IGJveCwKKyAgICAgICAgaWYgaXQgaGFzIG9uZSwgb3RoZXJ3aXNl IHRoZSBib2R5IGJveC4gSWYgdGhlIGJvZHkgYmFja2dyb3VuZCBzdHlsZSBpcyBwcm9wYWdhdGVk CisgICAgICAgIHRvIHRoZSByb290LCB0aGVuIHRoZSBib2R5IGJveCBuZWVkcyB0byBub3QgcGFp bnQgaXRzIGJhY2tncm91bmQuCisKKyAgICAgICAgSW1wbGVtZW50IGJ5IGFkZGluZyBCb3hGYWN0 b3J5OjpkZXRlcm1pbmVSb290QmFja2dyb3VuZFByb3BhZ2F0aW9uKCksIGFuZCBjb25zdWx0aW5n CisgICAgICAgIHRoZSByZXN1bHQgd2hlbiBjcmVhdGluZyB0aGUgZGlzcGxheSBib3hlcyBmb3Ig dGhlIHJvb3QgYW5kIGJvZHkuIFRoaXMgaXMgY29tcGxpY2F0ZWQKKyAgICAgICAgc2xpZ2h0bHkg YnkgdGhlIG5lZWQgdG8gcGFzcyB0aGUgY29ycmVjdCBzdHlsZSB0byBjb25zdHJ1Y3RCb3hEZWNv cmF0aW9uRGF0YSgpLAorICAgICAgICB3aGljaCBkZWFscyB3aXRoIGJvdGggYmFja2dyb3VuZHMg YW5kIG90aGVyIChub24tcHJvcGFnYXRpbmcpIHByb3BlcnRpZXMuCisKKyAgICAgICAgKiBkaXNw bGF5L0Rpc3BsYXlUcmVlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpU cmVlQnVpbGRlcjo6YnVpbGQpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6VHJlZUJ1aWxk ZXI6OnJlY3Vyc2l2ZUJ1aWxkRGlzcGxheVRyZWUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 RGlzcGxheTo6VHJlZUJ1aWxkZXI6OmJ1aWxkIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBk aXNwbGF5L0Rpc3BsYXlUcmVlQnVpbGRlci5oOgorICAgICAgICAqIGRpc3BsYXkvY3NzL0Rpc3Bs YXlCb3hGYWN0b3J5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveEZhY3Rvcnk6 OmRldGVybWluZVJvb3RCYWNrZ3JvdW5kUHJvcGFnYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6 RGlzcGxheTo6Qm94RmFjdG9yeTo6ZGlzcGxheUJveEZvclJvb3RCb3ggY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6RGlzcGxheTo6Qm94RmFjdG9yeTo6ZGlzcGxheUJveEZvckJvZHlCb3ggY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6Qm94RmFjdG9yeTo6ZGlzcGxheUJveEZv ckxheW91dEJveCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpCb3hGYWN0b3J5 Ojpjb25zdHJ1Y3RCb3hEZWNvcmF0aW9uRGF0YSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpE aXNwbGF5OjpCb3hGYWN0b3J5OjpzZXR1cEJveE1vZGVsQm94IGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OkRpc3BsYXk6OkJveEZhY3Rvcnk6OmRvY3VtZW50RWxlbWVudEJveEZyb21Sb290Qm94 KToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveEZhY3Rvcnk6OmJvZHlCb3hGcm9tUm9v dEJveCk6CisgICAgICAgICogZGlzcGxheS9jc3MvRGlzcGxheUJveEZhY3RvcnkuaDoKKyAgICAg ICAgKiBkaXNwbGF5L2Nzcy9EaXNwbGF5RmlsbExheWVySW1hZ2VHZW9tZXRyeS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpEaXNwbGF5OjpjYWxjdWxhdGVGaWxsTGF5ZXJJbWFnZUdlb21ldHJ5KToK KyAgICAgICAgKiBkaXNwbGF5L2Nzcy9EaXNwbGF5RmlsbExheWVySW1hZ2VHZW9tZXRyeS5oOgor ICAgICAgICAqIGRpc3BsYXkvY3NzL0Rpc3BsYXlTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpEaXNwbGF5OjpTdHlsZTo6U3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6U3R5 bGU6OnNldHVwQmFja2dyb3VuZCk6CisgICAgICAgICogZGlzcGxheS9jc3MvRGlzcGxheVN0eWxl Lmg6CisKIDIwMjAtMTEtMTQgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0gVXNlIHRoZSBwaHlzaWNhbCBzaXplIHdoZW4gc2V0dGlu ZyB0aGUgcHJlLWNvbXB1dGVkIHdpZHRoL2hlaWdodCBvbiBSZXBsYWNlZEJveApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9EaXNwbGF5VHJlZUJ1aWxkZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvZGlzcGxheS9EaXNwbGF5VHJlZUJ1aWxkZXIuY3BwCmluZGV4IGUxYTUzY2U5ZjBj YTIyZGUyNDhmNDk2NjAxYzk0OWE0YzBkNmQxOTYuLmYyNjg1YWY5ZDM4NmQwNWM1MGNiNmIwNWI5 YTM0Zjg1MTYyZTIyNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvRGlzcGxh eVRyZWVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L0Rpc3BsYXlUcmVl QnVpbGRlci5jcHAKQEAgLTUxLDcgKzUxLDcgQEAgVHJlZUJ1aWxkZXI6OlRyZWVCdWlsZGVyKGZs b2F0IHBpeGVsU25hcHBpbmdGYWN0b3IpCiB7CiB9CiAKLXN0ZDo6dW5pcXVlX3B0cjxUcmVlPiBU cmVlQnVpbGRlcjo6YnVpbGQoY29uc3QgTGF5b3V0OjpMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUp IGNvbnN0CitzdGQ6OnVuaXF1ZV9wdHI8VHJlZT4gVHJlZUJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExh eW91dDo6TGF5b3V0U3RhdGUmIGxheW91dFN0YXRlKQogewogICAgIEFTU0VSVChsYXlvdXRTdGF0 ZS5oYXNSb290KCkpOwogCkBAIC02MSw4ICs2MSwxMCBAQCBzdGQ6OnVuaXF1ZV9wdHI8VHJlZT4g VHJlZUJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExheW91dDo6TGF5b3V0U3RhdGUmIGxheW91dFN0YXRl KQogICAgIExPR19XSVRIX1NUUkVBTShGb3JtYXR0aW5nQ29udGV4dExheW91dCwgc3RyZWFtIDw8 ICJCdWlsZGluZyBkaXNwbGF5IHRyZWUgZm9yOlxuIiA8PCBsYXlvdXRUcmVlQXNUZXh0KHJvb3RM YXlvdXRCb3gsICZsYXlvdXRTdGF0ZSkpOwogI2VuZGlmCiAKKyAgICBtX3Jvb3RCYWNrZ3JvdW5k UHJvcGdhdGlvbiA9IEJveEZhY3Rvcnk6OmRldGVybWluZVJvb3RCYWNrZ3JvdW5kUHJvcGFnYXRp b24ocm9vdExheW91dEJveCk7CisKICAgICBhdXRvIGdlb21ldHJ5ID0gbGF5b3V0U3RhdGUuZ2Vv bWV0cnlGb3JCb3gocm9vdExheW91dEJveCk7Ci0gICAgYXV0byByb290RGlzcGxheUJveCA9IG1f Ym94RmFjdG9yeS5kaXNwbGF5Qm94Rm9yUm9vdEJveChyb290TGF5b3V0Qm94LCBnZW9tZXRyeSk7 CisgICAgYXV0byByb290RGlzcGxheUJveCA9IG1fYm94RmFjdG9yeS5kaXNwbGF5Qm94Rm9yUm9v dEJveChyb290TGF5b3V0Qm94LCBnZW9tZXRyeSwgbV9yb290QmFja2dyb3VuZFByb3BnYXRpb24p OwogICAgIGF1dG8gcm9vdERpc3BsYXlDb250YWluZXJCb3ggPSBzdGQ6OnVuaXF1ZV9wdHI8Q29u dGFpbmVyQm94PiB7IGRvd25jYXN0PENvbnRhaW5lckJveD4ocm9vdERpc3BsYXlCb3gucmVsZWFz ZSgpKSB9OwogCiAgICAgaWYgKCFyb290TGF5b3V0Qm94LmZpcnN0Q2hpbGQoKSkKQEAgLTExOSw3 ICsxMjEsMTIgQEAgdm9pZCBUcmVlQnVpbGRlcjo6YnVpbGRJbmxpbmVEaXNwbGF5VHJlZShjb25z dCBMYXlvdXQ6OkxheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwKIHZvaWQgVHJlZUJ1aWxkZXI6OnJl Y3Vyc2l2ZUJ1aWxkRGlzcGxheVRyZWUoY29uc3QgTGF5b3V0OjpMYXlvdXRTdGF0ZSYgbGF5b3V0 U3RhdGUsIExheW91dFNpemUgb2Zmc2V0RnJvbVJvb3QsIGNvbnN0IExheW91dDo6Qm94JiBsYXlv dXRCb3gsIEluc2VydGlvblBvc2l0aW9uJiBpbnNlcnRpb25Qb3NpdGlvbikgY29uc3QKIHsKICAg ICBhdXRvIGdlb21ldHJ5ID0gbGF5b3V0U3RhdGUuZ2VvbWV0cnlGb3JCb3gobGF5b3V0Qm94KTsK LSAgICBhdXRvIGRpc3BsYXlCb3ggPSBtX2JveEZhY3RvcnkuZGlzcGxheUJveEZvckxheW91dEJv eChsYXlvdXRCb3gsIGdlb21ldHJ5LCBvZmZzZXRGcm9tUm9vdCk7CisgICAgc3RkOjp1bmlxdWVf cHRyPEJveD4gZGlzcGxheUJveDsKKyAgICAKKyAgICBpZiAobGF5b3V0Qm94LmlzQm9keUJveCgp KQorICAgICAgICBkaXNwbGF5Qm94ID0gbV9ib3hGYWN0b3J5LmRpc3BsYXlCb3hGb3JCb2R5Qm94 KGxheW91dEJveCwgZ2VvbWV0cnksIG1fcm9vdEJhY2tncm91bmRQcm9wZ2F0aW9uLCBvZmZzZXRG cm9tUm9vdCk7CisgICAgZWxzZQorICAgICAgICBkaXNwbGF5Qm94ID0gbV9ib3hGYWN0b3J5LmRp c3BsYXlCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94LCBnZW9tZXRyeSwgb2Zmc2V0RnJvbVJvb3Qp OwogICAgIAogICAgIGluc2VydChXVEZNb3ZlKGRpc3BsYXlCb3gpLCBpbnNlcnRpb25Qb3NpdGlv bik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvRGlzcGxheVRyZWVCdWls ZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L0Rpc3BsYXlUcmVlQnVpbGRlci5oCmluZGV4 IGMwMzY4ZTk3MGM3NTdlYjBiOGE3ODlkZTdhOGVlYzM2ZjU5MDNmMDQuLjMwMjdlNzU4N2MxMzc2 NzlhYTc4OTRiZjQxNGE5OTk2ZTU2NTllZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rp c3BsYXkvRGlzcGxheVRyZWVCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZGlzcGxheS9E aXNwbGF5VHJlZUJ1aWxkZXIuaApAQCAtNTUsNyArNTUsNyBAQCBjbGFzcyBUcmVlQnVpbGRlciB7 CiBwdWJsaWM6CiAgICAgZXhwbGljaXQgVHJlZUJ1aWxkZXIoZmxvYXQgcGl4ZWxTbmFwcGluZ0Zh Y3Rvcik7CiAKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8VHJlZT4gYnVpbGQoY29uc3QgTGF5b3V0OjpM YXlvdXRTdGF0ZSYpIGNvbnN0OworICAgIHN0ZDo6dW5pcXVlX3B0cjxUcmVlPiBidWlsZChjb25z dCBMYXlvdXQ6OkxheW91dFN0YXRlJik7CiAKIHByaXZhdGU6CiAgICAgc3RydWN0IEluc2VydGlv blBvc2l0aW9uIHsKQEAgLTcwLDYgKzcwLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGluc2VydChz dGQ6OnVuaXF1ZV9wdHI8Qm94PiYmLCBJbnNlcnRpb25Qb3NpdGlvbiYpIGNvbnN0OwogCiAgICAg Qm94RmFjdG9yeSBtX2JveEZhY3Rvcnk7CisgICAgUm9vdEJhY2tncm91bmRQcm9wYWdhdGlvbiBt X3Jvb3RCYWNrZ3JvdW5kUHJvcGdhdGlvbiB7IFJvb3RCYWNrZ3JvdW5kUHJvcGFnYXRpb246Ok5v bmUgfTsKIH07CiAKICNpZiBFTkFCTEUoVFJFRV9ERUJVR0dJTkcpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Qm94RmFjdG9yeS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Qm94RmFjdG9yeS5jcHAKaW5kZXggZmRmNTcwNDVjMjAx OWExYmMyOWFmYjlkYTRjZjE4YTVmM2ZiNDlmNy4uNWIzYzRiNWZmYTk4ZTBlOTM4ZmFkN2UxOTBh MzEwYjVhZmE4ODU4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlz cGxheUJveEZhY3RvcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3Bs YXlCb3hGYWN0b3J5LmNwcApAQCAtMzYsNyArMzYsOSBAQAogI2luY2x1ZGUgIklubGluZUxpbmVH ZW9tZXRyeS5oIgogI2luY2x1ZGUgIkxheW91dEJveEdlb21ldHJ5LmgiCiAjaW5jbHVkZSAiTGF5 b3V0Q29udGFpbmVyQm94LmgiCisjaW5jbHVkZSAiTGF5b3V0SW5pdGlhbENvbnRhaW5pbmdCbG9j ay5oIgogI2luY2x1ZGUgIkxheW91dFJlcGxhY2VkQm94LmgiCisjaW5jbHVkZSAiTG9nZ2luZy5o IgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgRGlzcGxheSB7CkBAIC00NiwxOCAr NDgsNjEgQEAgQm94RmFjdG9yeTo6Qm94RmFjdG9yeShmbG9hdCBwaXhlbFNuYXBwaW5nRmFjdG9y KQogewogfQogCi1zdGQ6OnVuaXF1ZV9wdHI8Qm94PiBCb3hGYWN0b3J5OjpkaXNwbGF5Qm94Rm9y Um9vdEJveChjb25zdCBMYXlvdXQ6OkNvbnRhaW5lckJveCYgcm9vdExheW91dEJveCwgY29uc3Qg TGF5b3V0OjpCb3hHZW9tZXRyeSYgZ2VvbWV0cnkpIGNvbnN0CitSb290QmFja2dyb3VuZFByb3Bh Z2F0aW9uIEJveEZhY3Rvcnk6OmRldGVybWluZVJvb3RCYWNrZ3JvdW5kUHJvcGFnYXRpb24oY29u c3QgTGF5b3V0OjpDb250YWluZXJCb3gmIHJvb3RMYXlvdXRCb3gpCiB7CisgICAgYXV0byogZG9j dW1lbnRFbGVtZW50Qm94ID0gZG9jdW1lbnRFbGVtZW50Qm94RnJvbVJvb3RCb3gocm9vdExheW91 dEJveCk7CisgICAgYXV0byogYm9keUJveCA9IGJvZHlCb3hGcm9tUm9vdEJveChyb290TGF5b3V0 Qm94KTsKKworICAgIGlmIChkb2N1bWVudEVsZW1lbnRCb3ggJiYgZG9jdW1lbnRFbGVtZW50Qm94 LT5zdHlsZSgpLmhhc0JhY2tncm91bmQoKSkKKyAgICAgICAgcmV0dXJuIFJvb3RCYWNrZ3JvdW5k UHJvcGFnYXRpb246Ok5vbmU7CisKKyAgICBpZiAoYm9keUJveCAmJiBib2R5Qm94LT5zdHlsZSgp Lmhhc0JhY2tncm91bmQoKSkKKyAgICAgICAgcmV0dXJuIFJvb3RCYWNrZ3JvdW5kUHJvcGFnYXRp b246OkJvZHlUb1Jvb3Q7CisgICAgCisgICAgcmV0dXJuIFJvb3RCYWNrZ3JvdW5kUHJvcGFnYXRp b246Ok5vbmU7Cit9CisKK3N0ZDo6dW5pcXVlX3B0cjxCb3g+IEJveEZhY3Rvcnk6OmRpc3BsYXlC b3hGb3JSb290Qm94KGNvbnN0IExheW91dDo6Q29udGFpbmVyQm94JiByb290TGF5b3V0Qm94LCBj b25zdCBMYXlvdXQ6OkJveEdlb21ldHJ5JiBnZW9tZXRyeSwgUm9vdEJhY2tncm91bmRQcm9wYWdh dGlvbiByb290QmFja2dyb3VuZFByb3BhZ2F0aW9uKSBjb25zdAoreworICAgIEFTU0VSVChpczxM YXlvdXQ6OkluaXRpYWxDb250YWluaW5nQmxvY2s+KHJvb3RMYXlvdXRCb3gpKTsKKwogICAgIC8v IEZJWE1FOiBOZWVkIHRvIGRvIGxvZ2ljYWwgLT4gcGh5c2ljYWwgY29vcmRpbmF0ZSBtYXBwaW5n IGhlcmUuCiAgICAgYXV0byBib3JkZXJCb3hSZWN0ID0gTGF5b3V0UmVjdCB7IExheW91dDo6Qm94 R2VvbWV0cnk6OmJvcmRlckJveFJlY3QoZ2VvbWV0cnkpIH07CiAKLSAgICBhdXRvIHN0eWxlID0g U3R5bGUgeyByb290TGF5b3V0Qm94LnN0eWxlKCkgfTsKKyAgICBhdXRvKiBkb2N1bWVudEVsZW1l bnRCb3ggPSBkb2N1bWVudEVsZW1lbnRCb3hGcm9tUm9vdEJveChyb290TGF5b3V0Qm94KTsKKwor ICAgIGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZUZvckJhY2tncm91bmQgPSBkb2N1bWVudEVsZW1l bnRCb3ggPyAmZG9jdW1lbnRFbGVtZW50Qm94LT5zdHlsZSgpIDogbnVsbHB0cjsKKworICAgIGlm IChyb290QmFja2dyb3VuZFByb3BhZ2F0aW9uID09IFJvb3RCYWNrZ3JvdW5kUHJvcGFnYXRpb246 OkJvZHlUb1Jvb3QpIHsKKyAgICAgICAgaWYgKGF1dG8qIGJvZHlCb3ggPSBib2R5Qm94RnJvbVJv b3RCb3gocm9vdExheW91dEJveCkpCisgICAgICAgICAgICBzdHlsZUZvckJhY2tncm91bmQgPSAm Ym9keUJveC0+c3R5bGUoKTsKKyAgICB9CisKKyAgICBhdXRvIHN0eWxlID0gU3R5bGUgeyByb290 TGF5b3V0Qm94LnN0eWxlKCksIHN0eWxlRm9yQmFja2dyb3VuZCB9OworCiAgICAgYXV0byByb290 Qm94ID0gbWFrZVVuaXF1ZTxDb250YWluZXJCb3g+KHNuYXBSZWN0VG9EZXZpY2VQaXhlbHMoYm9y ZGVyQm94UmVjdCwgbV9waXhlbFNuYXBwaW5nRmFjdG9yKSwgV1RGTW92ZShzdHlsZSkpOwotICAg IHNldHVwQm94TW9kZWxCb3goKnJvb3RCb3gsIHJvb3RMYXlvdXRCb3gsIGdlb21ldHJ5LCB7IH0p OworICAgIHNldHVwQm94TW9kZWxCb3goKnJvb3RCb3gsIHJvb3RMYXlvdXRCb3gsIHN0eWxlRm9y QmFja2dyb3VuZCwgZ2VvbWV0cnksIHsgfSk7CiAgICAgcmV0dXJuIHJvb3RCb3g7CiB9CiAKK3N0 ZDo6dW5pcXVlX3B0cjxCb3g+IEJveEZhY3Rvcnk6OmRpc3BsYXlCb3hGb3JCb2R5Qm94KGNvbnN0 IExheW91dDo6Qm94JiBsYXlvdXRCb3gsIGNvbnN0IExheW91dDo6Qm94R2VvbWV0cnkmIGdlb21l dHJ5LCBSb290QmFja2dyb3VuZFByb3BhZ2F0aW9uIHJvb3RCYWNrZ3JvdW5kUHJvcGFnYXRpb24s IExheW91dFNpemUgb2Zmc2V0RnJvbVJvb3QpIGNvbnN0Cit7CisgICAgY29uc3QgUmVuZGVyU3R5 bGUqIHN0eWxlRm9yQmFja2dyb3VuZCA9ICZsYXlvdXRCb3guc3R5bGUoKTsKKyAgICAKKyAgICBp ZiAocm9vdEJhY2tncm91bmRQcm9wYWdhdGlvbiA9PSBSb290QmFja2dyb3VuZFByb3BhZ2F0aW9u OjpCb2R5VG9Sb290KQorICAgICAgICBzdHlsZUZvckJhY2tncm91bmQgPSBudWxscHRyOworICAg IAorICAgIGF1dG8gc3R5bGUgPSBTdHlsZSB7IGxheW91dEJveC5zdHlsZSgpLCBzdHlsZUZvckJh Y2tncm91bmQgfTsKKyAgICByZXR1cm4gZGlzcGxheUJveEZvckxheW91dEJveChsYXlvdXRCb3gs IHN0eWxlRm9yQmFja2dyb3VuZCwgZ2VvbWV0cnksIG9mZnNldEZyb21Sb290LCBXVEZNb3ZlKHN0 eWxlKSk7Cit9CisKIHN0ZDo6dW5pcXVlX3B0cjxCb3g+IEJveEZhY3Rvcnk6OmRpc3BsYXlCb3hG b3JMYXlvdXRCb3goY29uc3QgTGF5b3V0OjpCb3gmIGxheW91dEJveCwgY29uc3QgTGF5b3V0OjpC b3hHZW9tZXRyeSYgZ2VvbWV0cnksIExheW91dFNpemUgb2Zmc2V0RnJvbVJvb3QpIGNvbnN0Cit7 CisgICAgYXV0byBzdHlsZSA9IFN0eWxlIHsgbGF5b3V0Qm94LnN0eWxlKCkgfTsKKyAgICByZXR1 cm4gZGlzcGxheUJveEZvckxheW91dEJveChsYXlvdXRCb3gsICZsYXlvdXRCb3guc3R5bGUoKSwg Z2VvbWV0cnksIG9mZnNldEZyb21Sb290LCBXVEZNb3ZlKHN0eWxlKSk7Cit9CisKK3N0ZDo6dW5p cXVlX3B0cjxCb3g+IEJveEZhY3Rvcnk6OmRpc3BsYXlCb3hGb3JMYXlvdXRCb3goY29uc3QgTGF5 b3V0OjpCb3gmIGxheW91dEJveCwgY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlRm9yQmFja2dyb3Vu ZCwgY29uc3QgTGF5b3V0OjpCb3hHZW9tZXRyeSYgZ2VvbWV0cnksIExheW91dFNpemUgb2Zmc2V0 RnJvbVJvb3QsIFN0eWxlJiYgc3R5bGUpIGNvbnN0CiB7CiAgICAgLy8gRklYTUU6IE5lZWQgdG8g bWFwIGxvZ2ljYWwgdG8gcGh5c2ljYWwgcmVjdHMuCiAgICAgYXV0byBib3JkZXJCb3hSZWN0ID0g TGF5b3V0UmVjdCB7IExheW91dDo6Qm94R2VvbWV0cnk6OmJvcmRlckJveFJlY3QoZ2VvbWV0cnkp IH07CkBAIC02NSwxMCArMTEwLDYgQEAgc3RkOjp1bmlxdWVfcHRyPEJveD4gQm94RmFjdG9yeTo6 ZGlzcGxheUJveEZvckxheW91dEJveChjb25zdCBMYXlvdXQ6OkJveCYgbGF5b3UKICAgICBhdXRv IHBpeGVsU25hcHBlZEJvcmRlckJveFJlY3QgPSBzbmFwUmVjdFRvRGV2aWNlUGl4ZWxzKGJvcmRl ckJveFJlY3QsIG1fcGl4ZWxTbmFwcGluZ0ZhY3Rvcik7CiAKICAgICAvLyBGSVhNRTogSGFuZGxl IGlzQW5vbnltb3VzKCkKLSAgICAvLyBGSVhNRTogRG8gaG9pc3Rpbmcgb2YgPGJvZHk+IHN0eWxl cyB0byB0aGUgcm9vdCB3aGVyZSBhcHByb3ByaWF0ZS4KLQotICAgIC8vIEZJWE1FOiBOZWVkIHRv IGRvIGxvZ2ljYWwgLT4gcGh5c2ljYWwgY29vcmRpbmF0ZSBtYXBwaW5nIGhlcmUuCi0gICAgYXV0 byBzdHlsZSA9IFN0eWxlIHsgbGF5b3V0Qm94LnN0eWxlKCkgfTsKICAgICAKICAgICBpZiAoaXM8 TGF5b3V0OjpSZXBsYWNlZEJveD4obGF5b3V0Qm94KSkgewogICAgICAgICAvLyBGSVhNRTogRG9u J3QgYXNzdW1lIGl0J3MgYW4gaW1hZ2UuCkBAIC03NywxNCArMTE4LDE0IEBAIHN0ZDo6dW5pcXVl X3B0cjxCb3g+IEJveEZhY3Rvcnk6OmRpc3BsYXlCb3hGb3JMYXlvdXRCb3goY29uc3QgTGF5b3V0 OjpCb3gmIGxheW91CiAgICAgICAgICAgICBpbWFnZSA9IGNhY2hlZEltYWdlLT5pbWFnZSgpOwog CiAgICAgICAgIGF1dG8gaW1hZ2VCb3ggPSBtYWtlVW5pcXVlPEltYWdlQm94PihwaXhlbFNuYXBw ZWRCb3JkZXJCb3hSZWN0LCBXVEZNb3ZlKHN0eWxlKSwgV1RGTW92ZShpbWFnZSkpOwotICAgICAg ICBzZXR1cEJveE1vZGVsQm94KCppbWFnZUJveCwgbGF5b3V0Qm94LCBnZW9tZXRyeSwgb2Zmc2V0 RnJvbVJvb3QpOworICAgICAgICBzZXR1cEJveE1vZGVsQm94KCppbWFnZUJveCwgbGF5b3V0Qm94 LCBzdHlsZUZvckJhY2tncm91bmQsIGdlb21ldHJ5LCBvZmZzZXRGcm9tUm9vdCk7CiAgICAgICAg IHJldHVybiBpbWFnZUJveDsKICAgICB9CiAgICAgCiAgICAgaWYgKGlzPExheW91dDo6Q29udGFp bmVyQm94PihsYXlvdXRCb3gpKSB7CiAgICAgICAgIC8vIEZJWE1FOiBUaGUgZGVjaXNpb24gdG8g bWFrZSBhIENvbnRhaW5lckJveCBzaG91bGQgYmUgbWFkZSBiYXNlZCBvbiB3aGV0aGVyIHRoaXMg RGlzcGxheTo6Qm94IHdpbGwgaGF2ZSBjaGlsZHJlbi4KICAgICAgICAgYXV0byBjb250YWluZXJC b3ggPSBtYWtlVW5pcXVlPENvbnRhaW5lckJveD4ocGl4ZWxTbmFwcGVkQm9yZGVyQm94UmVjdCwg V1RGTW92ZShzdHlsZSkpOwotICAgICAgICBzZXR1cEJveE1vZGVsQm94KCpjb250YWluZXJCb3gs IGxheW91dEJveCwgZ2VvbWV0cnksIG9mZnNldEZyb21Sb290KTsKKyAgICAgICAgc2V0dXBCb3hN b2RlbEJveCgqY29udGFpbmVyQm94LCBsYXlvdXRCb3gsIHN0eWxlRm9yQmFja2dyb3VuZCwgZ2Vv bWV0cnksIG9mZnNldEZyb21Sb290KTsKICAgICAgICAgcmV0dXJuIGNvbnRhaW5lckJveDsKICAg ICB9CiAKQEAgLTEyOCwxMiArMTY5LDE0IEBAIHZvaWQgQm94RmFjdG9yeTo6c2V0dXBCb3hHZW9t ZXRyeShCb3hNb2RlbEJveCYgYm94LCBjb25zdCBMYXlvdXQ6OkJveCYsIGNvbnN0IExhCiAgICAg fQogfQogCi1zdGQ6OnVuaXF1ZV9wdHI8Qm94RGVjb3JhdGlvbkRhdGE+IEJveEZhY3Rvcnk6OmNv bnN0cnVjdEJveERlY29yYXRpb25EYXRhKGNvbnN0IExheW91dDo6Qm94JiBsYXlvdXRCb3gsIGNv bnN0IExheW91dDo6Qm94R2VvbWV0cnkmIGxheW91dEdlb21ldHJ5LCBMYXlvdXRTaXplIG9mZnNl dEZyb21Sb290KSBjb25zdAorc3RkOjp1bmlxdWVfcHRyPEJveERlY29yYXRpb25EYXRhPiBCb3hG YWN0b3J5Ojpjb25zdHJ1Y3RCb3hEZWNvcmF0aW9uRGF0YShjb25zdCBMYXlvdXQ6OkJveCYgbGF5 b3V0Qm94LCBjb25zdCBSZW5kZXJTdHlsZSogc3R5bGVGb3JCYWNrZ3JvdW5kLCBjb25zdCBMYXlv dXQ6OkJveEdlb21ldHJ5JiBsYXlvdXRHZW9tZXRyeSwgTGF5b3V0U2l6ZSBvZmZzZXRGcm9tUm9v dCkgY29uc3QKIHsKICAgICBhdXRvIGJveERlY29yYXRpb25EYXRhID0gbWFrZVVuaXF1ZTxCb3hE ZWNvcmF0aW9uRGF0YT4oKTsKIAotICAgIGF1dG8gYmFja2dyb3VuZEltYWdlR2VvbWV0cnkgPSBj YWxjdWxhdGVGaWxsTGF5ZXJJbWFnZUdlb21ldHJ5KGxheW91dEJveCwgbGF5b3V0R2VvbWV0cnks IG9mZnNldEZyb21Sb290LCBtX3BpeGVsU25hcHBpbmdGYWN0b3IpOwotICAgIGJveERlY29yYXRp b25EYXRhLT5zZXRCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeShXVEZNb3ZlKGJhY2tncm91bmRJbWFn ZUdlb21ldHJ5KSk7CisgICAgaWYgKHN0eWxlRm9yQmFja2dyb3VuZCkgeworICAgICAgICBhdXRv IGJhY2tncm91bmRJbWFnZUdlb21ldHJ5ID0gY2FsY3VsYXRlRmlsbExheWVySW1hZ2VHZW9tZXRy eSgqc3R5bGVGb3JCYWNrZ3JvdW5kLCBsYXlvdXRHZW9tZXRyeSwgb2Zmc2V0RnJvbVJvb3QsIG1f cGl4ZWxTbmFwcGluZ0ZhY3Rvcik7CisgICAgICAgIGJveERlY29yYXRpb25EYXRhLT5zZXRCYWNr Z3JvdW5kSW1hZ2VHZW9tZXRyeShXVEZNb3ZlKGJhY2tncm91bmRJbWFnZUdlb21ldHJ5KSk7Cisg ICAgfQogCiAgICAgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdlID0gdHJ1ZTsgLy8gRklYTUUu CiAgICAgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSA9IHRydWU7IC8vIEZJWE1FLgpAQCAt MTU0LDE4ICsxOTcsMzkgQEAgc3RkOjp1bmlxdWVfcHRyPEJveERlY29yYXRpb25EYXRhPiBCb3hG YWN0b3J5Ojpjb25zdHJ1Y3RCb3hEZWNvcmF0aW9uRGF0YShjb25zdAogICAgIHJldHVybiBib3hE ZWNvcmF0aW9uRGF0YTsKIH0KIAotdm9pZCBCb3hGYWN0b3J5OjpzZXR1cEJveE1vZGVsQm94KEJv eE1vZGVsQm94JiBib3gsIGNvbnN0IExheW91dDo6Qm94JiBsYXlvdXRCb3gsIGNvbnN0IExheW91 dDo6Qm94R2VvbWV0cnkmIGxheW91dEdlb21ldHJ5LCBMYXlvdXRTaXplIG9mZnNldEZyb21Sb290 KSBjb25zdAordm9pZCBCb3hGYWN0b3J5OjpzZXR1cEJveE1vZGVsQm94KEJveE1vZGVsQm94JiBi b3gsIGNvbnN0IExheW91dDo6Qm94JiBsYXlvdXRCb3gsIGNvbnN0IFJlbmRlclN0eWxlKiBzdHls ZUZvckJhY2tncm91bmQsIGNvbnN0IExheW91dDo6Qm94R2VvbWV0cnkmIGxheW91dEdlb21ldHJ5 LCBMYXlvdXRTaXplIG9mZnNldEZyb21Sb290KSBjb25zdAogewogICAgIHNldHVwQm94R2VvbWV0 cnkoYm94LCBsYXlvdXRCb3gsIGxheW91dEdlb21ldHJ5LCBvZmZzZXRGcm9tUm9vdCk7CiAKICAg ICBhdXRvJiByZW5kZXJTdHlsZSA9IGxheW91dEJveC5zdHlsZSgpOwotICAgIGlmICghcmVuZGVy U3R5bGUuaGFzQmFja2dyb3VuZCgpICYmICFyZW5kZXJTdHlsZS5oYXNCb3JkZXIoKSkKKyAgICBp ZiAoIShzdHlsZUZvckJhY2tncm91bmQgJiYgc3R5bGVGb3JCYWNrZ3JvdW5kLT5oYXNCYWNrZ3Jv dW5kKCkpICYmICFyZW5kZXJTdHlsZS5oYXNCb3JkZXIoKSkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgYXV0byBib3hEZWNvcmF0aW9uRGF0YSA9IGNvbnN0cnVjdEJveERlY29yYXRpb25EYXRhKGxh eW91dEJveCwgbGF5b3V0R2VvbWV0cnksIG9mZnNldEZyb21Sb290KTsKKyAgICBhdXRvIGJveERl Y29yYXRpb25EYXRhID0gY29uc3RydWN0Qm94RGVjb3JhdGlvbkRhdGEobGF5b3V0Qm94LCBzdHls ZUZvckJhY2tncm91bmQsIGxheW91dEdlb21ldHJ5LCBvZmZzZXRGcm9tUm9vdCk7CiAgICAgYm94 LnNldEJveERlY29yYXRpb25EYXRhKFdURk1vdmUoYm94RGVjb3JhdGlvbkRhdGEpKTsKIH0KIAor Y29uc3QgTGF5b3V0OjpDb250YWluZXJCb3gqIEJveEZhY3Rvcnk6OmRvY3VtZW50RWxlbWVudEJv eEZyb21Sb290Qm94KGNvbnN0IExheW91dDo6Q29udGFpbmVyQm94JiByb290TGF5b3V0Qm94KQor eworICAgIGF1dG8qIGRvY3VtZW50Qm94ID0gcm9vdExheW91dEJveC5maXJzdENoaWxkKCk7Cisg ICAgaWYgKCFkb2N1bWVudEJveCB8fCAhZG9jdW1lbnRCb3gtPmlzRG9jdW1lbnRCb3goKSB8fCAh aXM8TGF5b3V0OjpDb250YWluZXJCb3g+KGRvY3VtZW50Qm94KSkKKyAgICAgICAgcmV0dXJuIG51 bGxwdHI7CisKKyAgICByZXR1cm4gZG93bmNhc3Q8TGF5b3V0OjpDb250YWluZXJCb3g+KGRvY3Vt ZW50Qm94KTsKK30KKworY29uc3QgTGF5b3V0OjpCb3gqIEJveEZhY3Rvcnk6OmJvZHlCb3hGcm9t Um9vdEJveChjb25zdCBMYXlvdXQ6OkNvbnRhaW5lckJveCYgcm9vdExheW91dEJveCkKK3sKKyAg ICBhdXRvKiBkb2N1bWVudEJveCA9IHJvb3RMYXlvdXRCb3guZmlyc3RDaGlsZCgpOworICAgIGlm ICghZG9jdW1lbnRCb3ggfHwgIWRvY3VtZW50Qm94LT5pc0RvY3VtZW50Qm94KCkgfHwgIWlzPExh eW91dDo6Q29udGFpbmVyQm94Pihkb2N1bWVudEJveCkpCisgICAgICAgIHJldHVybiBudWxscHRy OworCisgICAgYXV0byogYm9keUJveCA9IGRvd25jYXN0PExheW91dDo6Q29udGFpbmVyQm94Pihk b2N1bWVudEJveCktPmZpcnN0Q2hpbGQoKTsKKyAgICBpZiAoIWJvZHlCb3ggfHwgIWJvZHlCb3gt PmlzQm9keUJveCgpKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIHJldHVybiBib2R5 Qm94OworfQogCiB9IC8vIG5hbWVzcGFjZSBEaXNwbGF5CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5Qm94RmFjdG9y eS5oIGIvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheUJveEZhY3RvcnkuaAppbmRl eCA1MzlmZmNmNGVjN2Y3M2I4NzYxMTY0MjU3YTlkZjdjZDRiYzNhM2FjLi5mNTVkYTViZGU2OGQ1 NzU2MjRmMzI4Mzk3MDEwZTExMjRkODg0MDJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9k aXNwbGF5L2Nzcy9EaXNwbGF5Qm94RmFjdG9yeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rpc3Bs YXkvY3NzL0Rpc3BsYXlCb3hGYWN0b3J5LmgKQEAgLTQ3LDIwICs0NywzMyBAQCBjbGFzcyBCb3g7 CiBjbGFzcyBCb3hEZWNvcmF0aW9uRGF0YTsKIGNsYXNzIEJveE1vZGVsQm94OwogCitlbnVtIGNs YXNzIFJvb3RCYWNrZ3JvdW5kUHJvcGFnYXRpb24gOiB1aW50OF90IHsKKyAgICBOb25lLAorICAg IEJvZHlUb1Jvb3QsCit9OworCiBjbGFzcyBCb3hGYWN0b3J5IHsKIHB1YmxpYzoKICAgICBleHBs aWNpdCBCb3hGYWN0b3J5KGZsb2F0IHBpeGVsU25hcHBpbmdGYWN0b3IpOwogCi0gICAgc3RkOjp1 bmlxdWVfcHRyPEJveD4gZGlzcGxheUJveEZvclJvb3RCb3goY29uc3QgTGF5b3V0OjpDb250YWlu ZXJCb3gmLCBjb25zdCBMYXlvdXQ6OkJveEdlb21ldHJ5JikgY29uc3Q7CisgICAgc3RhdGljIFJv b3RCYWNrZ3JvdW5kUHJvcGFnYXRpb24gZGV0ZXJtaW5lUm9vdEJhY2tncm91bmRQcm9wYWdhdGlv bihjb25zdCBMYXlvdXQ6OkNvbnRhaW5lckJveCYgcm9vdExheW91dEJveCk7CisKKyAgICBzdGQ6 OnVuaXF1ZV9wdHI8Qm94PiBkaXNwbGF5Qm94Rm9yUm9vdEJveChjb25zdCBMYXlvdXQ6OkNvbnRh aW5lckJveCYsIGNvbnN0IExheW91dDo6Qm94R2VvbWV0cnkmLCBSb290QmFja2dyb3VuZFByb3Bh Z2F0aW9uKSBjb25zdDsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8Qm94PiBkaXNwbGF5Qm94Rm9yQm9k eUJveChjb25zdCBMYXlvdXQ6OkJveCYsIGNvbnN0IExheW91dDo6Qm94R2VvbWV0cnkmLCBSb290 QmFja2dyb3VuZFByb3BhZ2F0aW9uLCBMYXlvdXRTaXplIG9mZnNldEZyb21Sb290KSBjb25zdDsK ICAgICBzdGQ6OnVuaXF1ZV9wdHI8Qm94PiBkaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGNvbnN0IExh eW91dDo6Qm94JiwgY29uc3QgTGF5b3V0OjpCb3hHZW9tZXRyeSYsIExheW91dFNpemUgb2Zmc2V0 RnJvbVJvb3QpIGNvbnN0OwogCiAgICAgc3RkOjp1bmlxdWVfcHRyPEJveD4gZGlzcGxheUJveEZv clRleHRSdW4oY29uc3QgTGF5b3V0OjpMaW5lUnVuJiwgY29uc3QgTGF5b3V0OjpJbmxpbmVMaW5l R2VvbWV0cnkmLCBMYXlvdXRTaXplIG9mZnNldEZyb21Sb290KSBjb25zdDsKKwogcHJpdmF0ZToK KyAgICBzdGQ6OnVuaXF1ZV9wdHI8Qm94PiBkaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGNvbnN0IExh eW91dDo6Qm94JiwgY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlRm9yQmFja2dyb3VuZCwgY29uc3Qg TGF5b3V0OjpCb3hHZW9tZXRyeSYsIExheW91dFNpemUgb2Zmc2V0RnJvbVJvb3QsIFN0eWxlJiYp IGNvbnN0OwogCiAgICAgdm9pZCBzZXR1cEJveEdlb21ldHJ5KEJveE1vZGVsQm94JiwgY29uc3Qg TGF5b3V0OjpCb3gmLCBjb25zdCBMYXlvdXQ6OkJveEdlb21ldHJ5JiwgTGF5b3V0U2l6ZSBvZmZz ZXRGcm9tUm9vdCkgY29uc3Q7Ci0gICAgdm9pZCBzZXR1cEJveE1vZGVsQm94KEJveE1vZGVsQm94 JiwgY29uc3QgTGF5b3V0OjpCb3gmLCBjb25zdCBMYXlvdXQ6OkJveEdlb21ldHJ5JiwgTGF5b3V0 U2l6ZSBvZmZzZXRGcm9tUm9vdCkgY29uc3Q7CisgICAgdm9pZCBzZXR1cEJveE1vZGVsQm94KEJv eE1vZGVsQm94JiwgY29uc3QgTGF5b3V0OjpCb3gmLCBjb25zdCBSZW5kZXJTdHlsZSogc3R5bGVG b3JCYWNrZ3JvdW5kLCBjb25zdCBMYXlvdXQ6OkJveEdlb21ldHJ5JiwgTGF5b3V0U2l6ZSBvZmZz ZXRGcm9tUm9vdCkgY29uc3Q7CisKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8Qm94RGVjb3JhdGlvbkRh dGE+IGNvbnN0cnVjdEJveERlY29yYXRpb25EYXRhKGNvbnN0IExheW91dDo6Qm94JiwgY29uc3Qg UmVuZGVyU3R5bGUqIHN0eWxlRm9yQmFja2dyb3VuZCwgY29uc3QgTGF5b3V0OjpCb3hHZW9tZXRy eSYsIExheW91dFNpemUgb2Zmc2V0RnJvbVJvb3QpIGNvbnN0OwogCi0gICAgc3RkOjp1bmlxdWVf cHRyPEJveERlY29yYXRpb25EYXRhPiBjb25zdHJ1Y3RCb3hEZWNvcmF0aW9uRGF0YShjb25zdCBM YXlvdXQ6OkJveCYsIGNvbnN0IExheW91dDo6Qm94R2VvbWV0cnkmLCBMYXlvdXRTaXplIG9mZnNl dEZyb21Sb290KSBjb25zdDsKKyAgICBzdGF0aWMgY29uc3QgTGF5b3V0OjpDb250YWluZXJCb3gq IGRvY3VtZW50RWxlbWVudEJveEZyb21Sb290Qm94KGNvbnN0IExheW91dDo6Q29udGFpbmVyQm94 JiByb290TGF5b3V0Qm94KTsKKyAgICBzdGF0aWMgY29uc3QgTGF5b3V0OjpCb3gqIGJvZHlCb3hG cm9tUm9vdEJveChjb25zdCBMYXlvdXQ6OkNvbnRhaW5lckJveCYgcm9vdExheW91dEJveCk7CiAK ICAgICBmbG9hdCBtX3BpeGVsU25hcHBpbmdGYWN0b3IgeyAxIH07CiB9OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheUZpbGxMYXllckltYWdlR2VvbWV0cnku Y3BwIGIvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheUZpbGxMYXllckltYWdlR2Vv bWV0cnkuY3BwCmluZGV4IDMwZGZmMDhhOTdiYzljYTQ0ZjZhMTNiYjk4ZTcxYWNiMjZmMGY1NGUu LjYzYTMwYjQyOTZhYjhiNTM5OGQyMDlmNDRkZTk5ZjUzZmY2NTllNWMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlGaWxsTGF5ZXJJbWFnZUdlb21ldHJ5LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5RmlsbExheWVySW1hZ2VH ZW9tZXRyeS5jcHAKQEAgLTM3NCwxMCArMzc0LDggQEAgc3RhdGljIEZpbGxMYXllckltYWdlR2Vv bWV0cnkgZ2VvbWV0cnlGb3JMYXllcihjb25zdCBGaWxsTGF5ZXImIGZpbGxMYXllciwgTGF5b3UK ICAgICByZXR1cm4gcGl4ZWxTbmFwcGVkRmlsbExheWVySW1hZ2VHZW9tZXRyeShkZXN0aW5hdGlv blJlY3QsIHRpbGVTaXplLCBwaGFzZSwgc3BhY2VTaXplLCBmaWxsTGF5ZXIuYXR0YWNobWVudCgp LCBwaXhlbFNuYXBwaW5nRmFjdG9yKTsKIH0KIAotVmVjdG9yPEZpbGxMYXllckltYWdlR2VvbWV0 cnksIDE+IGNhbGN1bGF0ZUZpbGxMYXllckltYWdlR2VvbWV0cnkoY29uc3QgTGF5b3V0OjpCb3gm IGxheW91dEJveCwgY29uc3QgTGF5b3V0OjpCb3hHZW9tZXRyeSYgYm94R2VvbWV0cnksIExheW91 dFNpemUgb2Zmc2V0RnJvbVJvb3QsIGZsb2F0IHBpeGVsU25hcHBpbmdGYWN0b3IpCitWZWN0b3I8 RmlsbExheWVySW1hZ2VHZW9tZXRyeSwgMT4gY2FsY3VsYXRlRmlsbExheWVySW1hZ2VHZW9tZXRy eShjb25zdCBSZW5kZXJTdHlsZSYgcmVuZGVyU3R5bGUsIGNvbnN0IExheW91dDo6Qm94R2VvbWV0 cnkmIGJveEdlb21ldHJ5LCBMYXlvdXRTaXplIG9mZnNldEZyb21Sb290LCBmbG9hdCBwaXhlbFNu YXBwaW5nRmFjdG9yKQogewotICAgIGF1dG8mIHJlbmRlclN0eWxlID0gbGF5b3V0Qm94LnN0eWxl KCk7Ci0KICAgICAvLyBGSVhNRTogTmVlZCB0byBtYXAgbG9naWNhbCB0byBwaHlzaWNhbCByZWN0 cy4KICAgICBhdXRvIGJvcmRlckJveFJlY3QgPSBMYXlvdXRSZWN0IHsgTGF5b3V0OjpCb3hHZW9t ZXRyeTo6Ym9yZGVyQm94UmVjdChib3hHZW9tZXRyeSkgfTsKICAgICBib3JkZXJCb3hSZWN0Lm1v dmUob2Zmc2V0RnJvbVJvb3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9j c3MvRGlzcGxheUZpbGxMYXllckltYWdlR2VvbWV0cnkuaCBiL1NvdXJjZS9XZWJDb3JlL2Rpc3Bs YXkvY3NzL0Rpc3BsYXlGaWxsTGF5ZXJJbWFnZUdlb21ldHJ5LmgKaW5kZXggNTFjNzc0MzNkNDIw NWMxODU1MWEwMDFmYjY2YWM2MTkwZDY3MDdhYS4uNWNkM2NhZGRkZGM4YmRjMWNhYjcxMmQ3MDA5 YWJlMGNhODhiZDVjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlz cGxheUZpbGxMYXllckltYWdlR2VvbWV0cnkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5 L2Nzcy9EaXNwbGF5RmlsbExheWVySW1hZ2VHZW9tZXRyeS5oCkBAIC0zMyw2ICszMyw3IEBACiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIEZpbGxMYXllcjsKK2NsYXNzIFJlbmRlclN0eWxl OwogY2xhc3MgU3R5bGVJbWFnZTsKIAogbmFtZXNwYWNlIExheW91dCB7CkBAIC04MCw3ICs4MSw3 IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2hhc05vbkxvY2FsR2VvbWV0cnkgeyBmYWxzZSB9OyAv LyBIYXMgYmFja2dyb3VuZC1hdHRhY2htZW50OiBmaXhlZC4gSW1wbGllcyB0aGF0IHdlIGNhbid0 IGFsd2F5cyBjaGVhcGx5IGNvbXB1dGUgZGVzdFJlY3QuCiB9OwogCi1WZWN0b3I8RmlsbExheWVy SW1hZ2VHZW9tZXRyeSwgMT4gY2FsY3VsYXRlRmlsbExheWVySW1hZ2VHZW9tZXRyeShjb25zdCBM YXlvdXQ6OkJveCYsIGNvbnN0IExheW91dDo6Qm94R2VvbWV0cnkmLCBMYXlvdXRTaXplIG9mZnNl dEZyb21Sb290LCBmbG9hdCBwaXhlbFNuYXBwaW5nRmFjdG9yKTsKK1ZlY3RvcjxGaWxsTGF5ZXJJ bWFnZUdlb21ldHJ5LCAxPiBjYWxjdWxhdGVGaWxsTGF5ZXJJbWFnZUdlb21ldHJ5KGNvbnN0IFJl bmRlclN0eWxlJiwgY29uc3QgTGF5b3V0OjpCb3hHZW9tZXRyeSYsIExheW91dFNpemUgb2Zmc2V0 RnJvbVJvb3QsIGZsb2F0IHBpeGVsU25hcHBpbmdGYWN0b3IpOwogCiB9IC8vIG5hbWVzcGFjZSBE aXNwbGF5CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9kaXNwbGF5L2Nzcy9EaXNwbGF5U3R5bGUuY3BwIGIvU291cmNlL1dlYkNvcmUvZGlzcGxheS9j c3MvRGlzcGxheVN0eWxlLmNwcAppbmRleCAxMzRlYWU4NGFjMjI5ZTc5ODNhMjI1NzMwNzZiZThm ZTM1ZjEwMDY4Li44MzlmN2NlMTU2ZTAyZTk0MmIxMzY1Mzc5YjllNTA5ZWJlNDI1NjdlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kaXNwbGF5L2Nzcy9EaXNwbGF5U3R5bGUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2Rpc3BsYXkvY3NzL0Rpc3BsYXlTdHlsZS5jcHAKQEAgLTU3LDYgKzU3 LDExIEBAIHN0YXRpYyBSZWZQdHI8RmlsbExheWVyPiBkZWVwQ29weShjb25zdCBGaWxsTGF5ZXIm IGxheWVyKQogfQogCiBTdHlsZTo6U3R5bGUoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKQorICAg IDogU3R5bGUoc3R5bGUsICZzdHlsZSkKK3sKK30KKworU3R5bGU6OlN0eWxlKGNvbnN0IFJlbmRl clN0eWxlJiBzdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlRm9yQmFja2dyb3VuZCkKICAg ICA6IG1fZm9udENhc2NhZGUoc3R5bGUuZm9udENhc2NhZGUoKSkKICAgICAsIG1fd2hpdGVTcGFj ZShzdHlsZS53aGl0ZVNwYWNlKCkpCiAgICAgLCBtX3RhYlNpemUoc3R5bGUudGFiU2l6ZSgpKQpA QCAtNjQsOCArNjksOCBAQCBTdHlsZTo6U3R5bGUoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKQog ICAgIC8vIEZJWE1FOiBJcyBjdXJyZW50Q29sb3IgcmVzb2x2ZWQgaGVyZT8KICAgICBtX2NvbG9y ID0gc3R5bGUudmlzaXRlZERlcGVuZGVudENvbG9yV2l0aENvbG9yRmlsdGVyKENTU1Byb3BlcnR5 Q29sb3IpOwogCi0gICAgbV9iYWNrZ3JvdW5kQ29sb3IgPSBzdHlsZS52aXNpdGVkRGVwZW5kZW50 Q29sb3JXaXRoQ29sb3JGaWx0ZXIoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpOwotICAgIG1f YmFja2dyb3VuZExheWVycyA9IGRlZXBDb3B5KHN0eWxlLmJhY2tncm91bmRMYXllcnMoKSk7Cisg ICAgaWYgKHN0eWxlRm9yQmFja2dyb3VuZCkKKyAgICAgICAgc2V0dXBCYWNrZ3JvdW5kKCpzdHls ZUZvckJhY2tncm91bmQpOwogCiAgICAgaWYgKCFzdHlsZS5oYXNBdXRvVXNlZFpJbmRleCgpKQog ICAgICAgICBtX3pJbmRleCA9IHN0eWxlLnVzZWRaSW5kZXgoKTsKQEAgLTc0LDYgKzc5LDEyIEBA IFN0eWxlOjpTdHlsZShjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUpCiAgICAgc2V0SXNGbG9hdGlu ZyhzdHlsZS5mbG9hdGluZygpICE9IEZsb2F0OjpObyk7CiB9CiAKK3ZvaWQgU3R5bGU6OnNldHVw QmFja2dyb3VuZChjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUpCit7CisgICAgbV9iYWNrZ3JvdW5k Q29sb3IgPSBzdHlsZS52aXNpdGVkRGVwZW5kZW50Q29sb3JXaXRoQ29sb3JGaWx0ZXIoQ1NTUHJv cGVydHlCYWNrZ3JvdW5kQ29sb3IpOworICAgIG1fYmFja2dyb3VuZExheWVycyA9IGRlZXBDb3B5 KHN0eWxlLmJhY2tncm91bmRMYXllcnMoKSk7Cit9CisKIGJvb2wgU3R5bGU6Omhhc0JhY2tncm91 bmQoKSBjb25zdAogewogICAgIHJldHVybiBtX2JhY2tncm91bmRDb2xvci5pc1Zpc2libGUoKSB8 fCBoYXNCYWNrZ3JvdW5kSW1hZ2UoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rpc3Bs YXkvY3NzL0Rpc3BsYXlTdHlsZS5oIGIvU291cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxh eVN0eWxlLmgKaW5kZXggMTVmNDU1NTIxZjRmMTIxZmY5NjY5NDFhNTM0MGQwMmI0NzNmZTBhMC4u MzE0ZWZmMDBhMWMwYTU1MDcwOTE0OTkzOWZlZGIwMGI2OTk3MjM0NCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvZGlzcGxheS9jc3MvRGlzcGxheVN0eWxlLmgKKysrIGIvU291cmNlL1dlYkNv cmUvZGlzcGxheS9jc3MvRGlzcGxheVN0eWxlLmgKQEAgLTU4LDYgKzU4LDcgQEAgcHVibGljOgog ICAgIH07CiAKICAgICBleHBsaWNpdCBTdHlsZShjb25zdCBSZW5kZXJTdHlsZSYpOworICAgIGV4 cGxpY2l0IFN0eWxlKGNvbnN0IFJlbmRlclN0eWxlJiwgY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxl Rm9yQmFja2dyb3VuZCk7CiAKICAgICBjb25zdCBDb2xvciYgY29sb3IoKSBjb25zdCB7IHJldHVy biBtX2NvbG9yOyB9CiAKQEAgLTg3LDYgKzg4LDggQEAgcHVibGljOgogICAgIGNvbnN0IFRhYlNp emUmIHRhYlNpemUoKSBjb25zdCB7IHJldHVybiBtX3RhYlNpemU7IH0KIAogcHJpdmF0ZToKKyAg ICB2b2lkIHNldHVwQmFja2dyb3VuZChjb25zdCBSZW5kZXJTdHlsZSYpOworCiAgICAgdm9pZCBz ZXRJc1Bvc2l0aW9uZWQoYm9vbCB2YWx1ZSkgeyBtX2ZsYWdzLnNldCh7IEZsYWdzOjpQb3NpdGlv bmVkIH0sIHZhbHVlKTsgfQogICAgIHZvaWQgc2V0SXNGbG9hdGluZyhib29sIHZhbHVlKSB7IG1f ZmxhZ3Muc2V0KHsgRmxhZ3M6OkZsb2F0aW5nIH0sIHZhbHVlKTsgfQogCg==