204626 2019-11-26 10:22:20 -0800 Drop ActiveDOMObject::shouldPreventEnteringBackForwardCache_DEPRECATED() 2019-11-26 17:54:21 -0800 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 202293 1 cdumez cdumez achristensen beidson dbates esprehn+autocc ews-watchlist ggaren kangil.han rniwa webkit-bug-importer youennf oldest_to_newest 1593712 0 cdumez 2019-11-26 10:22:20 -0800 Drop ActiveDOMObject::shouldPreventEnteringBackForwardCache_DEPRECATED() now that it is no longer used. 1593716 1 384366 cdumez 2019-11-26 11:03:12 -0800 Created attachment 384366 Patch 1593768 2 384366 rniwa 2019-11-26 17:21:49 -0800 Comment on attachment 384366 Patch Nice! 1593772 3 384366 cdumez 2019-11-26 17:53:04 -0800 Comment on attachment 384366 Patch Clearing flags on attachment: 384366 Committed r252894: <https://trac.webkit.org/changeset/252894> 1593773 4 cdumez 2019-11-26 17:53:06 -0800 All reviewed patches have been landed. Closing bug. 1593774 5 webkit-bug-importer 2019-11-26 17:54:21 -0800 <rdar://problem/57497175> 384366 2019-11-26 11:03:12 -0800 2019-11-26 17:53:04 -0800 Patch bug-204626-20191126110301.patch text/plain 14665 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyODg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI4NWZiMWZjOTBjNGNi NzNkNTdmYzI2ODVjZmQ4YTcxNzJkNzA5Ni4uZmE4MTExODcwMmQ3OTY1MDY5NDQ5MWFiZWFkZWRi ODhmZjJhZDA2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTExLTI2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRHJvcCBBY3RpdmVET01PYmpl Y3Q6OnNob3VsZFByZXZlbnRFbnRlcmluZ0JhY2tGb3J3YXJkQ2FjaGVfREVQUkVDQVRFRCgpCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ2MjYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEcm9wIEFjdGl2 ZURPTU9iamVjdDo6c2hvdWxkUHJldmVudEVudGVyaW5nQmFja0ZvcndhcmRDYWNoZV9ERVBSRUNB VEVEKCkgbm93IHRoYXQgaXQgaXMgbm8gbG9uZ2VyCisgICAgICAgIHVzZWQuCisKKyAgICAgICAg KiBkb20vQWN0aXZlRE9NT2JqZWN0Lmg6CisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6CisgICAg ICAgIChXZWJDb3JlOjpEb2N1bWVudDo6c2hvdWxkUHJldmVudEVudGVyaW5nQmFja0ZvcndhcmRD YWNoZUZvclRlc3RpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnByZXZl bnRFbnRlcmluZ0JhY2tGb3J3YXJkQ2FjaGVGb3JUZXN0aW5nKToKKyAgICAgICAgKiBkb20vU2Ny aXB0RXhlY3V0aW9uQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRFeGVjdXRp b25Db250ZXh0Ojpmb3JFYWNoQWN0aXZlRE9NT2JqZWN0IGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OmNhblN1c3BlbmRBY3RpdmVET01PYmplY3RzRm9y RG9jdW1lbnRTdXNwZW5zaW9uKTogRGVsZXRlZC4KKyAgICAgICAgKiBkb20vU2NyaXB0RXhlY3V0 aW9uQ29udGV4dC5oOgorICAgICAgICAqIGhpc3RvcnkvQmFja0ZvcndhcmRDYWNoZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpjYW5DYWNoZUZyYW1lKToKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVy bmFscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6OkludGVybmFscyk6CisgICAg ICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6OnByZXZlbnREb2N1bWVudEZyb21FbnRlcmluZ0JhY2tG b3J3YXJkQ2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxzOjpwcmV2ZW50RG9jdW1l bnRGb3JFbnRlcmluZ0JhY2tGb3J3YXJkQ2FjaGUpOiBEZWxldGVkLgorICAgICAgICAqIHRlc3Rp bmcvSW50ZXJuYWxzLmg6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuaWRsOgorCiAyMDE5 LTExLTI2ICB5b3Vlbm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBBbGxv dyBiL2YgY2FjaGUgaW4gY2FzZSBvZiBjb25uZWN0ZWQgcGVlciBjb25uZWN0aW9ucwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExl Z2FjeS9tYWMvQ2hhbmdlTG9nCmluZGV4IDZjMDU0YjI1YjUxMTI4ZWM0MzRlMDRlNTUxNmRlOTM2 NDQwYWRjZTkuLjBiNThmZjVhOTdiZjUxY2ZjZWJiYTQ1NGU5NDk5ODMxNTBlNWNiNzQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxOS0xMS0yNiAgQ2hy aXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIERyb3AgQWN0aXZlRE9NT2Jq ZWN0OjpzaG91bGRQcmV2ZW50RW50ZXJpbmdCYWNrRm9yd2FyZENhY2hlX0RFUFJFQ0FURUQoKQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA0NjI2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3 L1dlYkZyYW1lLm1tOgorICAgICAgICAoLVtXZWJGcmFtZSBfY2FjaGVhYmlsaXR5RGljdGlvbmFy eV0pOgorCiAyMDE5LTExLTIxICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZW1vdmUgdW5uZWVkZWQgY29kZSB0aGF0IGFubm90YXRlZCBET01IVE1MRWxlbWVu dCBhcyBjb25mb3JtaW5nIHRvIFVJVGV4dElucHV0VHJhaXRzIHByb3RvY29sCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9kb20vQWN0aXZlRE9NT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9k b20vQWN0aXZlRE9NT2JqZWN0LmgKaW5kZXggOTI5ZGYwMGIxMTEzNzgzZWFmOGViNzk4NzYzNjJm NjU5NmU3N2I0OC4uOGE0MjE2MTQ2YTZiYTg1MDEyYWMyOGFmOTdiZmQ4NzYzMTRhYzY2MCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0FjdGl2ZURPTU9iamVjdC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9BY3RpdmVET01PYmplY3QuaApAQCAtNjMsOSArNjMsOCBAQCBwdWJsaWM6 CiAKICAgICB2aXJ0dWFsIGNvbnN0IGNoYXIqIGFjdGl2ZURPTU9iamVjdE5hbWUoKSBjb25zdCA9 IDA7CiAKLSAgICAvLyBUaGVzZSB0aHJlZSBmdW5jdGlvbnMgbXVzdCBub3QgaGF2ZSBhIHNpZGUg ZWZmZWN0IG9mIGNyZWF0aW5nIG9yIGRlc3Ryb3lpbmcKKyAgICAvLyBUaGVzZSBmdW5jdGlvbnMg bXVzdCBub3QgaGF2ZSBhIHNpZGUgZWZmZWN0IG9mIGNyZWF0aW5nIG9yIGRlc3Ryb3lpbmcKICAg ICAvLyBhbnkgQWN0aXZlRE9NT2JqZWN0LiBUaGF0IG1lYW5zIHRoZXkgbXVzdCBub3QgcmVzdWx0 IGluIGNhbGxzIHRvIGFyYml0cmFyeSBKYXZhU2NyaXB0LgotICAgIHZpcnR1YWwgYm9vbCBzaG91 bGRQcmV2ZW50RW50ZXJpbmdCYWNrRm9yd2FyZENhY2hlX0RFUFJFQ0FURUQoKSBjb25zdCB7IHJl dHVybiBmYWxzZTsgfSAvLyBQbGVhc2UgZG8gbm90IGFkZCBuZXcgb3ZlcnJpZGVzIGZvciB0aGlz IGZ1bmN0aW9uLgogICAgIHZpcnR1YWwgdm9pZCBzdXNwZW5kKFJlYXNvbkZvclN1c3BlbnNpb24p OwogICAgIHZpcnR1YWwgdm9pZCByZXN1bWUoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZG9tL0RvY3VtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAppbmRleCAx YWEwMWMxMWE4MGEwMDA0YzVkZGNhYjBkYmIwYjZlZDNkZjFjZTg1Li44MjI1ZmQwNWMwMDcwODlh MzYzOWUwYzk1YjUyZWRlMGZlNTk2NGM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaApAQCAtNDg5LDYg KzQ4OSw5IEBAIHB1YmxpYzoKICAgICBTdGFuZGFsb25lU3RhdHVzIHhtbFN0YW5kYWxvbmVTdGF0 dXMoKSBjb25zdCB7IHJldHVybiBtX3htbFN0YW5kYWxvbmU7IH0KICAgICBib29sIGhhc1hNTERl Y2xhcmF0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9oYXNYTUxEZWNsYXJhdGlvbjsgfQogCisgICAg Ym9vbCBzaG91bGRQcmV2ZW50RW50ZXJpbmdCYWNrRm9yd2FyZENhY2hlRm9yVGVzdGluZygpIGNv bnN0IHsgcmV0dXJuIG1fc2hvdWxkUHJldmVudEVudGVyaW5nQmFja0ZvcndhcmRDYWNoZUZvclRl c3Rpbmc7IH0KKyAgICB2b2lkIHByZXZlbnRFbnRlcmluZ0JhY2tGb3J3YXJkQ2FjaGVGb3JUZXN0 aW5nKCkgeyBtX3Nob3VsZFByZXZlbnRFbnRlcmluZ0JhY2tGb3J3YXJkQ2FjaGVGb3JUZXN0aW5n ID0gdHJ1ZTsgfQorCiAgICAgdm9pZCBzZXRYTUxFbmNvZGluZyhjb25zdCBTdHJpbmcmIGVuY29k aW5nKSB7IG1feG1sRW5jb2RpbmcgPSBlbmNvZGluZzsgfSAvLyByZWFkLW9ubHkgcHJvcGVydHks IG9ubHkgdG8gYmUgc2V0IGZyb20gWE1MRG9jdW1lbnRQYXJzZXIKICAgICBXRUJDT1JFX0VYUE9S VCBFeGNlcHRpb25Pcjx2b2lkPiBzZXRYTUxWZXJzaW9uKGNvbnN0IFN0cmluZyYpOwogICAgIFdF QkNPUkVfRVhQT1JUIHZvaWQgc2V0WE1MU3RhbmRhbG9uZShib29sKTsKQEAgLTIwNzgsNiArMjA4 MSw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2hhc0V2YWx1YXRlZFVzZXJBZ2VudFNjcmlwdHMg eyBmYWxzZSB9OwogICAgIGJvb2wgbV9pc1J1bm5pbmdVc2VyU2NyaXB0cyB7IGZhbHNlIH07CiAg ICAgYm9vbCBtX21heUJlRGV0YWNoZWRGcm9tRnJhbWUgeyB0cnVlIH07CisgICAgYm9vbCBtX3No b3VsZFByZXZlbnRFbnRlcmluZ0JhY2tGb3J3YXJkQ2FjaGVGb3JUZXN0aW5nIHsgZmFsc2UgfTsK ICNpZiBFTkFCTEUoQVBQTEVfUEFZKQogICAgIGJvb2wgbV9oYXNTdGFydGVkQXBwbGVQYXlTZXNz aW9uIHsgZmFsc2UgfTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1Nj cmlwdEV4ZWN1dGlvbkNvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4ZWN1 dGlvbkNvbnRleHQuY3BwCmluZGV4IDYzYzg1NDIxNmNkZGMzZmI2Njg1NjQyMzlkZTA5YTdmN2E5 Nzk3MTcuLmZhNjhlYjg2NjRkM2M0MzA3NzZjMTIxNzExODI2NmNiYmU0OWYzMzkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5jcHAKQEAgLTIyMiwzOCAr MjIyLDExIEBAIHZvaWQgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6ZGlkTG9hZFJlc291cmNlU3lu Y2hyb25vdXNseSgpCiB7CiB9CiAKLWJvb2wgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6Y2FuU3Vz cGVuZEFjdGl2ZURPTU9iamVjdHNGb3JEb2N1bWVudFN1c3BlbnNpb24oVmVjdG9yPEFjdGl2ZURP TU9iamVjdCo+KiB1bnN1c3BlbmRhYmxlT2JqZWN0cykKLXsKLSAgICBjaGVja0NvbnNpc3RlbmN5 KCk7Ci0KLSAgICBib29sIGNhblN1c3BlbmQgPSB0cnVlOwotCi0gICAgZm9yRWFjaEFjdGl2ZURP TU9iamVjdChbJl0oYXV0byYgYWN0aXZlRE9NT2JqZWN0KSB7Ci0gICAgICAgIGlmIChhY3RpdmVE T01PYmplY3Quc2hvdWxkUHJldmVudEVudGVyaW5nQmFja0ZvcndhcmRDYWNoZV9ERVBSRUNBVEVE KCkpIHsKLSAgICAgICAgICAgIGNhblN1c3BlbmQgPSBmYWxzZTsKLSAgICAgICAgICAgIGlmICh1 bnN1c3BlbmRhYmxlT2JqZWN0cykKLSAgICAgICAgICAgICAgICB1bnN1c3BlbmRhYmxlT2JqZWN0 cy0+YXBwZW5kKCZhY3RpdmVET01PYmplY3QpOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAg ICAgICAgIHJldHVybiBTaG91bGRDb250aW51ZTo6Tm87Ci0gICAgICAgIH0KLSAgICAgICAgcmV0 dXJuIFNob3VsZENvbnRpbnVlOjpZZXM7Ci0gICAgfSk7Ci0KLSAgICBpZiAodW5zdXNwZW5kYWJs ZU9iamVjdHMpIHsKLSAgICAgICAgLy8gUmVtb3ZlIGFjdGl2ZURPTU9iamVjdHMgdGhhdCBoYXZl IGJlZW4gZGVzdHJveWVkIHdoaWxlIHdlIHdlcmUgaXRlcmF0aW5nIGFib3ZlLgotICAgICAgICB1 bnN1c3BlbmRhYmxlT2JqZWN0cy0+cmVtb3ZlQWxsTWF0Y2hpbmcoWyZdKGF1dG8qIGFjdGl2ZURP TU9iamVjdCkgewotICAgICAgICAgICAgcmV0dXJuICFtX2FjdGl2ZURPTU9iamVjdHMuY29udGFp bnMoYWN0aXZlRE9NT2JqZWN0KTsKLSAgICAgICAgfSk7Ci0gICAgfQotCi0gICAgcmV0dXJuIGNh blN1c3BlbmQ7Ci19Ci0KIHZvaWQgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6Zm9yRWFjaEFjdGl2 ZURPTU9iamVjdChjb25zdCBGdW5jdGlvbjxTaG91bGRDb250aW51ZShBY3RpdmVET01PYmplY3Qm KT4mIGFwcGx5KSBjb25zdAogewogICAgIC8vIEl0IGlzIG5vdCBhbGxvd2VkIHRvIHJ1biBhcmJp dHJhcnkgc2NyaXB0IG9yIGNvbnN0cnVjdCBuZXcgQWN0aXZlRE9NT2JqZWN0cyB3aGlsZSB3ZSBh cmUgaXRlcmF0aW5nIG92ZXIgQWN0aXZlRE9NT2JqZWN0cy4KICAgICAvLyBBbiBBU1NFUlRfV0lU SF9TRUNVUklUWV9JTVBMSUNBVElPTiBvciBSRUxFQVNFX0FTU0VSVCB3aWxsIGZpcmUgaWYgdGhp cyBoYXBwZW5zLCBidXQgaXQncyBpbXBvcnRhbnQgdG8gY29kZQotICAgIC8vIGNhblN1c3BlbmRB Y3RpdmVET01PYmplY3RzRm9yRG9jdW1lbnRTdXNwZW5zaW9uKCkgLyBzdXNwZW5kKCkgLyByZXN1 bWUoKSAvIHN0b3AoKSBmdW5jdGlvbnMgc28gaXQgd2lsbCBub3QgaGFwcGVuIQorICAgIC8vIHN1 c3BlbmQoKSAvIHJlc3VtZSgpIC8gc3RvcCgpIGZ1bmN0aW9ucyBzbyBpdCB3aWxsIG5vdCBoYXBw ZW4hCiAgICAgU2NyaXB0RGlzYWxsb3dlZFNjb3BlIHNjcmlwdERpc2FsbG93ZWRTY29wZTsKICAg ICBTZXRGb3JTY29wZTxib29sPiBhY3RpdmVET01PYmplY3RBZGRpdGlvbkZvcmJpZGRlblNjb3Bl KG1fYWN0aXZlRE9NT2JqZWN0QWRkaXRpb25Gb3JiaWRkZW4sIHRydWUpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oIGIvU291cmNlL1dl YkNvcmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaAppbmRleCA5NGI2YjNjYjI1YWZjZGNi ZGFkMmY5M2E5OTU3YjNmNjBkMzgzM2M5Li45MDQ3NDdlMWIyOTA2Mzg5MzA1MjMzYzgwNjc5M2I0 OGU3ZmEzYmUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9u Q29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0 LmgKQEAgLTEyNiwxMSArMTI2LDYgQEAgcHVibGljOgogCiAgICAgUHVibGljVVJMTWFuYWdlciYg cHVibGljVVJMTWFuYWdlcigpOwogCi0gICAgLy8gQWN0aXZlIG9iamVjdHMgYXJlIG5vdCBnYXJi YWdlIGNvbGxlY3RlZCBldmVuIGlmIGluYWNjZXNzaWJsZSwgZS5nLiBiZWNhdXNlIHRoZWlyIGFj dGl2aXR5IG1heSByZXN1bHQgaW4gY2FsbGJhY2tzIGJlaW5nIGludm9rZWQuCi0gICAgV0VCQ09S RV9FWFBPUlQgYm9vbCBjYW5TdXNwZW5kQWN0aXZlRE9NT2JqZWN0c0ZvckRvY3VtZW50U3VzcGVu c2lvbihWZWN0b3I8QWN0aXZlRE9NT2JqZWN0Kj4qIHVuc3VzcGVuZGFibGVPYmplY3RzID0gbnVs bHB0cik7Ci0KLSAgICAvLyBBY3RpdmUgb2JqZWN0cyBjYW4gYmUgYXNrZWQgdG8gc3VzcGVuZCBl dmVuIGlmIGNhblN1c3BlbmRBY3RpdmVET01PYmplY3RzRm9yRG9jdW1lbnRTdXNwZW5zaW9uKCkg cmV0dXJucyAnZmFsc2UnIC0KLSAgICAvLyBzdGVwLWJ5LXN0ZXAgSlMgZGVidWdnaW5nIGlzIG9u ZSBleGFtcGxlLgogICAgIHZpcnR1YWwgdm9pZCBzdXNwZW5kQWN0aXZlRE9NT2JqZWN0cyhSZWFz b25Gb3JTdXNwZW5zaW9uKTsKICAgICB2aXJ0dWFsIHZvaWQgcmVzdW1lQWN0aXZlRE9NT2JqZWN0 cyhSZWFzb25Gb3JTdXNwZW5zaW9uKTsKICAgICB2aXJ0dWFsIHZvaWQgc3RvcEFjdGl2ZURPTU9i amVjdHMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvQmFja0ZvcndhcmRD YWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0JhY2tGb3J3YXJkQ2FjaGUuY3BwCmlu ZGV4IDFkY2MwNmRkODZjZmU4YTYyMTA4ZWIxMmFiM2MxMTVjMmYwZTU4ODYuLjUyYzFjZTAwMmU5 NTI2NTFhMDIyMzg0MjQ5NTllNDlkM2NjMjkxNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2hpc3RvcnkvQmFja0ZvcndhcmRDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaGlzdG9y eS9CYWNrRm9yd2FyZENhY2hlLmNwcApAQCAtOTYsNiArOTYsMTEgQEAgc3RhdGljIGJvb2wgY2Fu Q2FjaGVGcmFtZShGcmFtZSYgZnJhbWUsIERpYWdub3N0aWNMb2dnaW5nQ2xpZW50JiBkaWFnbm9z dGljTG9nZ2kKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAorICAgIGlmIChmcmFtZS5k b2N1bWVudCgpLT5zaG91bGRQcmV2ZW50RW50ZXJpbmdCYWNrRm9yd2FyZENhY2hlRm9yVGVzdGlu ZygpKSB7CisgICAgICAgIFBDTE9HKCIgICAtQmFjay9Gb3J3YXJkIGNhY2hpbmcgaXMgZGlzYWJs ZWQgZm9yIHRlc3RpbmciKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKwogICAgIGlm ICghZnJhbWUuZG9jdW1lbnQoKS0+ZnJhbWUoKSkgewogICAgICAgICBQQ0xPRygiICAgLURvY3Vt ZW50IGlzIGRldGFjaGVkIGZyb20gZnJhbWUiKTsKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CkBAIC0xNjEsMTggKzE2Niw2IEBAIHN0YXRpYyBib29sIGNhbkNhY2hlRnJhbWUoRnJhbWUm IGZyYW1lLCBEaWFnbm9zdGljTG9nZ2luZ0NsaWVudCYgZGlhZ25vc3RpY0xvZ2dpCiAgICAgICAg IGlzQ2FjaGVhYmxlID0gZmFsc2U7CiAgICAgfQogCi0gICAgVmVjdG9yPEFjdGl2ZURPTU9iamVj dCo+IHVuc3VzcGVuZGFibGVPYmplY3RzOwotICAgIGlmIChmcmFtZS5kb2N1bWVudCgpICYmICFm cmFtZS5kb2N1bWVudCgpLT5jYW5TdXNwZW5kQWN0aXZlRE9NT2JqZWN0c0ZvckRvY3VtZW50U3Vz cGVuc2lvbigmdW5zdXNwZW5kYWJsZU9iamVjdHMpKSB7Ci0gICAgICAgIFBDTE9HKCIgICAtVGhl IGRvY3VtZW50IGNhbm5vdCBzdXNwZW5kIGl0cyBhY3RpdmUgRE9NIE9iamVjdHMiKTsKLSAgICAg ICAgZm9yIChhdXRvKiBhY3RpdmVET01PYmplY3QgOiB1bnN1c3BlbmRhYmxlT2JqZWN0cykgewot ICAgICAgICAgICAgUENMT0coIiAgICAtIFVuc3VzcGVuZGFibGU6ICIsIGFjdGl2ZURPTU9iamVj dC0+YWN0aXZlRE9NT2JqZWN0TmFtZSgpKTsKLSAgICAgICAgICAgIGRpYWdub3N0aWNMb2dnaW5n Q2xpZW50LmxvZ0RpYWdub3N0aWNNZXNzYWdlKERpYWdub3N0aWNMb2dnaW5nS2V5czo6dW5zdXNw ZW5kYWJsZURPTU9iamVjdEtleSgpLCBhY3RpdmVET01PYmplY3QtPmFjdGl2ZURPTU9iamVjdE5h bWUoKSwgU2hvdWxkU2FtcGxlOjpObyk7Ci0gICAgICAgICAgICBVTlVTRURfUEFSQU0oYWN0aXZl RE9NT2JqZWN0KTsKLSAgICAgICAgfQotICAgICAgICBsb2dCYWNrRm9yd2FyZENhY2hlRmFpbHVy ZURpYWdub3N0aWNNZXNzYWdlKGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50LCBEaWFnbm9zdGljTG9n Z2luZ0tleXM6OmNhbm5vdFN1c3BlbmRBY3RpdmVET01PYmplY3RzS2V5KCkpOwotICAgICAgICBp c0NhY2hlYWJsZSA9IGZhbHNlOwotICAgIH0KLQogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgaW52 ZXN0aWdhdGluZyBjYWNoaW5nIGZyYW1lcyB0aGF0IGhhdmUgYW4gYXNzb2NpYXRlZAogICAgIC8v IGFwcGxpY2F0aW9uIGNhY2hlLiA8cmRhcjovL3Byb2JsZW0vNTkxNzg5OT4gdHJhY2tzIHRoYXQg d29yay4KICAgICBpZiAoIWRvY3VtZW50TG9hZGVyLT5hcHBsaWNhdGlvbkNhY2hlSG9zdCgpLmNh bkNhY2hlSW5CYWNrRm9yd2FyZENhY2hlKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3Rlc3RpbmcvSW50ZXJuYWxzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxz LmNwcAppbmRleCBiOWQyYjUzN2M4ZjQ1ZDI2MmQ4NzAwMjVmZTM0ZmI4MGFjNWRhMjYxLi44N2Y3 M2FkNjBkOTY1M2NiYWEzYmVkNWUzMjU4OWNlNjE5ZjA5N2U5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGlu Zy9JbnRlcm5hbHMuY3BwCkBAIC01ODAsOCArNTgwLDYgQEAgSW50ZXJuYWxzOjpJbnRlcm5hbHMo RG9jdW1lbnQmIGRvY3VtZW50KQogICAgIH0KICNlbmRpZgogCi0gICAgbV91bnN1c3BlbmRhYmxl QWN0aXZlRE9NT2JqZWN0ID0gbnVsbHB0cjsKLQogI2lmIFBMQVRGT1JNKENPQ09BKSAmJiAgRU5B QkxFKFdFQl9BVURJTykKICAgICBBdWRpb0Rlc3RpbmF0aW9uQ29jb2E6OmNyZWF0ZU92ZXJyaWRl ID0gbnVsbHB0cjsKICNlbmRpZgpAQCAtOTM4LDI1ICs5MzYsMTAgQEAgdW5zaWduZWQgSW50ZXJu YWxzOjpiYWNrRm9yd2FyZENhY2hlU2l6ZSgpIGNvbnN0CiAgICAgcmV0dXJuIEJhY2tGb3J3YXJk Q2FjaGU6OnNpbmdsZXRvbigpLnBhZ2VDb3VudCgpOwogfQogCi1jbGFzcyBVbnN1c3BlbmRhYmxl QWN0aXZlRE9NT2JqZWN0IGZpbmFsIDogcHVibGljIEFjdGl2ZURPTU9iamVjdCwgcHVibGljIFJl ZkNvdW50ZWQ8VW5zdXNwZW5kYWJsZUFjdGl2ZURPTU9iamVjdD4gewotcHVibGljOgotICAgIHN0 YXRpYyBSZWY8VW5zdXNwZW5kYWJsZUFjdGl2ZURPTU9iamVjdD4gY3JlYXRlKFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQmIGNvbnRleHQpIHsgcmV0dXJuIGFkb3B0UmVmKCpuZXcgVW5zdXNwZW5kYWJs ZUFjdGl2ZURPTU9iamVjdCB7ICZjb250ZXh0IH0pOyB9Ci0KLXByaXZhdGU6Ci0gICAgZXhwbGlj aXQgVW5zdXNwZW5kYWJsZUFjdGl2ZURPTU9iamVjdChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBj b250ZXh0KQotICAgICAgICA6IEFjdGl2ZURPTU9iamVjdChjb250ZXh0KQotICAgIHsKLSAgICAg ICAgc3VzcGVuZElmTmVlZGVkKCk7Ci0gICAgfQotCi0gICAgYm9vbCBzaG91bGRQcmV2ZW50RW50 ZXJpbmdCYWNrRm9yd2FyZENhY2hlX0RFUFJFQ0FURUQoKSBjb25zdCBmaW5hbCB7IHJldHVybiB0 cnVlOyB9Ci0gICAgY29uc3QgY2hhciogYWN0aXZlRE9NT2JqZWN0TmFtZSgpIGNvbnN0IHsgcmV0 dXJuICJVbnN1c3BlbmRhYmxlQWN0aXZlRE9NT2JqZWN0IjsgfQotfTsKLQotdm9pZCBJbnRlcm5h bHM6OnByZXZlbnREb2N1bWVudEZvckVudGVyaW5nQmFja0ZvcndhcmRDYWNoZSgpCit2b2lkIElu dGVybmFsczo6cHJldmVudERvY3VtZW50RnJvbUVudGVyaW5nQmFja0ZvcndhcmRDYWNoZSgpCiB7 Ci0gICAgaWYgKGF1dG8qIGNvbnRleHQgPSBjb250ZXh0RG9jdW1lbnQoKSkKLSAgICAgICAgbV91 bnN1c3BlbmRhYmxlQWN0aXZlRE9NT2JqZWN0ID0gVW5zdXNwZW5kYWJsZUFjdGl2ZURPTU9iamVj dDo6Y3JlYXRlKCpjb250ZXh0KTsKKyAgICBpZiAoYXV0byogZG9jdW1lbnQgPSBjb250ZXh0RG9j dW1lbnQoKSkKKyAgICAgICAgZG9jdW1lbnQtPnByZXZlbnRFbnRlcmluZ0JhY2tGb3J3YXJkQ2Fj aGVGb3JUZXN0aW5nKCk7CiB9CiAKIHZvaWQgSW50ZXJuYWxzOjpkaXNhYmxlVGlsZVNpemVVcGRh dGVEZWxheSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5o IGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAppbmRleCBkZTRlNjRkNGVjNWE0 MGQzZmZiODNkNDkzNjA2ZTMxNDY4YzE1MzIzLi40NDNmMTM0NmUxOGE0Nzc0MTI0ZjkzMGEwODMz ZGRkN2ExOGY1YjA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFs cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKQEAgLTE3Miw3ICsx NzIsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGNsZWFyQmFja0ZvcndhcmRDYWNoZSgpOwogICAg IHVuc2lnbmVkIGJhY2tGb3J3YXJkQ2FjaGVTaXplKCkgY29uc3Q7Ci0gICAgdm9pZCBwcmV2ZW50 RG9jdW1lbnRGb3JFbnRlcmluZ0JhY2tGb3J3YXJkQ2FjaGUoKTsKKyAgICB2b2lkIHByZXZlbnRE b2N1bWVudEZyb21FbnRlcmluZ0JhY2tGb3J3YXJkQ2FjaGUoKTsKIAogICAgIHZvaWQgZGlzYWJs ZVRpbGVTaXplVXBkYXRlRGVsYXkoKTsKIApAQCAtOTI2LDggKzkyNiw2IEBAIHByaXZhdGU6CiAK ICAgICBzdGQ6OnVuaXF1ZV9wdHI8SW5zcGVjdG9yU3R1YkZyb250ZW5kPiBtX2luc3BlY3RvckZy b250ZW5kOwogICAgIFJlZlB0cjxDYWNoZVN0b3JhZ2VDb25uZWN0aW9uPiBtX2NhY2hlU3RvcmFn ZUNvbm5lY3Rpb247Ci0KLSAgICBSZWZQdHI8VW5zdXNwZW5kYWJsZUFjdGl2ZURPTU9iamVjdD4g bV91bnN1c3BlbmRhYmxlQWN0aXZlRE9NT2JqZWN0OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsIGIv U291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCmluZGV4IDkxYjU2ZmE0M2UxODFj ZjRkZjI0NjNmY2NkMzU5NzNjNzFmOTMwZGMuLmE1ZTQyMzM5YWRjMDMwZTY0ZmYwZGRlM2NkN2Mz YjFkOGRhOGNmNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxz LmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKQEAgLTIxOCw3 ICsyMTgsNyBAQCBlbnVtIENvbXBvc2l0aW5nUG9saWN5IHsKIAogICAgIHZvaWQgY2xlYXJCYWNr Rm9yd2FyZENhY2hlKCk7CiAgICAgdW5zaWduZWQgbG9uZyBiYWNrRm9yd2FyZENhY2hlU2l6ZSgp OwotICAgIHZvaWQgcHJldmVudERvY3VtZW50Rm9yRW50ZXJpbmdCYWNrRm9yd2FyZENhY2hlKCk7 CisgICAgdm9pZCBwcmV2ZW50RG9jdW1lbnRGcm9tRW50ZXJpbmdCYWNrRm9yd2FyZENhY2hlKCk7 CiAKICAgICBDU1NTdHlsZURlY2xhcmF0aW9uIGNvbXB1dGVkU3R5bGVJbmNsdWRpbmdWaXNpdGVk SW5mbyhFbGVtZW50IGVsZW1lbnQpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5 L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmll dy9XZWJGcmFtZS5tbQppbmRleCBkNjc3YTkwNDk0Yjk0Y2ZjZTc3ZGQxMTQ2OTM2NDg0MzYwNTQx MmQwLi4xOGQzZDllYzE0ZDhjNjk1ZDAzZjkzYzNkZDIwMTZhZDQwOTRhNDU4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViRnJhbWUubW0KQEAgLTIwNTksOCArMjA1OSw2 IEBAIC0gKE5TTXV0YWJsZURpY3Rpb25hcnkgKilfY2FjaGVhYmlsaXR5RGljdGlvbmFyeQogICAg IGlmIChhdXRvKiBkb2N1bWVudCA9IF9wcml2YXRlLT5jb3JlRnJhbWUtPmRvY3VtZW50KCkpIHsK ICAgICAgICAgaWYgKFdlYkNvcmU6OkRhdGFiYXNlTWFuYWdlcjo6c2luZ2xldG9uKCkuaGFzT3Bl bkRhdGFiYXNlcygqZG9jdW1lbnQpKQogICAgICAgICAgICAgW3Jlc3VsdCBzZXRPYmplY3Q6QFlF UyBmb3JLZXk6V2ViRnJhbWVVc2VzRGF0YWJhc2VzXTsKLSAgICAgICAgaWYgKCFkb2N1bWVudC0+ Y2FuU3VzcGVuZEFjdGl2ZURPTU9iamVjdHNGb3JEb2N1bWVudFN1c3BlbnNpb24oKSkKLSAgICAg ICAgICAgIFtyZXN1bHQgc2V0T2JqZWN0OkBZRVMgZm9yS2V5OldlYkZyYW1lQ2FuU3VzcGVuZEFj dGl2ZURPTU9iamVjdHNdOwogICAgIH0KICAgICAKICAgICByZXR1cm4gcmVzdWx0OwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IDk2ZWY4YzU0NWYyZjk5Mzc4NzZjNjJiYmU2ZjhkNzk5MGZjMmFmZWQuLjk1NWMwMTU4MTk4ODZj NTI3NzQ3YjhiMmU4OTUyNGE3ZmNiNGVmMDMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxOS0x MS0yNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIERyb3AgQWN0 aXZlRE9NT2JqZWN0OjpzaG91bGRQcmV2ZW50RW50ZXJpbmdCYWNrRm9yd2FyZENhY2hlX0RFUFJF Q0FURUQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjA0NjI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBodHRwL3Rlc3RzL3NlY3VyaXR5L25hdmlnYXRlLXdoZW4tcmVzdG9yaW5nLWNhY2hlZC1wYWdl Lmh0bWw6CisKIDIwMTktMTEtMjYgIHlvdWVubiBmYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgog CiAgICAgICAgIEFsbG93IGIvZiBjYWNoZSBpbiBjYXNlIG9mIGNvbm5lY3RlZCBwZWVyIGNvbm5l Y3Rpb25zCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L25hdmln YXRlLXdoZW4tcmVzdG9yaW5nLWNhY2hlZC1wYWdlLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL3NlY3VyaXR5L25hdmlnYXRlLXdoZW4tcmVzdG9yaW5nLWNhY2hlZC1wYWdlLmh0bWwKaW5k ZXggZGQ2ZjhjMWY3NzJjYWIyNDA0N2UyOGRiNWViODczNzFiY2M4YzE5OC4uODJmNDY3ZDllMWM1 NWYwNWU0YTUyNzZkYjE5YTUwZmE5MDZkNjFiOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9zZWN1cml0eS9uYXZpZ2F0ZS13aGVuLXJlc3RvcmluZy1jYWNoZWQtcGFnZS5odG1s CisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvbmF2aWdhdGUtd2hlbi1yZXN0 b3JpbmctY2FjaGVkLXBhZ2UuaHRtbApAQCAtNjEsOSArNjEsOCBAQCBmdW5jdGlvbiBydW5UZXN0 KCkKICAgICAgICAgICAKICAgICAgICAgICBjbGVhckludGVydmFsKGludGVydmFsX2lkKTsKIAot ICAgICAgICAgIC8vIFByZXZlbnQgZW50ZXJpbmcgUGFnZUNhY2hlLgogICAgICAgICAgIGlmICh3 LmludGVybmFscykKLSAgICAgICAgICAgIHcuaW50ZXJuYWxzLnByZXZlbnREb2N1bWVudEZvckVu dGVyaW5nQmFja0ZvcndhcmRDYWNoZSgpOworICAgICAgICAgICAgdy5pbnRlcm5hbHMucHJldmVu dERvY3VtZW50RnJvbUVudGVyaW5nQmFja0ZvcndhcmRDYWNoZSgpOwogCiAgICAgICAgICAgY2hp bGRfZnJhbWUgPSB3LmRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgnaWZyYW1lJykpOwogICAgICAgICAgIGNoaWxkX2ZyYW1lLmNvbnRlbnRXaW5kb3cub251 bmxvYWQgPSAoKSA9PiB7Cg==