150182 2015-10-15 12:41:06 -0700 The menu location and menu items should be part of ContextMenuContextData 2015-10-15 12:57:26 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1133560 0 andersca 2015-10-15 12:41:06 -0700 The menu location and menu items should be part of ContextMenuContextData 1133561 1 263180 andersca 2015-10-15 12:42:06 -0700 Created attachment 263180 Patch 1133572 2 andersca 2015-10-15 12:57:26 -0700 Committed r191131: <http://trac.webkit.org/changeset/191131> 263180 2015-10-15 12:42:06 -0700 2015-10-15 12:55:55 -0700 Patch bug-150182-20151015124128.patch text/plain 13357 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxMTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmE4OTNkMDZmNDNhNDkz NWU1ZmU2Y2ZkNzA0N2QzN2ZmMmIxODEzYS4uODc0YTU2Nzg3YTE0NzhhZjk4ODk4ZDgyYTQwOWJm YjdjNTgzMjM0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE1LTEwLTE1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgVGhlIG1lbnUgbG9j YXRpb24gYW5kIG1lbnUgaXRlbXMgc2hvdWxkIGJlIHBhcnQgb2YgQ29udGV4dE1lbnVDb250ZXh0 RGF0YQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUw MTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBT aGFyZWQvQ29udGV4dE1lbnVDb250ZXh0RGF0YS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNvbnRl eHRNZW51Q29udGV4dERhdGE6OkNvbnRleHRNZW51Q29udGV4dERhdGEpOgorICAgICAgICAoV2Vi S2l0OjpDb250ZXh0TWVudUNvbnRleHREYXRhOjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpD b250ZXh0TWVudUNvbnRleHREYXRhOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9Db250ZXh0 TWVudUNvbnRleHREYXRhLmg6CisgICAgICAgIChXZWJLaXQ6OkNvbnRleHRNZW51Q29udGV4dERh dGE6Om1lbnVMb2NhdGlvbik6CisgICAgICAgIChXZWJLaXQ6OkNvbnRleHRNZW51Q29udGV4dERh dGE6Om1lbnVJdGVtcyk6CisgICAgICAgIChXZWJLaXQ6OkNvbnRleHRNZW51Q29udGV4dERhdGE6 OkNvbnRleHRNZW51Q29udGV4dERhdGEpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNob3dDb250ZXh0TWVudSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6aW50ZXJuYWxTaG93Q29udGV4dE1lbnUp OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV2Vi UGFnZVByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNob3dTZWxl Y3Rpb25TZXJ2aWNlTWVudSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkNvbnRl eHRNZW51LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dE1lbnU6OnNob3cpOgorCiAy MDE1LTEwLTE1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAog ICAgICAgICBbR1RLXSBUZXN0IFdlYktpdDIuUmVzdG9yZVNlc3Npb25TdGF0ZUNvbnRhaW5pbmdG b3JtRGF0YSBmYWlscwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0NvbnRleHRN ZW51Q29udGV4dERhdGEuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0NvbnRleHRNZW51Q29u dGV4dERhdGEuY3BwCmluZGV4IDczMjM0ZTVmNzkzZGEzODU5OTQxYTlkYzc3NDllNzQyNzhhMGU0 ZDUuLjk3NmNjNDRmYTEwZDg5MzlkZDBhNTkzZTZlY2U1NGU3OWM3NDk4MTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db250ZXh0TWVudUNvbnRleHREYXRhLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29udGV4dE1lbnVDb250ZXh0RGF0YS5jcHAKQEAgLTQ0LDgg KzQ0LDEwIEBAIENvbnRleHRNZW51Q29udGV4dERhdGE6OkNvbnRleHRNZW51Q29udGV4dERhdGEo KQogewogfQogCi1Db250ZXh0TWVudUNvbnRleHREYXRhOjpDb250ZXh0TWVudUNvbnRleHREYXRh KGNvbnN0IENvbnRleHRNZW51Q29udGV4dCYgY29udGV4dCkKLSAgICA6IG1fd2ViSGl0VGVzdFJl c3VsdERhdGEoY29udGV4dC5oaXRUZXN0UmVzdWx0KCksIHRydWUpCitDb250ZXh0TWVudUNvbnRl eHREYXRhOjpDb250ZXh0TWVudUNvbnRleHREYXRhKGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBt ZW51TG9jYXRpb24sIGNvbnN0IFZlY3RvcjxXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbURhdGE+ JiBtZW51SXRlbXMsIGNvbnN0IENvbnRleHRNZW51Q29udGV4dCYgY29udGV4dCkKKyAgICA6IG1f bWVudUxvY2F0aW9uKG1lbnVMb2NhdGlvbikKKyAgICAsIG1fbWVudUl0ZW1zKG1lbnVJdGVtcykK KyAgICAsIG1fd2ViSGl0VGVzdFJlc3VsdERhdGEoY29udGV4dC5oaXRUZXN0UmVzdWx0KCksIHRy dWUpCiAgICAgLCBtX3NlbGVjdGVkVGV4dChjb250ZXh0LnNlbGVjdGVkVGV4dCgpKQogI2lmIEVO QUJMRShTRVJWSUNFX0NPTlRST0xTKQogICAgICwgbV9zZWxlY3Rpb25Jc0VkaXRhYmxlKGZhbHNl KQpAQCAtNjQsNiArNjYsOCBAQCBDb250ZXh0TWVudUNvbnRleHREYXRhOjpDb250ZXh0TWVudUNv bnRleHREYXRhKGNvbnN0IENvbnRleHRNZW51Q29udGV4dCYgY29udGV4dAogCiB2b2lkIENvbnRl eHRNZW51Q29udGV4dERhdGE6OmVuY29kZShJUEM6OkFyZ3VtZW50RW5jb2RlciYgZW5jb2Rlcikg Y29uc3QKIHsKKyAgICBlbmNvZGVyIDw8IG1fbWVudUxvY2F0aW9uOworICAgIGVuY29kZXIgPDwg bV9tZW51SXRlbXM7CiAgICAgZW5jb2RlciA8PCBtX3dlYkhpdFRlc3RSZXN1bHREYXRhOwogICAg IGVuY29kZXIgPDwgbV9zZWxlY3RlZFRleHQ7CiAKQEAgLTc1LDEyICs3OSwxOCBAQCB2b2lkIENv bnRleHRNZW51Q29udGV4dERhdGE6OmVuY29kZShJUEM6OkFyZ3VtZW50RW5jb2RlciYgZW5jb2Rl cikgY29uc3QKICNlbmRpZgogfQogCi1ib29sIENvbnRleHRNZW51Q29udGV4dERhdGE6OmRlY29k ZShJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYg Y29udGV4dE1lbnVDb250ZXh0RGF0YSkKK2Jvb2wgQ29udGV4dE1lbnVDb250ZXh0RGF0YTo6ZGVj b2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBDb250ZXh0TWVudUNvbnRleHREYXRh JiByZXN1bHQpCiB7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShjb250ZXh0TWVudUNvbnRleHRE YXRhLm1fd2ViSGl0VGVzdFJlc3VsdERhdGEpKQorICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVz dWx0Lm1fbWVudUxvY2F0aW9uKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKCFk ZWNvZGVyLmRlY29kZShjb250ZXh0TWVudUNvbnRleHREYXRhLm1fc2VsZWN0ZWRUZXh0KSkKKyAg ICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX21lbnVJdGVtcykpCisgICAgICAgIHJldHVy biBmYWxzZTsKKworICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1fd2ViSGl0VGVzdFJl c3VsdERhdGEpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIWRlY29kZXIuZGVj b2RlKHJlc3VsdC5tX3NlbGVjdGVkVGV4dCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogI2lm IEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQpAQCAtODksNyArOTksNyBAQCBib29sIENvbnRleHRN ZW51Q29udGV4dERhdGE6OmRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgQ29u dGV4dE1lbnVDbwogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAoIWhhbmRsZS5pc051 bGwoKSkKLSAgICAgICAgY29udGV4dE1lbnVDb250ZXh0RGF0YS5tX2NvbnRyb2xsZWRJbWFnZSA9 IFNoYXJlYWJsZUJpdG1hcDo6Y3JlYXRlKGhhbmRsZSwgU2hhcmVkTWVtb3J5OjpQcm90ZWN0aW9u OjpSZWFkT25seSk7CisgICAgICAgIHJlc3VsdC5tX2NvbnRyb2xsZWRJbWFnZSA9IFNoYXJlYWJs ZUJpdG1hcDo6Y3JlYXRlKGhhbmRsZSwgU2hhcmVkTWVtb3J5OjpQcm90ZWN0aW9uOjpSZWFkT25s eSk7CiAjZW5kaWYKIAogICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvU2hhcmVkL0NvbnRleHRNZW51Q29udGV4dERhdGEuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9Db250ZXh0TWVudUNvbnRleHREYXRhLmgKaW5kZXggNWJiYzUwMzQxMTk4YjIzYTExN2VhZGIx YmJhOTE4N2Y5ZTExNjcyNy4uNmRjNWJjZWRmOTc1OTM2ODE2ZjI5NzFmZGQ1N2NkMGE1MjE1YzJj NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0NvbnRleHRNZW51Q29udGV4dERh dGEuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29udGV4dE1lbnVDb250ZXh0RGF0YS5o CkBAIC0zMCw2ICszMCw3IEBACiAjaWYgRU5BQkxFKENPTlRFWFRfTUVOVVMpCiAKICNpbmNsdWRl ICJTaGFyZWFibGVCaXRtYXAuaCIKKyNpbmNsdWRlICJXZWJDb250ZXh0TWVudUl0ZW1EYXRhLmgi CiAjaW5jbHVkZSAiV2ViSGl0VGVzdFJlc3VsdERhdGEuaCIKIAogbmFtZXNwYWNlIElQQyB7CkBA IC00NiwxNCArNDcsMTkgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBjbGFzcyBDb250ZXh0TWVudUNv bnRleHREYXRhIHsKIHB1YmxpYzoKICAgICBDb250ZXh0TWVudUNvbnRleHREYXRhKCk7Ci0gICAg Q29udGV4dE1lbnVDb250ZXh0RGF0YShjb25zdCBXZWJDb3JlOjpDb250ZXh0TWVudUNvbnRleHQm KTsKLSAgICAKKyAgICBDb250ZXh0TWVudUNvbnRleHREYXRhKGNvbnN0IFdlYkNvcmU6OkludFBv aW50JiBtZW51TG9jYXRpb24sIGNvbnN0IFZlY3RvcjxXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRl bURhdGE+JiBtZW51SXRlbXMsIGNvbnN0IFdlYkNvcmU6OkNvbnRleHRNZW51Q29udGV4dCYpOwor CisgICAgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIG1lbnVMb2NhdGlvbigpIGNvbnN0IHsgcmV0 dXJuIG1fbWVudUxvY2F0aW9uOyB9CisgICAgY29uc3QgVmVjdG9yPFdlYktpdDo6V2ViQ29udGV4 dE1lbnVJdGVtRGF0YT4mIG1lbnVJdGVtcygpIGNvbnN0IHsgcmV0dXJuIG1fbWVudUl0ZW1zOyB9 CisKICAgICBjb25zdCBXZWJIaXRUZXN0UmVzdWx0RGF0YSYgd2ViSGl0VGVzdFJlc3VsdERhdGEo KSBjb25zdCB7IHJldHVybiBtX3dlYkhpdFRlc3RSZXN1bHREYXRhOyB9CiAgICAgY29uc3QgU3Ry aW5nJiBzZWxlY3RlZFRleHQoKSBjb25zdCB7IHJldHVybiBtX3NlbGVjdGVkVGV4dDsgfQogCiAj aWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCi0gICAgQ29udGV4dE1lbnVDb250ZXh0RGF0YShj b25zdCBWZWN0b3I8dWludDhfdD4mIHNlbGVjdGlvbkRhdGEsIGNvbnN0IFZlY3RvcjxTdHJpbmc+ JiBzZWxlY3RlZFRlbGVwaG9uZU51bWJlcnMsIGJvb2wgaXNFZGl0YWJsZSkKLSAgICAgICAgOiBt X2NvbnRyb2xsZWRTZWxlY3Rpb25EYXRhKHNlbGVjdGlvbkRhdGEpCisgICAgQ29udGV4dE1lbnVD b250ZXh0RGF0YShjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgbWVudUxvY2F0aW9uLCBjb25zdCBW ZWN0b3I8V2ViS2l0OjpXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYgbWVudUl0ZW1zLCBjb25zdCBW ZWN0b3I8dWludDhfdD4mIHNlbGVjdGlvbkRhdGEsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBzZWxl Y3RlZFRlbGVwaG9uZU51bWJlcnMsIGJvb2wgaXNFZGl0YWJsZSkKKyAgICAgICAgOiBtX21lbnVM b2NhdGlvbihtZW51TG9jYXRpb24pCisgICAgICAgICwgbV9tZW51SXRlbXMobWVudUl0ZW1zKQor ICAgICAgICAsIG1fY29udHJvbGxlZFNlbGVjdGlvbkRhdGEoc2VsZWN0aW9uRGF0YSkKICAgICAg ICAgLCBtX3NlbGVjdGVkVGVsZXBob25lTnVtYmVycyhzZWxlY3RlZFRlbGVwaG9uZU51bWJlcnMp CiAgICAgICAgICwgbV9zZWxlY3Rpb25Jc0VkaXRhYmxlKGlzRWRpdGFibGUpCiAgICAgewpAQCAt NzEsNiArNzcsOSBAQCBwdWJsaWM6CiAgICAgc3RhdGljIGJvb2wgZGVjb2RlKElQQzo6QXJndW1l bnREZWNvZGVyJiwgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYpOwogCiBwcml2YXRlOgorICAgIFdl YkNvcmU6OkludFBvaW50IG1fbWVudUxvY2F0aW9uOworICAgIFZlY3RvcjxXZWJLaXQ6OldlYkNv bnRleHRNZW51SXRlbURhdGE+IG1fbWVudUl0ZW1zOworCiAgICAgV2ViSGl0VGVzdFJlc3VsdERh dGEgbV93ZWJIaXRUZXN0UmVzdWx0RGF0YTsKICAgICBTdHJpbmcgbV9zZWxlY3RlZFRleHQ7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggNGVlZTNmMTNj YWZlMzRhNDU1ZTE4ZDY5ZGFjZWVhNmExYzc4ZmI4ZS4uMzkwNzlhZDZhNzg0ZDEzMTU0Nzg3YjVj YzM0YmU3MzRjNGJmYTQ4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKQEAgLTQxODIsMTggKzQxODIsMTggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmhpZGVQb3B1 cE1lbnUoKQogfQogCiAjaWYgRU5BQkxFKENPTlRFWFRfTUVOVVMpCi12b2lkIFdlYlBhZ2VQcm94 eTo6c2hvd0NvbnRleHRNZW51KGNvbnN0IEludFBvaW50JiBtZW51TG9jYXRpb24sIGNvbnN0IENv bnRleHRNZW51Q29udGV4dERhdGEmIGNvbnRleHRNZW51Q29udGV4dERhdGEsIGNvbnN0IFZlY3Rv cjxXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYgcHJvcG9zZWRJdGVtcywgY29uc3QgVXNlckRhdGEm IHVzZXJEYXRhKQordm9pZCBXZWJQYWdlUHJveHk6OnNob3dDb250ZXh0TWVudShjb25zdCBDb250 ZXh0TWVudUNvbnRleHREYXRhJiBjb250ZXh0TWVudUNvbnRleHREYXRhLCBjb25zdCBVc2VyRGF0 YSYgdXNlckRhdGEpCiB7CiAgICAgLy8gU2hvd2luZyBhIGNvbnRleHQgbWVudSBydW5zIGEgbmVz dGVkIHJ1bmxvb3AsIHdoaWNoIGNhbiBoYW5kbGUgbWVzc2FnZXMgdGhhdCBjYXVzZSB8dGhpc3wg dG8gZ2V0IGNsb3NlZC4KICAgICBSZWY8V2ViUGFnZVByb3h5PiBwcm90ZWN0KCp0aGlzKTsKIAot ICAgIGludGVybmFsU2hvd0NvbnRleHRNZW51KG1lbnVMb2NhdGlvbiwgY29udGV4dE1lbnVDb250 ZXh0RGF0YSwgcHJvcG9zZWRJdGVtcywgQ29udGV4dE1lbnVDbGllbnRFbGlnaWJpbGl0eTo6RWxp Z2libGVGb3JDbGllbnQsIHVzZXJEYXRhKTsKKyAgICBpbnRlcm5hbFNob3dDb250ZXh0TWVudShj b250ZXh0TWVudUNvbnRleHREYXRhLCBDb250ZXh0TWVudUNsaWVudEVsaWdpYmlsaXR5OjpFbGln aWJsZUZvckNsaWVudCwgdXNlckRhdGEpOwogICAgIAogICAgIC8vIE5vIG1hdHRlciB0aGUgcmVz dWx0IG9mIGludGVybmFsU2hvd0NvbnRleHRNZW51LCBhbHdheXMgbm90aWZ5IHRoZSBXZWJQcm9j ZXNzIHRoYXQgdGhlIG1lbnUgaXMgaGlkZGVuIHNvIGl0IHN0YXJ0cyBoYW5kbGluZyBtb3VzZSBl dmVudHMgYWdhaW4uCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpDb250 ZXh0TWVudUhpZGRlbigpLCBtX3BhZ2VJRCk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjppbnRl cm5hbFNob3dDb250ZXh0TWVudShjb25zdCBJbnRQb2ludCYgbWVudUxvY2F0aW9uLCBjb25zdCBD b250ZXh0TWVudUNvbnRleHREYXRhJiBjb250ZXh0TWVudUNvbnRleHREYXRhLCBjb25zdCBWZWN0 b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4mIHByb3Bvc2VkSXRlbXMsIENvbnRleHRNZW51Q2xp ZW50RWxpZ2liaWxpdHkgY2xpZW50RWxpZ2liaWxpdHksIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0 YSkKK3ZvaWQgV2ViUGFnZVByb3h5OjppbnRlcm5hbFNob3dDb250ZXh0TWVudShjb25zdCBDb250 ZXh0TWVudUNvbnRleHREYXRhJiBjb250ZXh0TWVudUNvbnRleHREYXRhLCBDb250ZXh0TWVudUNs aWVudEVsaWdpYmlsaXR5IGNsaWVudEVsaWdpYmlsaXR5LCBjb25zdCBVc2VyRGF0YSYgdXNlckRh dGEpCiB7CiAgICAgbV9hY3RpdmVDb250ZXh0TWVudUNvbnRleHREYXRhID0gY29udGV4dE1lbnVD b250ZXh0RGF0YTsKIApAQCAtNDIxNyw3ICs0MjE3LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6Omlu dGVybmFsU2hvd0NvbnRleHRNZW51KGNvbnN0IEludFBvaW50JiBtZW51TG9jYXRpb24sIGNvbnN0 IEMKICNlbmRpZgogCiAgICAgVmVjdG9yPFJlZlB0cjxXZWJDb250ZXh0TWVudUl0ZW0+PiBwcm9w b3NlZEFQSUl0ZW1zOwotICAgIGZvciAoYXV0byYgaXRlbSA6IHByb3Bvc2VkSXRlbXMpIHsKKyAg ICBmb3IgKGF1dG8mIGl0ZW0gOiBjb250ZXh0TWVudUNvbnRleHREYXRhLm1lbnVJdGVtcygpKSB7 CiAgICAgICAgIGlmIChpdGVtLmFjdGlvbigpICE9IENvbnRleHRNZW51SXRlbVRhZ1NoYXJlTWVu dSkgewogICAgICAgICAgICAgcHJvcG9zZWRBUElJdGVtcy5hcHBlbmQoV2ViQ29udGV4dE1lbnVJ dGVtOjpjcmVhdGUoaXRlbSkpOwogICAgICAgICAgICAgY29udGludWU7CkBAIC00MjM1LDggKzQy MzUsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aW50ZXJuYWxTaG93Q29udGV4dE1lbnUoY29uc3Qg SW50UG9pbnQmIG1lbnVMb2NhdGlvbiwgY29uc3QgQwogICAgICAgICB1c2VQcm9wb3NlZEl0ZW1z ID0gZmFsc2U7CiAKICAgICBjb25zdCBWZWN0b3I8UmVmUHRyPFdlYkNvbnRleHRNZW51SXRlbT4+ JiBpdGVtc1RvU2hvdyA9IHVzZVByb3Bvc2VkSXRlbXMgPyBwcm9wb3NlZEFQSUl0ZW1zIDogY2xp ZW50SXRlbXM7Ci0gICAgaWYgKCFtX2NvbnRleHRNZW51Q2xpZW50LT5zaG93Q29udGV4dE1lbnUo KnRoaXMsIG1lbnVMb2NhdGlvbiwgaXRlbXNUb1Nob3cpKQotICAgICAgICBtX2FjdGl2ZUNvbnRl eHRNZW51LT5zaG93Q29udGV4dE1lbnUobWVudUxvY2F0aW9uLCBpdGVtc1RvU2hvdywgY29udGV4 dE1lbnVDb250ZXh0RGF0YSk7CisgICAgaWYgKCFtX2NvbnRleHRNZW51Q2xpZW50LT5zaG93Q29u dGV4dE1lbnUoKnRoaXMsIGNvbnRleHRNZW51Q29udGV4dERhdGEubWVudUxvY2F0aW9uKCksIGl0 ZW1zVG9TaG93KSkKKyAgICAgICAgbV9hY3RpdmVDb250ZXh0TWVudS0+c2hvd0NvbnRleHRNZW51 KGNvbnRleHRNZW51Q29udGV4dERhdGEubWVudUxvY2F0aW9uKCksIGl0ZW1zVG9TaG93LCBjb250 ZXh0TWVudUNvbnRleHREYXRhKTsKIAogICAgIG1fY29udGV4dE1lbnVDbGllbnQtPmNvbnRleHRN ZW51RGlzbWlzc2VkKCp0aGlzKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaAppbmRleCAxMjdiOWM3YjBmYmJhOWIwOWYwYWIxMGRjMWY4MjhkN2U0NWIzYTM3Li5lOGZi Y2IxOTg3YTAwZWUxZDZlYTIxOTgwMzNhYTlmZWZmYWI3NmJlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0xMjY2LDggKzEyNjYsOCBAQCBwcml2YXRlOgogICAg ICAgICBFbGlnaWJsZUZvckNsaWVudCwKICAgICAgICAgTm90RWxpZ2libGVGb3JDbGllbnQKICAg ICB9OwotICAgIHZvaWQgc2hvd0NvbnRleHRNZW51KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBt ZW51TG9jYXRpb24sIGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmLCBjb25zdCBWZWN0b3I8 V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4mLCBjb25zdCBVc2VyRGF0YSYpOwotICAgIHZvaWQgaW50 ZXJuYWxTaG93Q29udGV4dE1lbnUoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIG1lbnVMb2NhdGlv biwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYsIGNvbnN0IFZlY3RvcjxXZWJDb250ZXh0 TWVudUl0ZW1EYXRhPiYsIENvbnRleHRNZW51Q2xpZW50RWxpZ2liaWxpdHksIGNvbnN0IFVzZXJE YXRhJik7CisgICAgdm9pZCBzaG93Q29udGV4dE1lbnUoY29uc3QgQ29udGV4dE1lbnVDb250ZXh0 RGF0YSYsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBpbnRlcm5hbFNob3dDb250ZXh0TWVu dShjb25zdCBDb250ZXh0TWVudUNvbnRleHREYXRhJiwgQ29udGV4dE1lbnVDbGllbnRFbGlnaWJp bGl0eSwgY29uc3QgVXNlckRhdGEmKTsKICAgICBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW0gcGxh dGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbShjb25zdCBDb250ZXh0TWVudUNvbnRleHREYXRh Jik7CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkubWVzc2FnZXMuaW4KaW5kZXggZTkxZTBlZWNkZGJmNDFlZDBiMjY0NGYyY2RjMGE2Yzk4NzE1 M2IxMS4uOTJlNTQ4MzkzNmE3NzQ2Y2UyNGM5YmNmMmY2ZmJjMGI4MWMxYjQxNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCkBAIC0y NDgsNyArMjQ4LDcgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZVByb3h5IHsKIAogI2lmIEVOQUJMRShD T05URVhUX01FTlVTKQogICAgICMgQ29udGV4dE1lbnUgbWVzc2FnZXMKLSAgICBTaG93Q29udGV4 dE1lbnUoV2ViQ29yZTo6SW50UG9pbnQgbWVudUxvY2F0aW9uLCBXZWJLaXQ6OkNvbnRleHRNZW51 Q29udGV4dERhdGEgY29udGV4dE1lbnVDb250ZXh0RGF0YSwgVmVjdG9yPFdlYktpdDo6V2ViQ29u dGV4dE1lbnVJdGVtRGF0YT4gaXRlbXMsIFdlYktpdDo6VXNlckRhdGEgdXNlckRhdGEpCisgICAg U2hvd0NvbnRleHRNZW51KFdlYktpdDo6Q29udGV4dE1lbnVDb250ZXh0RGF0YSBjb250ZXh0TWVu dUNvbnRleHREYXRhLCBXZWJLaXQ6OlVzZXJEYXRhIHVzZXJEYXRhKQogI2VuZGlmCiAKICAgICAj IEF1dGhlbnRpY2F0aW9uIG1lc3NhZ2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvV2ViUGFnZVByb3h5TWFjLm1tCmluZGV4IDRmNGEzMmZlMTUwOTliZWY3YWNjMjU4YmE4NzQ0 NDE4NGYwMjVkMWIuLjNjNDI5ZTQ2Y2RhMmFhYjI0NTNjOWMxNDYyYzMwOGFmNWQ4ZGVjYjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCkBA IC02ODgsOSArNjg4LDkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNob3dUZWxlcGhvbmVOdW1iZXJN ZW51KGNvbnN0IFN0cmluZyYgdGVsZXBob25lTnVtYmVyLCBjb25zdAogdm9pZCBXZWJQYWdlUHJv eHk6OnNob3dTZWxlY3Rpb25TZXJ2aWNlTWVudShjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIHNl bGVjdGlvbkFzUlRGRCwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHRlbGVwaG9uZU51bWJlcnMsIGJv b2wgaXNFZGl0YWJsZSwgY29uc3QgSW50UG9pbnQmIHBvaW50KQogewogICAgIFZlY3RvcjxXZWJD b250ZXh0TWVudUl0ZW1EYXRhPiBpdGVtczsKLSAgICBDb250ZXh0TWVudUNvbnRleHREYXRhIGNv bnRleHREYXRhKHNlbGVjdGlvbkFzUlRGRC52ZWN0b3IoKSwgdGVsZXBob25lTnVtYmVycywgaXNF ZGl0YWJsZSk7CisgICAgQ29udGV4dE1lbnVDb250ZXh0RGF0YSBjb250ZXh0RGF0YShwb2ludCwg aXRlbXMsIHNlbGVjdGlvbkFzUlRGRC52ZWN0b3IoKSwgdGVsZXBob25lTnVtYmVycywgaXNFZGl0 YWJsZSk7CiAKLSAgICBpbnRlcm5hbFNob3dDb250ZXh0TWVudShwb2ludCwgY29udGV4dERhdGEs IGl0ZW1zLCBDb250ZXh0TWVudUNsaWVudEVsaWdpYmlsaXR5OjpOb3RFbGlnaWJsZUZvckNsaWVu dCwgVXNlckRhdGEoKSk7CisgICAgaW50ZXJuYWxTaG93Q29udGV4dE1lbnUoY29udGV4dERhdGEs IENvbnRleHRNZW51Q2xpZW50RWxpZ2liaWxpdHk6Ok5vdEVsaWdpYmxlRm9yQ2xpZW50LCBVc2Vy RGF0YSgpKTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViQ29udGV4dE1lbnUuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYkNvbnRleHRNZW51LmNwcAppbmRleCBlMDk3MmI1M2I2NGMzZTFiODY0N2Y0 MTJlNjAwNTAwOTc5MTFhYzQyLi5hM2RmZjRmNTg2YTM5MTdkMzU3MDA2ZjkwOGQ5ZGVlOTQzMTE4 ZjZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViQ29u dGV4dE1lbnUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJD b250ZXh0TWVudS5jcHAKQEAgLTYzLDExICs2MywxMyBAQCB2b2lkIFdlYkNvbnRleHRNZW51Ojpz aG93KCkKICAgICBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4gbWVudUl0ZW1zOwogICAg IFJlZlB0cjxBUEk6Ok9iamVjdD4gdXNlckRhdGE7CiAgICAgbWVudUl0ZW1zV2l0aFVzZXJEYXRh KG1lbnVJdGVtcywgdXNlckRhdGEpOwotICAgIENvbnRleHRNZW51Q29udGV4dERhdGEgY29udGV4 dE1lbnVDb250ZXh0RGF0YShjb250cm9sbGVyLmNvbnRleHQoKSk7CisKKyAgICBhdXRvIG1lbnVM b2NhdGlvbiA9IHZpZXctPmNvbnRlbnRzVG9XaW5kb3coY29udHJvbGxlci5oaXRUZXN0UmVzdWx0 KCkucm91bmRlZFBvaW50SW5Jbm5lck5vZGVGcmFtZSgpKTsKKyAgICBDb250ZXh0TWVudUNvbnRl eHREYXRhIGNvbnRleHRNZW51Q29udGV4dERhdGEobWVudUxvY2F0aW9uLCBtZW51SXRlbXMsIGNv bnRyb2xsZXIuY29udGV4dCgpKTsKIAogICAgIC8vIE1hcmsgdGhlIFdlYlBhZ2UgaGFzIGhhdmlu ZyBhIHNob3duIGNvbnRleHQgbWVudSB0aGVuIG5vdGlmeSB0aGUgVUlQcm9jZXNzLgogICAgIG1f cGFnZS0+Y29udGV4dE1lbnVTaG93aW5nKCk7Ci0gICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OlNob3dDb250ZXh0TWVudSh2aWV3LT5jb250ZW50c1RvV2luZG93KGNvbnRy b2xsZXIuaGl0VGVzdFJlc3VsdCgpLnJvdW5kZWRQb2ludEluSW5uZXJOb2RlRnJhbWUoKSksIGNv bnRleHRNZW51Q29udGV4dERhdGEsIG1lbnVJdGVtcywgVXNlckRhdGEoV2ViUHJvY2Vzczo6c2lu Z2xldG9uKCkudHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YS5nZXQoKSkuZ2V0KCkp KSk7CisgICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNob3dDb250ZXh0 TWVudShjb250ZXh0TWVudUNvbnRleHREYXRhLCBVc2VyRGF0YShXZWJQcm9jZXNzOjpzaW5nbGV0 b24oKS50cmFuc2Zvcm1PYmplY3RzVG9IYW5kbGVzKHVzZXJEYXRhLmdldCgpKS5nZXQoKSkpKTsK IH0KIAogdm9pZCBXZWJDb250ZXh0TWVudTo6aXRlbVNlbGVjdGVkKGNvbnN0IFdlYkNvbnRleHRN ZW51SXRlbURhdGEmIGl0ZW0pCg==