151163 2015-11-11 16:22:02 -0800 Remove more dead context menu code 2015-11-11 16:29:51 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue japhet oldest_to_newest 1141264 0 andersca 2015-11-11 16:22:02 -0800 Remove more dead context menu code 1141265 1 265331 andersca 2015-11-11 16:22:41 -0800 Created attachment 265331 Patch 1141273 2 andersca 2015-11-11 16:29:51 -0800 Committed r192333: <http://trac.webkit.org/changeset/192333> 265331 2015-11-11 16:22:41 -0800 2015-11-11 16:23:42 -0800 Patch bug-151163-20151111162236.patch text/plain 11867 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyMzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTI1YWNjZjRkMzZlOTdh NzFiZDc1ZDM1OWJmNTE3MTllZTA0Y2JlOC4uNTAzN2Q0ZGQyMmVjNGY0M2VlNWQ5ODk5ZjQ2OGNl YzhkYWVjZmRhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTExLTExICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIG1vcmUg ZGVhZCBjb250ZXh0IG1lbnUgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTUxMTYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBsb2FkZXIvRW1wdHlDbGllbnRzLmg6CisgICAgICAgICogcGFnZS9D b250ZXh0TWVudUNsaWVudC5oOgorICAgICAgICAqIHBhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRleHRNZW51Q29udHJvbGxlcjo6cG9wdWxhdGUp OgorICAgICAgICAqIHBsYXRmb3JtL0NvbnRleHRNZW51SXRlbS5oOgorICAgICAgICAqIHBsYXRm b3JtL21hYy9Db250ZXh0TWVudUl0ZW1NYWMubW06CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0 TWVudUl0ZW06OnNoYXJlTWVudUl0ZW0pOiBEZWxldGVkLgorCiAyMDE1LTExLTEwICBKb24gSG9u ZXljdXR0ICA8amhvbmV5Y3V0dEBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jhc2ggbG9hZGluZyBC bGluayBsYXlvdXQgdGVzdCBmYXN0L3BhcnNlci9zdHJpcC1zY3JpcHQtYXR0cnMtb24taW5wdXQu aHRtbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IDdmNTI1NWQ0ODUwNTZlYTRmYmJhNjhiNzBiZTViNTg5 NWIwYTFkY2IuLjU2NThhZGU4MmY4OTJjMjg2ZmQ5ZmVmN2Y3MTc4MzVjNTU1NWYxY2IgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxNS0xMS0xMSAgQW5kZXJzIENhcmxzc29u ICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBtb3JlIGRlYWQgY29udGV4 dCBtZW51IGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1MTE2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQuaDoKKyAgICAgICAgKiBX ZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5tbToKKyAgICAgICAgKFdlYkNvbnRl eHRNZW51Q2xpZW50OjpzaGFyZU1lbnVJdGVtKTogRGVsZXRlZC4KKwogMjAxNS0xMS0xMCAgVGlt IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBBZG9wdCBmb3Jt YWwgcHJvdG9jb2xzIGZvciBDQSBkZWxlZ2F0ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA5MjUyZGM3ZWM5MzU3 MzY4M2ZkMmJiMDZiNmFmNTk4NDk3NTgyNTFiLi41MWIwNWY1NTJkZDU0YmFlZjE3N2U0YWExMmMz OWEwYzI2NTNiMWY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMTUtMTEtMTEgIEFu ZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAorICAgICAgICBSZW1vdmUgbW9y ZSBkZWFkIGNvbnRleHQgbWVudSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNTExNjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1l bnVDbGllbnQuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJD b250ZXh0TWVudUNsaWVudE1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dE1lbnVD bGllbnQ6OnNoYXJlTWVudUl0ZW0pOiBEZWxldGVkLgorCisyMDE1LTExLTExICBBbmRlcnMgQ2Fy bHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgX1dLUmVtb3RlT2JqZWN0SW50 ZXJmYWNlIHNob3VsZCBoYW5kbGUgc3BlY2lmeWluZyBhbGxvd2VkIGNsYXNzZXMgZm9yIHJlcGx5 IGJsb2NrIGFyZ3VtZW50cwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTUxMTQ0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0 eUNsaWVudHMuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuaAppbmRleCA3 MmNjOGFiNDM0YzRkN2UzNmM1MjdjMjI4MzZjY2QwNjA3NTg0Y2VmLi5lODYwMzA2MWM0YjhkNDNi YTRhM2QyOWUyOTcwMDFkZTAyNDFkM2RmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRW1wdHlDbGllbnRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50 cy5oCkBAIC01NTgsOCArNTU4LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzcGVhayhj b25zdCBTdHJpbmcmKSBvdmVycmlkZSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgc3RvcFNwZWFraW5n KCkgb3ZlcnJpZGUgeyB9CiAKLSAgICB2aXJ0dWFsIENvbnRleHRNZW51SXRlbSBzaGFyZU1lbnVJ dGVtKGNvbnN0IEhpdFRlc3RSZXN1bHQmKSBvdmVycmlkZSB7IHJldHVybiBDb250ZXh0TWVudUl0 ZW0oKTsgfQotCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgdmlydHVhbCB2b2lkIHNlYXJjaFdp dGhTcG90bGlnaHQoKSBvdmVycmlkZSB7IH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9Db250ZXh0TWVudUNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250 ZXh0TWVudUNsaWVudC5oCmluZGV4IDY2N2JjNTgxMjQ0NTg3NGUxMDRjMGI5MGRhODE3NTkzYTZl OTc3ODYuLjk0OTFkN2FkZjNiNWFiMGMxMmQwNWRiNzVjNDI0MmIxNDc4NDYxMzYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGV4dE1lbnVDbGllbnQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q2xpZW50LmgKQEAgLTUyLDggKzUyLDYgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgICAgICB2aXJ0dWFsIHZvaWQgc3BlYWsoY29uc3QgU3RyaW5nJikg PSAwOwogICAgICAgICB2aXJ0dWFsIHZvaWQgc3RvcFNwZWFraW5nKCkgPSAwOwogCi0gICAgICAg IHZpcnR1YWwgQ29udGV4dE1lbnVJdGVtIHNoYXJlTWVudUl0ZW0oY29uc3QgSGl0VGVzdFJlc3Vs dCYpID0gMDsKLQogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgICAgICB2aXJ0dWFsIHZvaWQgc2Vh cmNoV2l0aFNwb3RsaWdodCgpID0gMDsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9D b250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCmluZGV4IGEyYzZlZmZlZTg3YjM5N2Y5MDc1NTJlMGFl OThlMjk1MzVkZjEwNTguLjVhODQ1MGNkN2U2NDQ5YWRlNDc0MjViYjc2ZTk1OTE1MTgyZjA4YTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAKQEAg LTgwNyw3ICs4MDcsNyBAQCB2b2lkIENvbnRleHRNZW51Q29udHJvbGxlcjo6cG9wdWxhdGUoKQog ICAgIENvbnRleHRNZW51SXRlbSBTZWxlY3RBbGxJdGVtKEFjdGlvblR5cGUsIENvbnRleHRNZW51 SXRlbVRhZ1NlbGVjdEFsbCwgY29udGV4dE1lbnVJdGVtVGFnU2VsZWN0QWxsKCkpOwogI2VuZGlm CiAKLSAgICBDb250ZXh0TWVudUl0ZW0gU2hhcmVNZW51SXRlbSA9IG1fY2xpZW50LnNoYXJlTWVu dUl0ZW0obV9jb250ZXh0LmhpdFRlc3RSZXN1bHQoKSk7CisgICAgQ29udGV4dE1lbnVJdGVtIFNo YXJlTWVudUl0ZW0oU3VibWVudVR5cGUsIENvbnRleHRNZW51SXRlbVRhZ1NoYXJlTWVudSwgZW1w dHlTdHJpbmcoKSk7CiAKICAgICBOb2RlKiBub2RlID0gbV9jb250ZXh0LmhpdFRlc3RSZXN1bHQo KS5pbm5lck5vblNoYXJlZE5vZGUoKTsKICAgICBpZiAoIW5vZGUpCkBAIC04OTUsMTAgKzg5NSw4 IEBAIHZvaWQgQ29udGV4dE1lbnVDb250cm9sbGVyOjpwb3B1bGF0ZSgpCiAjaWYgUExBVEZPUk0o Q09DT0EpCiAgICAgICAgICAgICAgICAgYXBwZW5kSXRlbSgqc2VwYXJhdG9ySXRlbSgpLCBtX2Nv bnRleHRNZW51LmdldCgpKTsKIAotICAgICAgICAgICAgICAgIGlmICghU2hhcmVNZW51SXRlbS5p c051bGwoKSkgewotICAgICAgICAgICAgICAgICAgICBhcHBlbmRJdGVtKFNoYXJlTWVudUl0ZW0s IG1fY29udGV4dE1lbnUuZ2V0KCkpOwotICAgICAgICAgICAgICAgICAgICBhcHBlbmRJdGVtKCpz ZXBhcmF0b3JJdGVtKCksIG1fY29udGV4dE1lbnUuZ2V0KCkpOwotICAgICAgICAgICAgICAgIH0K KyAgICAgICAgICAgICAgICBhcHBlbmRJdGVtKFNoYXJlTWVudUl0ZW0sIG1fY29udGV4dE1lbnUu Z2V0KCkpOworICAgICAgICAgICAgICAgIGFwcGVuZEl0ZW0oKnNlcGFyYXRvckl0ZW0oKSwgbV9j b250ZXh0TWVudS5nZXQoKSk7CiAKICAgICAgICAgICAgICAgICBDb250ZXh0TWVudUl0ZW0gU3Bl ZWNoTWVudUl0ZW0oU3VibWVudVR5cGUsIENvbnRleHRNZW51SXRlbVRhZ1NwZWVjaE1lbnUsIGNv bnRleHRNZW51SXRlbVRhZ1NwZWVjaE1lbnUoKSk7CiAgICAgICAgICAgICAgICAgY3JlYXRlQW5k QXBwZW5kU3BlZWNoU3ViTWVudShTcGVlY2hNZW51SXRlbSk7CkBAIC05MzIsMTIgKzkzMCwxMCBA QCB2b2lkIENvbnRleHRNZW51Q29udHJvbGxlcjo6cG9wdWxhdGUoKQogICAgICAgICAgICAgICAg IGlmIChmcmFtZS0+cGFnZSgpICYmICFmcmFtZS0+aXNNYWluRnJhbWUoKSkKICAgICAgICAgICAg ICAgICAgICAgYXBwZW5kSXRlbShPcGVuRnJhbWVJdGVtLCBtX2NvbnRleHRNZW51LmdldCgpKTsK IAotICAgICAgICAgICAgICAgIGlmICghU2hhcmVNZW51SXRlbS5pc051bGwoKSkgewotICAgICAg ICAgICAgICAgICAgICBhcHBlbmRJdGVtKCpzZXBhcmF0b3JJdGVtKCksIG1fY29udGV4dE1lbnUu Z2V0KCkpOwotICAgICAgICAgICAgICAgICAgICBhcHBlbmRJdGVtKFNoYXJlTWVudUl0ZW0sIG1f Y29udGV4dE1lbnUuZ2V0KCkpOwotICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBh cHBlbmRJdGVtKCpzZXBhcmF0b3JJdGVtKCksIG1fY29udGV4dE1lbnUuZ2V0KCkpOworICAgICAg ICAgICAgICAgIGFwcGVuZEl0ZW0oU2hhcmVNZW51SXRlbSwgbV9jb250ZXh0TWVudS5nZXQoKSk7 CiAgICAgICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSBpZiAoIVNoYXJlTWVudUl0ZW0uaXNOdWxs KCkpIHsKKyAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGFwcGVuZEl0ZW0oKnNlcGFyYXRv ckl0ZW0oKSwgbV9jb250ZXh0TWVudS5nZXQoKSk7CiAgICAgICAgICAgICBhcHBlbmRJdGVtKFNo YXJlTWVudUl0ZW0sIG1fY29udGV4dE1lbnUuZ2V0KCkpOwogICAgICAgICB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0NvbnRleHRNZW51SXRlbS5oCmluZGV4IGQwZGYwOTRjMzdmZWY1NDc1NmI0 YjUzMmIyNGRlZDYxMWI2MzBmMzUuLjRlODk1YzE3NzNiYjlmNjM5Nzc2Yzk5YTVhZGQxNDY2MWQ2 MDgwOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0NvbnRleHRNZW51SXRl bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0NvbnRleHRNZW51SXRlbS5oCkBAIC0y MDMsMTAgKzIwMyw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICB2b2lkIHNldFN1 Yk1lbnUoQ29udGV4dE1lbnUqKTsKIAotI2lmIFBMQVRGT1JNKE1BQykKLSAgICAgICAgV0VCQ09S RV9FWFBPUlQgc3RhdGljIENvbnRleHRNZW51SXRlbSBzaGFyZU1lbnVJdGVtKGNvbnN0IFVSTCYg YWJzb2x1dGVMaW5rVVJMLCBjb25zdCBVUkwmIGRvd25sb2FkYWJsZU1lZGlhVVJMLCBOU0ltYWdl ICosIGNvbnN0IFN0cmluZyYgc2VsZWN0ZWRUZXh0KTsKLSNlbmRpZgotCiAjaWYgVVNFKENST1NT X1BMQVRGT1JNX0NPTlRFWFRfTUVOVVMpCiAgICAgICAgIENvbnRleHRNZW51SXRlbShDb250ZXh0 TWVudUFjdGlvbiwgY29uc3QgU3RyaW5nJiwgYm9vbCBlbmFibGVkLCBib29sIGNoZWNrZWQsIGNv bnN0IFZlY3RvcjxDb250ZXh0TWVudUl0ZW0+JiBzdWJNZW51SXRlbXMpOwogICAgICAgICBleHBs aWNpdCBDb250ZXh0TWVudUl0ZW0oY29uc3QgUGxhdGZvcm1Db250ZXh0TWVudUl0ZW0mKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9Db250ZXh0TWVudUl0ZW1NYWMu bW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ29udGV4dE1lbnVJdGVtTWFjLm1tCmlu ZGV4IGNmNjFiNjIzZjgyYzE0ZTc5ZTcyNjdmN2MxOWRkNGU5YjQxYTMzZjMuLmFkMWIzZTkzMGRh YTkzNTcwOGZhOWEzNjc3N2ZjOThlOWE3MDBmMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9Db250ZXh0TWVudUl0ZW1NYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWFjL0NvbnRleHRNZW51SXRlbU1hYy5tbQpAQCAtMTk2LDMzICsxOTYsNiBAQCBi b29sIENvbnRleHRNZW51SXRlbTo6Y2hlY2tlZCgpIGNvbnN0CiAgICAgcmV0dXJuIFttX3BsYXRm b3JtRGVzY3JpcHRpb24uZ2V0KCkgc3RhdGVdID09IE5TT25TdGF0ZTsKIH0KIAotQ29udGV4dE1l bnVJdGVtIENvbnRleHRNZW51SXRlbTo6c2hhcmVNZW51SXRlbShjb25zdCBVUkwmIGFic29sdXRl TGlua1VSTCwgY29uc3QgVVJMJiBkb3dubG9hZGFibGVNZWRpYVVSTCwgTlNJbWFnZSAqaW1hZ2Us IGNvbnN0IFN0cmluZyYgc2VsZWN0ZWRUZXh0KQotewotICAgIGlmICghW1tOU01lbnVJdGVtIGNs YXNzXSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHN0YW5kYXJkU2hhcmVNZW51SXRlbVdp dGhJdGVtczopXSkKLSAgICAgICAgcmV0dXJuIENvbnRleHRNZW51SXRlbSgpOwotCi0gICAgUmV0 YWluUHRyPE5TTXV0YWJsZUFycmF5PiBpdGVtcyA9IGFkb3B0TlMoW1tOU011dGFibGVBcnJheSBh bGxvY10gaW5pdF0pOwotCi0gICAgaWYgKCFhYnNvbHV0ZUxpbmtVUkwuaXNFbXB0eSgpKQotICAg ICAgICBbaXRlbXMgYWRkT2JqZWN0OihOU1VSTCAqKWFic29sdXRlTGlua1VSTF07Ci0KLSAgICBp ZiAoIWRvd25sb2FkYWJsZU1lZGlhVVJMLmlzRW1wdHkoKSkKLSAgICAgICAgW2l0ZW1zIGFkZE9i amVjdDooTlNVUkwgKilkb3dubG9hZGFibGVNZWRpYVVSTF07Ci0KLSAgICBpZiAoaW1hZ2UpCi0g ICAgICAgIFtpdGVtcyBhZGRPYmplY3Q6aW1hZ2VdOwotCi0gICAgaWYgKCFzZWxlY3RlZFRleHQu aXNFbXB0eSgpKQotICAgICAgICBbaXRlbXMgYWRkT2JqZWN0OihOU1N0cmluZyAqKXNlbGVjdGVk VGV4dF07Ci0KLSAgICBpZiAoIVtpdGVtcyBjb3VudF0pCi0gICAgICAgIHJldHVybiBDb250ZXh0 TWVudUl0ZW0oKTsKLQotICAgIENvbnRleHRNZW51SXRlbSBpdGVtKFtOU01lbnVJdGVtIHN0YW5k YXJkU2hhcmVNZW51SXRlbVdpdGhJdGVtczppdGVtcy5nZXQoKV0pOwotICAgIGl0ZW0uc2V0QWN0 aW9uKENvbnRleHRNZW51SXRlbVRhZ1NoYXJlTWVudSk7Ci0gICAgcmV0dXJuIGl0ZW07Ci19Ci0K IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRShDT05URVhUX01FTlVT KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4 dE1lbnVDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRl eHRNZW51Q2xpZW50LmgKaW5kZXggNTZkMDUxOGU5NGQ1MjVkYjE0MTEyZDYwYWYzYTQyYTZjZTU5 NzE1Mi4uMGM5YmU1YzJhM2M3ODM3NGQwNGQ5NGQxMjcyZTc4ZGNmY2Q1MzRlYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQu aAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNs aWVudC5oCkBAIC01OCw3ICs1OCw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgaXNTcGVh a2luZygpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBzcGVhayhjb25zdCBXVEY6OlN0cmlu ZyYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBzdG9wU3BlYWtpbmcoKSBvdmVycmlkZTsK LSAgICB2aXJ0dWFsIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbSBzaGFyZU1lbnVJdGVtKGNvbnN0 IFdlYkNvcmU6OkhpdFRlc3RSZXN1bHQmKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgc2Vh cmNoV2l0aFNwb3RsaWdodCgpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBzaG93Q29udGV4 dE1lbnUoKSBvdmVycmlkZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29y ZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJD b3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5tbQppbmRleCA0YWQxYTVhNGQ2NGRmMzli YzZiYTY1MmUxZGM1NzcwYjZhM2FkNDJkLi4wYTIwMTA3ZGY5ZmI1OWEzMmUyZDMzZTc0MjNhYmJl NjQ1MzlmM2QzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9X ZWJDb250ZXh0TWVudUNsaWVudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5tbQpAQCAtMTMxLDMyICsxMzEsNiBAQCB2b2lkIFdl YkNvbnRleHRNZW51Q2xpZW50OjpzdG9wU3BlYWtpbmcoKQogICAgIFtOU0FwcCBzdG9wU3BlYWtp bmc6bmlsXTsKIH0KIAotQ29udGV4dE1lbnVJdGVtIFdlYkNvbnRleHRNZW51Q2xpZW50OjpzaGFy ZU1lbnVJdGVtKGNvbnN0IEhpdFRlc3RSZXN1bHQmIGhpdFRlc3RSZXN1bHQpCi17Ci0gICAgaWYg KCFbW05TTWVudUl0ZW0gY2xhc3NdIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc3RhbmRh cmRTaGFyZU1lbnVJdGVtV2l0aEl0ZW1zOildKQotICAgICAgICByZXR1cm4gQ29udGV4dE1lbnVJ dGVtKCk7Ci0KLSAgICBOb2RlKiBub2RlID0gaGl0VGVzdFJlc3VsdC5pbm5lck5vblNoYXJlZE5v ZGUoKTsKLSAgICBpZiAoIW5vZGUpCi0gICAgICAgIHJldHVybiBDb250ZXh0TWVudUl0ZW0oKTsK LQotICAgIEZyYW1lKiBmcmFtZSA9IG5vZGUtPmRvY3VtZW50KCkuZnJhbWUoKTsKLSAgICBpZiAo IWZyYW1lKQotICAgICAgICByZXR1cm4gQ29udGV4dE1lbnVJdGVtKCk7Ci0KLSAgICBVUkwgZG93 bmxvYWRhYmxlTWVkaWFVUkw7Ci0gICAgaWYgKCFoaXRUZXN0UmVzdWx0LmFic29sdXRlTWVkaWFV UkwoKS5pc0VtcHR5KCkgJiYgaGl0VGVzdFJlc3VsdC5pc0Rvd25sb2FkYWJsZU1lZGlhKCkpCi0g ICAgICAgIGRvd25sb2FkYWJsZU1lZGlhVVJMID0gaGl0VGVzdFJlc3VsdC5hYnNvbHV0ZU1lZGlh VVJMKCk7Ci0KLSAgICBSZXRhaW5QdHI8TlNJbWFnZT4gbnNJbWFnZTsKLSAgICBpZiAoSW1hZ2Uq IGltYWdlID0gaGl0VGVzdFJlc3VsdC5pbWFnZSgpKSB7Ci0gICAgICAgIGlmIChSZWZQdHI8U2hh cmVkQnVmZmVyPiBidWZmZXIgPSBpbWFnZS0+ZGF0YSgpKQotICAgICAgICAgICAgbnNJbWFnZSA9 IGFkb3B0TlMoW1tOU0ltYWdlIGFsbG9jXSBpbml0V2l0aERhdGE6W05TRGF0YSBkYXRhV2l0aEJ5 dGVzOmJ1ZmZlci0+ZGF0YSgpIGxlbmd0aDpidWZmZXItPnNpemUoKV1dKTsKLSAgICB9Ci0KLSAg ICByZXR1cm4gQ29udGV4dE1lbnVJdGVtOjpzaGFyZU1lbnVJdGVtKGhpdFRlc3RSZXN1bHQuYWJz b2x1dGVMaW5rVVJMKCksIGRvd25sb2FkYWJsZU1lZGlhVVJMLCBuc0ltYWdlLmdldCgpLCBoaXRU ZXN0UmVzdWx0LnNlbGVjdGVkVGV4dCgpKTsKLX0KLQogYm9vbCBXZWJDb250ZXh0TWVudUNsaWVu dDo6Y2xpZW50RmxvYXRSZWN0Rm9yTm9kZShOb2RlJiBub2RlLCBGbG9hdFJlY3QmIHJlY3QpIGNv bnN0CiB7CiAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IG5vZGUucmVuZGVyZXIoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ29u dGV4dE1lbnVDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViQ29udGV4dE1lbnVDbGllbnQuaAppbmRleCBkNDg3OGUyNDgwMTE3YzlkNWJlZGI0MjVm MjgzNDE1YjJlNGMzOGI1Li41ZmY1MTQ5MmI1YjI1NjM5NzI1YTY2Nzk3YTVmOGQ2MmYyNjk1ODFm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkNvbnRleHRNZW51Q2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5oCkBAIC01Miw3ICs1Miw2IEBAIHByaXZh dGU6CiAgICAgdmlydHVhbCBib29sIGlzU3BlYWtpbmcoKSBvdmVycmlkZTsKICAgICB2aXJ0dWFs IHZvaWQgc3BlYWsoY29uc3QgU3RyaW5nJikgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIHN0 b3BTcGVha2luZygpIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgV2ViQ29yZTo6Q29udGV4dE1lbnVJ dGVtIHNoYXJlTWVudUl0ZW0oY29uc3QgV2ViQ29yZTo6SGl0VGVzdFJlc3VsdCYpIG92ZXJyaWRl OwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgdmlydHVhbCB2b2lkIHNlYXJjaFdpdGhTcG90 bGlnaHQoKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvbWFjL1dlYkNvbnRleHRNZW51Q2xpZW50TWFjLm1tIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViQ29udGV4dE1lbnVDbGllbnRN YWMubW0KaW5kZXggMGQ3ODljMzdlNTVkNmVkYzBkNDFlZDRjZjEyZmYzMDI1MWFkMjg0Yy4uNDBm MzkwNWNkMzdiNzlkNjk4YzA3NjZlOTkxNDU1ZjA0NDFmZTg5ZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViQ29udGV4dE1lbnVDbGll bnRNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9t YWMvV2ViQ29udGV4dE1lbnVDbGllbnRNYWMubW0KQEAgLTk0LDExICs5NCw2IEBAIHZvaWQgV2Vi Q29udGV4dE1lbnVDbGllbnQ6OnNlYXJjaFdpdGhTcG90bGlnaHQoKQogICAgIG1fcGFnZS0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTZWFyY2hXaXRoU3BvdGxpZ2h0KHNlbGVjdGVkU3Ry aW5nKSk7CiB9CiAKLUNvbnRleHRNZW51SXRlbSBXZWJDb250ZXh0TWVudUNsaWVudDo6c2hhcmVN ZW51SXRlbShjb25zdCBIaXRUZXN0UmVzdWx0JikKLXsKLSAgICByZXR1cm4gQ29udGV4dE1lbnVJ dGVtKFN1Ym1lbnVUeXBlLCBDb250ZXh0TWVudUl0ZW1UYWdTaGFyZU1lbnUsIGVtcHR5U3RyaW5n KCkpOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlmIC8vIEVOQUJMRShDT05U RVhUX01FTlVTKQo=