188341 2018-08-06 00:50:38 -0700 [Nicosia] Add additional layer state classes, use impl-based approach to make them extendable 2018-08-06 01:49:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 187385 1 zan zan cgarcia cmarcelo ews-watchlist kondapallykalyan luiz magomez noam webkit-bug-importer oldest_to_newest 1448063 0 zan 2018-08-06 00:50:38 -0700 [Nicosia] Add additional layer state classes, use impl-based approach to make them extendable 1448071 1 346617 zan 2018-08-06 01:03:35 -0700 Created attachment 346617 Patch 1448083 2 346617 zan 2018-08-06 01:48:03 -0700 Comment on attachment 346617 Patch Clearing flags on attachment: 346617 Committed r234594: <https://trac.webkit.org/changeset/234594> 1448084 3 zan 2018-08-06 01:48:07 -0700 All reviewed patches have been landed. Closing bug. 1448085 4 webkit-bug-importer 2018-08-06 01:49:19 -0700 <rdar://problem/42961447> 346617 2018-08-06 01:03:35 -0700 2018-08-06 01:48:03 -0700 Patch bug-188341-20180806100333.patch text/plain 11522 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0NTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzViNGEwYmVlN2NiZmM3 MGI3MmEwMzEwN2I2ZmU0MjI1ZWEwNmVlMC4uODdiM2E3N2M1ODI0YjBhYTRiNGNjMzljNmIzMDAy NWU1ODk3MWJkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU1IEBACisyMDE4LTA4LTA2ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbTmljb3NpYV0gQWRk IGFkZGl0aW9uYWwgbGF5ZXIgc3RhdGUgY2xhc3NlcywgdXNlIGltcGwtYmFzZWQgYXBwcm9hY2gg dG8gbWFrZSB0aGVtIGV4dGVuZGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4ODM0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCB0aGUgQ29udGVudExheWVyLCBCYWNraW5nU3RvcmUgYW5kIElt YWdlQmFja2luZyBjbGFzc2VzIGluIHRoZQorICAgICAgICBOaWNvc2lhIG5hbWVzcGFjZS4gU3Rh dGUgb2JqZWN0cyBvZiBDb21wb3NpdGlvbkxheWVyIGluc3RhbmNlcyBrZWVwCisgICAgICAgIHJl ZmVyZW5jZXMgdG8gb2JqZWN0cyBvZiB0aGVzZSBjbGFzc2VzIGRlcGVuZGluZyBvbiB0aGUgY29u dGVudCB0aGF0J3MKKyAgICAgICAgcHJlc2VudGVkIGluIHRoZSBhc3NvY2lhdGVkIEdyYXBoaWNz TGF5ZXIuCisKKyAgICAgICAgQ29udGVudExheWVyIGRlcml2ZXMgZnJvbSB0aGUgUGxhdGZvcm1M YXllciBjbGFzcy4gSXQncyB1c2VkIGZvciBsYXllcnMKKyAgICAgICAgdGhhdCBkaXNwbGF5IHRo aW5ncyBsaWtlIFdlYkdMIGFuZCBIVE1MNSBjYW52YXMgYW5kIG1lZGlhIGNvbnRlbnQgaW4gYQor ICAgICAgICBwbGF0Zm9ybS1zcGVjaWZpYyB3YXkuIEluIGNhc2Ugb2YgVGV4dHVyZU1hcHBlciB0 aGUgaGFyZHdhcmUtYWNjZWxlcmF0ZWQKKyAgICAgICAgY29udGVudCBpcyBwaXBlZCBpbnRvIHRo YXQgcmVuZGVyaW5nIHBpcGVsaW5lLgorCisgICAgICAgIEJhY2tpbmdTdG9yZSBpcyBtZWFudCB0 byByZXByZXNlbnQgdGhlIHBhaW50ZWQgY29udGVudHMgb2YgYSBsYXllci4gVGhlCisgICAgICAg IGVxdWl2YWxlbnQgY3VycmVudCBmdW5jdGlvbmFsaXR5IGlzIHVzaW5nIGEgdGlsZWQgYmFja2lu ZyBzdG9yZSB0aGF0CisgICAgICAgIGhhcyBpdHMgY29udGVudHMgY29waWVkIGludG8gdGhlIENv b3JkaW5hdGVkQmFja2luZ1N0b3JlIGluc3RhbmNlLgorCisgICAgICAgIEltYWdlQmFja2luZyBp cyB1c2VkIGZvciBhIGxheWVyIHdob3NlIGNvbnRlbnQgaXMgYSBzaW1wbGUgSW1hZ2Ugb2JqZWN0 LgorICAgICAgICBJbWFnZSdzIHBpeGVsIGRhdGEgaXMgcmFzdGVyaXplZCBhbmQgYWdhaW4gbWFu YWdlZCB0aHJvdWdoCisgICAgICAgIENvb3JkaW5hdGVkQmFja2luZ1N0b3JlIGZvciByZW5kZXJp bmcuCisKKyAgICAgICAgQWxsIHRoZXNlIGNsYXNzZXMsIGFsb25nIHdpdGggdGhlIENvbXBvc2l0 aW9uTGF5ZXIgY2xhc3MsIHNob3VsZCBub3cgYmUKKyAgICAgICAgY29uc3RydWN0ZWQgd2l0aCBh IGZhY3RvcnkgZnVuY3Rpb24gdGhhdCByZXR1cm5zIGFuIG9iamVjdCB0aGF0IGRlcml2ZXMKKyAg ICAgICAgdGhlIGNsYXNzLXNwZWNpZmljIEltcGwgaW50ZXJmYWNlLiBUaGlzIHdpbGwgYWxsb3cg Zm9yIHNpbXBsZXIKKyAgICAgICAgaW1wbGVtZW50YXRpb24gb2YgZGlmZmVyZW50IGFwcHJvYWNo ZXMgaW4gcGFyYWxsZWwuIFRoZSBUZXh0dXJlTWFwcGVyCisgICAgICAgIHZhcmlhbnRzIHdpbGwg YmUgdGhlIGZpcnN0IG9uZXMsIHJlcGxpY2F0aW5nIHRoZSBjdXJyZW50IGJlaGF2aW9yIGFzIGl0 CisgICAgICAgIGlzIGltcGxlbWVudGVkIGFjcm9zcyBjbGFzc2VzIGluIHRoZSBDb29yZGluYXRl ZEdyYXBoaWNzIGFuZAorICAgICAgICBUZXh0dXJlTWFwcGVyIGxheWVycy4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL25pY29zaWEvTmljb3NpYVBsYXRmb3JtTGF5ZXIuY3BwOgorICAg ICAgICAoTmljb3NpYTo6Q29tcG9zaXRpb25MYXllcjo6Q29tcG9zaXRpb25MYXllcik6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvbmljb3NpYS9OaWNvc2lhUGxhdGZvcm1MYXllci5oOgor ICAgICAgICAoTmljb3NpYTo6UGxhdGZvcm1MYXllcjo6aXNDb250ZW50TGF5ZXIgY29uc3QpOgor ICAgICAgICAoTmljb3NpYTo6Q29tcG9zaXRpb25MYXllcjo6SW1wbDo6aXNUZXh0dXJlTWFwcGVy SW1wbCBjb25zdCk6CisgICAgICAgIChOaWNvc2lhOjpDb21wb3NpdGlvbkxheWVyOjpjcmVhdGUp OgorICAgICAgICAoTmljb3NpYTo6Q29tcG9zaXRpb25MYXllcjo6aW1wbCBjb25zdCk6CisgICAg ICAgIChOaWNvc2lhOjpDb250ZW50TGF5ZXI6OkltcGw6OmlzVGV4dHVyZU1hcHBlckltcGwgY29u c3QpOgorICAgICAgICAoTmljb3NpYTo6Q29udGVudExheWVyOjpjcmVhdGUpOgorICAgICAgICAo Tmljb3NpYTo6Q29udGVudExheWVyOjppbXBsIGNvbnN0KToKKyAgICAgICAgKE5pY29zaWE6OkJh Y2tpbmdTdG9yZTo6SW1wbDo6aXNUZXh0dXJlTWFwcGVySW1wbCBjb25zdCk6CisgICAgICAgIChO aWNvc2lhOjpCYWNraW5nU3RvcmU6OmNyZWF0ZSk6CisgICAgICAgIChOaWNvc2lhOjpCYWNraW5n U3RvcmU6OmltcGwgY29uc3QpOgorICAgICAgICAoTmljb3NpYTo6SW1hZ2VCYWNraW5nOjpJbXBs Ojppc1RleHR1cmVNYXBwZXJJbXBsIGNvbnN0KToKKyAgICAgICAgKE5pY29zaWE6OkltYWdlQmFj a2luZzo6Y3JlYXRlKToKKyAgICAgICAgKE5pY29zaWE6OkltYWdlQmFja2luZzo6aW1wbCBjb25z dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3Jk aW5hdGVkR3JhcGhpY3NMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdy YXBoaWNzTGF5ZXI6OkNvb3JkaW5hdGVkR3JhcGhpY3NMYXllcik6CisKIDIwMTgtMDgtMDUgIFl1 c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CiAKICAgICAgICAgQWRkIHN1cHBv cnQgZm9yIG1pY3JvdGFza3MgaW4gd29ya2VycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvbmljb3NpYS9OaWNvc2lhUGxhdGZvcm1MYXllci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL05pY29zaWFQbGF0Zm9ybUxheWVy LmNwcAppbmRleCA5YjMyODIzMmM5NGNhNGNiOGYwYWVlMDU5Y2FmNDc3ZjVkZWRmYTU1Li42M2M2 MjYyYjlmNzgzN2I0YTNjYTM5MGZlNGEwZGIzYjQ2ZTg2NTg4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL05pY29zaWFQbGF0Zm9ybUxheWVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL05pY29zaWFQ bGF0Zm9ybUxheWVyLmNwcApAQCAtMzgsMTEgKzM4LDE0IEBAIFBsYXRmb3JtTGF5ZXI6OlBsYXRm b3JtTGF5ZXIodWludDY0X3QgaWQpCiAKIFBsYXRmb3JtTGF5ZXI6On5QbGF0Zm9ybUxheWVyKCkg PSBkZWZhdWx0OwogCi1Db21wb3NpdGlvbkxheWVyOjpDb21wb3NpdGlvbkxheWVyKHVpbnQ2NF90 IGlkKQorCitDb21wb3NpdGlvbkxheWVyOjpDb21wb3NpdGlvbkxheWVyKHVpbnQ2NF90IGlkLCBj b25zdCBJbXBsOjpGYWN0b3J5JiBmYWN0b3J5KQogICAgIDogUGxhdGZvcm1MYXllcihpZCkKKyAg ICAsIG1faW1wbChmYWN0b3J5KGlkLCAqdGhpcykpCiB7CiB9CiAKIENvbXBvc2l0aW9uTGF5ZXI6 On5Db21wb3NpdGlvbkxheWVyKCkgPSBkZWZhdWx0OworQ29tcG9zaXRpb25MYXllcjo6SW1wbDo6 fkltcGwoKSA9IGRlZmF1bHQ7CiAKIH0gLy8gbmFtZXNwYWNlIE5pY29zaWEKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL25pY29zaWEvTmljb3NpYVBsYXRmb3Jt TGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL25pY29zaWEvTmljb3Np YVBsYXRmb3JtTGF5ZXIuaAppbmRleCBjMjA2ZTliNzQ0MWU1OTUzZDhlZjdlNWQ3YzJjYjU4ZmNj ODczZWE1Li43ODBhY2ViNzI3NDQ0N2Q5ZTQ5MzU4OGUwOWM4NDNkNzIwMGUyOTk0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL05pY29zaWFQbGF0 Zm9ybUxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvbmljb3Np YS9OaWNvc2lhUGxhdGZvcm1MYXllci5oCkBAIC0zNiw2ICszNiw3IEBACiAjaW5jbHVkZSAiRmxv YXRTaXplLmgiCiAjaW5jbHVkZSAiVGV4dHVyZU1hcHBlckFuaW1hdGlvbi5oIgogI2luY2x1ZGUg IlRyYW5zZm9ybWF0aW9uTWF0cml4LmgiCisjaW5jbHVkZSA8d3RmL0Z1bmN0aW9uLmg+CiAjaW5j bHVkZSA8d3RmL0xvY2suaD4KICNpbmNsdWRlIDx3dGYvVGhyZWFkU2FmZVJlZkNvdW50ZWQuaD4K ICNpbmNsdWRlIDx3dGYvVHlwZUNhc3RzLmg+CkBAIC00Nyw2ICs0OCw3IEBAIHB1YmxpYzoKICAg ICB2aXJ0dWFsIH5QbGF0Zm9ybUxheWVyKCk7CiAKICAgICB2aXJ0dWFsIGJvb2wgaXNDb21wb3Np dGlvbkxheWVyKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIGJvb2wgaXND b250ZW50TGF5ZXIoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogCiAgICAgdWludDY0X3QgaWQo KSBjb25zdCB7IHJldHVybiBtX2lkOyB9CiAKQEAgLTYwLDE2ICs2MiwyOSBAQCBwcm90ZWN0ZWQ6 CiAgICAgfSBtX3N0YXRlOwogfTsKIAorY2xhc3MgQ29udGVudExheWVyOworY2xhc3MgQmFja2lu Z1N0b3JlOworY2xhc3MgSW1hZ2VCYWNraW5nOworCiBjbGFzcyBDb21wb3NpdGlvbkxheWVyIDog cHVibGljIFBsYXRmb3JtTGF5ZXIgewogcHVibGljOgotICAgIHN0YXRpYyBSZWY8Q29tcG9zaXRp b25MYXllcj4gY3JlYXRlKHVpbnQ2NF90IGlkKQorICAgIGNsYXNzIEltcGwgeworICAgIHB1Ymxp YzoKKyAgICAgICAgdXNpbmcgRmFjdG9yeSA9IFdURjo6RnVuY3Rpb248c3RkOjp1bmlxdWVfcHRy PEltcGw+KHVpbnQ2NF90LCBDb21wb3NpdGlvbkxheWVyJik+OworCisgICAgICAgIHZpcnR1YWwg fkltcGwoKTsKKyAgICAgICAgdmlydHVhbCBib29sIGlzVGV4dHVyZU1hcHBlckltcGwoKSBjb25z dCB7IHJldHVybiBmYWxzZTsgfQorICAgIH07CisKKyAgICBzdGF0aWMgUmVmPENvbXBvc2l0aW9u TGF5ZXI+IGNyZWF0ZSh1aW50NjRfdCBpZCwgY29uc3QgSW1wbDo6RmFjdG9yeSYgZmFjdG9yeSkK ICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZigqbmV3IENvbXBvc2l0aW9uTGF5ZXIoaWQp KTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgQ29tcG9zaXRpb25MYXllcihpZCwgZmFj dG9yeSkpOwogICAgIH0KICAgICB2aXJ0dWFsIH5Db21wb3NpdGlvbkxheWVyKCk7Ci0KICAgICBi b29sIGlzQ29tcG9zaXRpb25MYXllcigpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHRydWU7IH0K IAorICAgIEltcGwmIGltcGwoKSBjb25zdCB7IHJldHVybiAqbV9pbXBsOyB9CisKICAgICBzdHJ1 Y3QgTGF5ZXJTdGF0ZSB7CiAgICAgICAgIHN0cnVjdCBEZWx0YSB7CiAgICAgICAgICAgICBEZWx0 YSgpID0gZGVmYXVsdDsKQEAgLTkxLDYgKzEwNiw5IEBAIHB1YmxpYzoKICAgICAgICAgICAgICAg ICAgICAgYm9vbCBtYXNrQ2hhbmdlZCA6IDE7CiAgICAgICAgICAgICAgICAgICAgIGJvb2wgcmVw bGljYUNoYW5nZWQgOiAxOwogICAgICAgICAgICAgICAgICAgICBib29sIGZsYWdzQ2hhbmdlZCA6 IDE7CisgICAgICAgICAgICAgICAgICAgIGJvb2wgY29udGVudExheWVyQ2hhbmdlZCA6IDE7Cisg ICAgICAgICAgICAgICAgICAgIGJvb2wgYmFja2luZ1N0b3JlQ2hhbmdlZCA6IDE7CisgICAgICAg ICAgICAgICAgICAgIGJvb2wgaW1hZ2VCYWNraW5nQ2hhbmdlZCA6IDE7CiAgICAgICAgICAgICAg ICAgICAgIGJvb2wgcmVwYWludENvdW50ZXJDaGFuZ2VkIDogMTsKICAgICAgICAgICAgICAgICAg ICAgYm9vbCBkZWJ1Z0JvcmRlckNoYW5nZWQgOiAxOwogICAgICAgICAgICAgICAgIH07CkBAIC0x NDAsNiArMTU4LDEwIEBAIHB1YmxpYzoKICAgICAgICAgUmVmUHRyPENvbXBvc2l0aW9uTGF5ZXI+ IHJlcGxpY2E7CiAgICAgICAgIFJlZlB0cjxDb21wb3NpdGlvbkxheWVyPiBtYXNrOwogCisgICAg ICAgIFJlZlB0cjxDb250ZW50TGF5ZXI+IGNvbnRlbnRMYXllcjsKKyAgICAgICAgUmVmUHRyPEJh Y2tpbmdTdG9yZT4gYmFja2luZ1N0b3JlOworICAgICAgICBSZWZQdHI8SW1hZ2VCYWNraW5nPiBp bWFnZUJhY2tpbmc7CisKICAgICAgICAgc3RydWN0IFJlcGFpbnRDb3VudGVyIHsKICAgICAgICAg ICAgIHVuc2lnbmVkIGNvdW50IHsgMCB9OwogICAgICAgICAgICAgYm9vbCB2aXNpYmxlIHsgZmFs c2UgfTsKQEAgLTE1OSwxMyArMTgxLDg4IEBAIHB1YmxpYzoKICAgICB9CiAKIHByaXZhdGU6Ci0g ICAgZXhwbGljaXQgQ29tcG9zaXRpb25MYXllcih1aW50NjRfdCk7CisgICAgQ29tcG9zaXRpb25M YXllcih1aW50NjRfdCwgY29uc3QgSW1wbDo6RmFjdG9yeSYpOworCisgICAgc3RkOjp1bmlxdWVf cHRyPEltcGw+IG1faW1wbDsKIAogICAgIHN0cnVjdCB7CiAgICAgICAgIExheWVyU3RhdGUgcGVu ZGluZzsKICAgICB9IG1fc3RhdGU7CiB9OwogCitjbGFzcyBDb250ZW50TGF5ZXIgOiBwdWJsaWMg UGxhdGZvcm1MYXllciB7CitwdWJsaWM6CisgICAgY2xhc3MgSW1wbCB7CisgICAgcHVibGljOgor ICAgICAgICB1c2luZyBGYWN0b3J5ID0gV1RGOjpGdW5jdGlvbjxzdGQ6OnVuaXF1ZV9wdHI8SW1w bD4oQ29udGVudExheWVyJik+OworCisgICAgICAgIHZpcnR1YWwgfkltcGwoKTsKKyAgICAgICAg dmlydHVhbCBib29sIGlzVGV4dHVyZU1hcHBlckltcGwoKSBjb25zdCB7IHJldHVybiBmYWxzZTsg fQorICAgIH07CisKKyAgICBzdGF0aWMgUmVmPENvbnRlbnRMYXllcj4gY3JlYXRlKGNvbnN0IElt cGw6OkZhY3RvcnkmIGZhY3RvcnkpCisgICAgeworICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5l dyBDb250ZW50TGF5ZXIoZmFjdG9yeSkpOworICAgIH0KKyAgICB2aXJ0dWFsIH5Db250ZW50TGF5 ZXIoKTsKKyAgICBib29sIGlzQ29udGVudExheWVyKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4g dHJ1ZTsgfQorCisgICAgSW1wbCYgaW1wbCgpIGNvbnN0IHsgcmV0dXJuICptX2ltcGw7IH0KKwor cHJpdmF0ZToKKyAgICBDb250ZW50TGF5ZXIoY29uc3QgSW1wbDo6RmFjdG9yeSYpOworCisgICAg c3RkOjp1bmlxdWVfcHRyPEltcGw+IG1faW1wbDsKK307CisKK2NsYXNzIEJhY2tpbmdTdG9yZSA6 IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxCYWNraW5nU3RvcmU+IHsKK3B1YmxpYzoKKyAg ICBjbGFzcyBJbXBsIHsKKyAgICBwdWJsaWM6CisgICAgICAgIHVzaW5nIEZhY3RvcnkgPSBXVEY6 OkZ1bmN0aW9uPHN0ZDo6dW5pcXVlX3B0cjxJbXBsPihCYWNraW5nU3RvcmUmKT47CisKKyAgICAg ICAgdmlydHVhbCB+SW1wbCgpOworICAgICAgICB2aXJ0dWFsIGJvb2wgaXNUZXh0dXJlTWFwcGVy SW1wbCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgfTsKKworICAgIHN0YXRpYyBSZWY8 QmFja2luZ1N0b3JlPiBjcmVhdGUoY29uc3QgSW1wbDo6RmFjdG9yeSYgZmFjdG9yeSkKKyAgICB7 CisgICAgICAgIHJldHVybiBhZG9wdFJlZigqbmV3IEJhY2tpbmdTdG9yZShmYWN0b3J5KSk7Cisg ICAgfQorICAgIHZpcnR1YWwgfkJhY2tpbmdTdG9yZSgpOworCisgICAgSW1wbCYgaW1wbCgpIGNv bnN0IHsgcmV0dXJuICptX2ltcGw7IH0KKworcHJpdmF0ZToKKyAgICBCYWNraW5nU3RvcmUoY29u c3QgSW1wbDo6RmFjdG9yeSYpOworCisgICAgc3RkOjp1bmlxdWVfcHRyPEltcGw+IG1faW1wbDsK K307CisKK2NsYXNzIEltYWdlQmFja2luZyA6IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxJ bWFnZUJhY2tpbmc+IHsKK3B1YmxpYzoKKyAgICBjbGFzcyBJbXBsIHsKKyAgICBwdWJsaWM6Cisg ICAgICAgIHVzaW5nIEZhY3RvcnkgPSBXVEY6OkZ1bmN0aW9uPHN0ZDo6dW5pcXVlX3B0cjxJbXBs PihJbWFnZUJhY2tpbmcmKT47CisKKyAgICAgICAgdmlydHVhbCB+SW1wbCgpOworICAgICAgICB2 aXJ0dWFsIGJvb2wgaXNUZXh0dXJlTWFwcGVySW1wbCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9 CisgICAgfTsKKworICAgIHN0YXRpYyBSZWY8SW1hZ2VCYWNraW5nPiBjcmVhdGUoY29uc3QgSW1w bDo6RmFjdG9yeSYgZmFjdG9yeSkKKyAgICB7CisgICAgICAgIHJldHVybiBhZG9wdFJlZigqbmV3 IEltYWdlQmFja2luZyhmYWN0b3J5KSk7CisgICAgfQorICAgIHZpcnR1YWwgfkltYWdlQmFja2lu ZygpOworCisgICAgSW1wbCYgaW1wbCgpIGNvbnN0IHsgcmV0dXJuICptX2ltcGw7IH0KKworcHJp dmF0ZToKKyAgICBJbWFnZUJhY2tpbmcoY29uc3QgSW1wbDo6RmFjdG9yeSYpOworCisgICAgc3Rk Ojp1bmlxdWVfcHRyPEltcGw+IG1faW1wbDsKK307CisKIH0gLy8gbmFtZXNwYWNlIE5pY29zaWEK IAogI2RlZmluZSBTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX05JQ09TSUFfUExBVEZPUk1MQVlFUihU b0NsYXNzTmFtZSwgcHJlZGljYXRlKSBcCkBAIC0xNzQsMyArMjcxLDI0IEBAIHByaXZhdGU6CiAg ICAgU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19FTkQoKQogCiBTUEVDSUFMSVpFX1RZUEVfVFJBSVRT X05JQ09TSUFfUExBVEZPUk1MQVlFUihDb21wb3NpdGlvbkxheWVyLCBpc0NvbXBvc2l0aW9uTGF5 ZXIoKSk7CitTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX05JQ09TSUFfUExBVEZPUk1MQVlFUihDb250 ZW50TGF5ZXIsIGlzQ29udGVudExheWVyKCkpOworCisjZGVmaW5lIFNQRUNJQUxJWkVfVFlQRV9U UkFJVFNfTklDT1NJQV9DT01QT1NJVElPTkxBWUVSX0lNUEwoVG9DbGFzc05hbWUsIHByZWRpY2F0 ZSkgXAorICAgIFNQRUNJQUxJWkVfVFlQRV9UUkFJVFNfQkVHSU4oTmljb3NpYTo6VG9DbGFzc05h bWUpIFwKKyAgICBzdGF0aWMgYm9vbCBpc1R5cGUoY29uc3QgTmljb3NpYTo6Q29tcG9zaXRpb25M YXllcjo6SW1wbCYgaW1wbCkgeyByZXR1cm4gaW1wbC5wcmVkaWNhdGU7IH0gXAorICAgIFNQRUNJ QUxJWkVfVFlQRV9UUkFJVFNfRU5EKCkKKworI2RlZmluZSBTUEVDSUFMSVpFX1RZUEVfVFJBSVRT X05JQ09TSUFfQ09OVEVOVExBWUVSX0lNUEwoVG9DbGFzc05hbWUsIHByZWRpY2F0ZSkgXAorICAg IFNQRUNJQUxJWkVfVFlQRV9UUkFJVFNfQkVHSU4oTmljb3NpYTo6VG9DbGFzc05hbWUpIFwKKyAg ICBzdGF0aWMgYm9vbCBpc1R5cGUoY29uc3QgTmljb3NpYTo6Q29udGVudExheWVyOjpJbXBsJiBp bXBsKSB7IHJldHVybiBpbXBsLnByZWRpY2F0ZTsgfSBcCisgICAgU1BFQ0lBTElaRV9UWVBFX1RS QUlUU19FTkQoKQorCisjZGVmaW5lIFNQRUNJQUxJWkVfVFlQRV9UUkFJVFNfTklDT1NJQV9CQUNL SU5HU1RPUkVfSU1QTChUb0NsYXNzTmFtZSwgcHJlZGljYXRlKSBcCisgICAgU1BFQ0lBTElaRV9U WVBFX1RSQUlUU19CRUdJTihOaWNvc2lhOjpUb0NsYXNzTmFtZSkgXAorICAgIHN0YXRpYyBib29s IGlzVHlwZShjb25zdCBOaWNvc2lhOjpCYWNraW5nU3RvcmU6OkltcGwmIGltcGwpIHsgcmV0dXJu IGltcGwucHJlZGljYXRlOyB9IFwKKyAgICBTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0VORCgpCisK KyNkZWZpbmUgU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19OSUNPU0lBX0lNQUdFQkFDS0lOR19JTVBM KFRvQ2xhc3NOYW1lLCBwcmVkaWNhdGUpIFwKKyAgICBTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0JF R0lOKE5pY29zaWE6OlRvQ2xhc3NOYW1lKSBcCisgICAgc3RhdGljIGJvb2wgaXNUeXBlKGNvbnN0 IE5pY29zaWE6OkltYWdlQmFja2luZzo6SW1wbCYgaW1wbCkgeyByZXR1cm4gaW1wbC5wcmVkaWNh dGU7IH0gXAorICAgIFNQRUNJQUxJWkVfVFlQRV9UUkFJVFNfRU5EKCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGlu YXRlZEdyYXBoaWNzTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv dGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5jcHAKaW5kZXggOTgx NThjNzUzZTRiMTk4NzhkZWYxOTg3NjM0NTIwYjNmZTIwMjFlNi4uMzZkODQxZjNmNGExNTliNDkz YzA4MDhiMzRhNWUyOTVkNzY3M2M3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5h dGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5jcHAKQEAgLTEyMSw2ICsxMjEsMTMgQEAgdm9p ZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmRpZENoYW5nZUdlb21ldHJ5KCkKICAgICBzZXRT aG91bGRVcGRhdGVWaXNpYmxlUmVjdCgpOwogfQogCisvLyBGSVhNRTogdGhpcyBpcyBhIHRlbXBv cmFyeSBoZWxwZXIgY2xhc3MgdG8ga2VlcCBOaWNvc2lhOjpDb21wb3NpdGlvbkxheWVyIGNyZWF0 aW9uIHdvcmtpbmcuCitjbGFzcyBDb21wb3NpdGlvbkxheWVyTm9vcEltcGwgZmluYWwgOiBwdWJs aWMgTmljb3NpYTo6Q29tcG9zaXRpb25MYXllcjo6SW1wbCB7CitwdWJsaWM6CisgICAgQ29tcG9z aXRpb25MYXllck5vb3BJbXBsKCkgPSBkZWZhdWx0OworICAgIHZpcnR1YWwgfkNvbXBvc2l0aW9u TGF5ZXJOb29wSW1wbCgpID0gZGVmYXVsdDsKK307CisKIENvb3JkaW5hdGVkR3JhcGhpY3NMYXll cjo6Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyKFR5cGUgbGF5ZXJUeXBlLCBHcmFwaGljc0xheWVy Q2xpZW50JiBjbGllbnQpCiAgICAgOiBHcmFwaGljc0xheWVyKGxheWVyVHlwZSwgY2xpZW50KQog I2lmbmRlZiBOREVCVUcKQEAgLTE0Nyw3ICsxNTQsMTEgQEAgQ29vcmRpbmF0ZWRHcmFwaGljc0xh eWVyOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXIoVHlwZSBsYXllclR5cGUsIEdyYXBoaWNzTGF5 ZXIKICAgICBzdGF0aWMgQ29vcmRpbmF0ZWRMYXllcklEIG5leHRMYXllcklEID0gMTsKICAgICBt X2lkID0gbmV4dExheWVySUQrKzsKIAotICAgIG1fbmljb3NpYS5sYXllciA9IE5pY29zaWE6OkNv bXBvc2l0aW9uTGF5ZXI6OmNyZWF0ZShtX2lkKTsKKyAgICBtX25pY29zaWEubGF5ZXIgPSBOaWNv c2lhOjpDb21wb3NpdGlvbkxheWVyOjpjcmVhdGUobV9pZCwKKyAgICAgICAgW10odWludDY0X3Qs IE5pY29zaWE6OkNvbXBvc2l0aW9uTGF5ZXImKQorICAgICAgICB7CisgICAgICAgICAgICByZXR1 cm4gc3RkOjptYWtlX3VuaXF1ZTxDb21wb3NpdGlvbkxheWVyTm9vcEltcGw+KCk7CisgICAgICAg IH0pOwogfQogCiBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6On5Db29yZGluYXRlZEdyYXBoaWNz TGF5ZXIoKQo=