50042 2010-11-24 14:53:58 -0800 WK2 Context Menu Items need a user data object and a client callback for selection 2010-11-24 17:27:47 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 beidson beidson abarth eric sullivan webkit.review.bot oldest_to_newest 313480 0 beidson 2010-11-24 14:53:58 -0800 WK2 Context Menu Items need a user data object and a client callback for selection. For now I think the user data object is only important for "application custom" context menu items. If we later decide it's important to attach the user data objects to the WebCore items in the WebProcess, that can be done but it requires a large amount of platform-specific goop that we'll have to invent if that's needed. 313491 1 74801 beidson 2010-11-24 15:15:43 -0800 Created attachment 74801 Patch v1 313530 2 74801 mitz 2010-11-24 16:50:48 -0800 Comment on attachment 74801 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=74801&action=review > WebKit2/UIProcess/WebPageContextMenuClient.h:42 > + void customContextMenuItemSelected(WebPageProxy* page, const WebContextMenuItemData&); Can omit “page” here. > WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm:92 > + item.setUserData([static_cast<WebUserDataWrapper*>(representedObject) userData]); Needs a space before the *. > WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm:144 > + WebUserDataWrapper* wrapper = [[WebUserDataWrapper alloc] initWithUserData:items[i].userData()]; Ditto. 313534 3 sullivan 2010-11-24 16:53:11 -0800 Also missing a call to [super init] in the implementation of [WebUserDataWrapper initWithUserData:]. 313535 4 beidson 2010-11-24 16:53:31 -0800 Landed in r72707 313544 5 beidson 2010-11-24 17:09:46 -0800 Whoops, sorry about that John, had already prepped and typed the magic command when your feedback came through. I followed up with r72709 313550 6 webkit.review.bot 2010-11-24 17:27:47 -0800 http://trac.webkit.org/changeset/72707 might have broken GTK Linux 32-bit Release The following tests are not passing: inspector/extensions.html 74801 2010-11-24 15:15:43 -0800 2010-11-24 16:50:48 -0800 Patch v1 patch.txt text/plain 11333 beidson SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MjcwMCkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzkgQEAKKzIwMTAtMTEtMjQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1v cmUgb2YgPHJkYXI6Ly9wcm9ibGVtLzg2MTM3Mjc+IGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTAwNDIKKyAgICAgICAgV0syIENvbnRleHQgTWVudSBJdGVtcyBu ZWVkIGEgdXNlciBkYXRhIG9iamVjdCBhbmQgYSBjbGllbnQgY2FsbGJhY2sgZm9yIHNlbGVjdGlv bi4KKworICAgICAgICAqIFNoYXJlZC9BUEkvYy9XS0NvbnRleHRNZW51SXRlbS5jcHA6CisgICAg ICAgIChXS0NvbnRleHRNZW51SXRlbUdldFVzZXJEYXRhKToKKyAgICAgICAgKFdLQ29udGV4dE1l bnVJdGVtU2V0VXNlckRhdGEpOgorICAgICAgICAqIFNoYXJlZC9BUEkvYy9XS0NvbnRleHRNZW51 SXRlbS5oOgorCisgICAgICAgICogU2hhcmVkL1dlYkNvbnRleHRNZW51SXRlbS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbTo6dXNlckRhdGEpOgorICAgICAgICAoV2Vi S2l0OjpXZWJDb250ZXh0TWVudUl0ZW06OnNldFVzZXJEYXRhKToKKyAgICAgICAgKiBTaGFyZWQv V2ViQ29udGV4dE1lbnVJdGVtLmg6CisKKyAgICAgICAgKiBTaGFyZWQvV2ViQ29udGV4dE1lbnVJ dGVtRGF0YS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbURhdGE6OnVz ZXJEYXRhKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dE1lbnVJdGVtRGF0YTo6c2V0VXNl ckRhdGEpOgorICAgICAgICAqIFNoYXJlZC9XZWJDb250ZXh0TWVudUl0ZW1EYXRhLmg6CisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmg6CisKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZUNvbnRleHRNZW51Q2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNv bnRleHRNZW51Q2xpZW50OjpjdXN0b21Db250ZXh0TWVudUl0ZW1TZWxlY3RlZCk6IEFkZGVkIGZv ciBXSzIgYXBwcyB0byBnZXQgYSBjYWxsYmFjay4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFn ZUNvbnRleHRNZW51Q2xpZW50Lmg6CisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpjb250ZXh0TWVudUl0ZW1TZWxl Y3RlZCk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1t OgorICAgICAgICAoLVtXZWJVc2VyRGF0YVdyYXBwZXIgaW5pdFdpdGhVc2VyRGF0YTpXZWJLaXQ6 Ol0pOiBBZGQgYW4gIkFQSU9iamVjdCIgdXNlciBkYXRhIHdyYXBwZXIgY2xhc3MgdG8gYXNzb2Np YXRlIHdpdGggdGhlIE5TTWVudUl0ZW0uCisgICAgICAgICgtW1dlYlVzZXJEYXRhV3JhcHBlciBX ZWJLaXQ6Ol0pOgorICAgICAgICAoLVtXZWJNZW51VGFyZ2V0IGZvcndhcmRDb250ZXh0TWVudUFj dGlvbjpdKTogSW5jbHVkZSB0aGUgdXNlciBkYXRhIG9iamVjdCBpbiB0aGUgY3JlYXRlZCBDb250 ZXh0TWVudUl0ZW1EYXRhLgorICAgICAgICAoV2ViS2l0Ojpuc01lbnVJdGVtVmVjdG9yKToKKwog MjAxMC0xMS0yNCAgQW5kcmFzIEJlY3NpICA8YWJlY3NpQGluZi51LXN6ZWdlZC5odT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KSW5kZXg6IFdlYktp dDIvU2hhcmVkL1dlYkNvbnRleHRNZW51SXRlbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9T aGFyZWQvV2ViQ29udGV4dE1lbnVJdGVtLmNwcAkocmV2aXNpb24gNzI3MDApCisrKyBXZWJLaXQy L1NoYXJlZC9XZWJDb250ZXh0TWVudUl0ZW0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NCw1ICs3 NCwxNSBAQCBQYXNzUmVmUHRyPEltbXV0YWJsZUFycmF5PiBXZWJDb250ZXh0TWVuCiAgICAgcmV0 dXJuIEltbXV0YWJsZUFycmF5OjphZG9wdChyZXN1bHQpOwogfQogCitBUElPYmplY3QqIFdlYkNv bnRleHRNZW51SXRlbTo6dXNlckRhdGEoKSBjb25zdAoreworICAgIHJldHVybiBtX3dlYkNvbnRl eHRNZW51SXRlbURhdGEudXNlckRhdGEoKTsKK30KKwordm9pZCBXZWJDb250ZXh0TWVudUl0ZW06 OnNldFVzZXJEYXRhKEFQSU9iamVjdCogdXNlckRhdGEpCit7CisgICAgbV93ZWJDb250ZXh0TWVu dUl0ZW1EYXRhLnNldFVzZXJEYXRhKHVzZXJEYXRhKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2Vi S2l0CiAKSW5kZXg6IFdlYktpdDIvU2hhcmVkL1dlYkNvbnRleHRNZW51SXRlbS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdDIvU2hhcmVkL1dlYkNvbnRleHRNZW51SXRlbS5oCShyZXZpc2lvbiA3Mjcw MCkKKysrIFdlYktpdDIvU2hhcmVkL1dlYkNvbnRleHRNZW51SXRlbS5oCSh3b3JraW5nIGNvcHkp CkBAIC00Niw2ICs0Niw5IEBAIHB1YmxpYzoKICAgICAKICAgICBQYXNzUmVmUHRyPEltbXV0YWJs ZUFycmF5PiBzdWJtZW51SXRlbXNBc0ltbXV0YWJsZUFycmF5KCkgY29uc3Q7CiAgICAgCisgICAg QVBJT2JqZWN0KiB1c2VyRGF0YSgpIGNvbnN0OworICAgIHZvaWQgc2V0VXNlckRhdGEoQVBJT2Jq ZWN0Kik7CisgICAgCiAgICAgV2ViQ29udGV4dE1lbnVJdGVtRGF0YSogZGF0YSgpIHsgcmV0dXJu ICZtX3dlYkNvbnRleHRNZW51SXRlbURhdGE7IH0KIAogcHJpdmF0ZToKSW5kZXg6IFdlYktpdDIv U2hhcmVkL1dlYkNvbnRleHRNZW51SXRlbURhdGEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIv U2hhcmVkL1dlYkNvbnRleHRNZW51SXRlbURhdGEuY3BwCShyZXZpc2lvbiA3MjcwMCkKKysrIFdl YktpdDIvU2hhcmVkL1dlYkNvbnRleHRNZW51SXRlbURhdGEuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yNSw2ICsyNSw3IEBACiAKICNpbmNsdWRlICJXZWJDb250ZXh0TWVudUl0ZW1EYXRhLmgiCiAK KyNpbmNsdWRlICJBUElPYmplY3QuaCIKICNpbmNsdWRlICJBcmd1bWVudENvZGVycy5oIgogI2lu Y2x1ZGUgIkFyZ3VtZW50cy5oIgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KQEAgLTg3 LDYgKzg4LDE2IEBAIENvbnRleHRNZW51SXRlbSBXZWJDb250ZXh0TWVudUl0ZW1EYXRhOjoKICAg ICByZXR1cm4gQ29udGV4dE1lbnVJdGVtKG1fYWN0aW9uLCBtX3RpdGxlLCBtX2VuYWJsZWQsIG1f Y2hlY2tlZCwgc3ViTWVudUl0ZW1zKTsKIH0KIAorQVBJT2JqZWN0KiBXZWJDb250ZXh0TWVudUl0 ZW1EYXRhOjp1c2VyRGF0YSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fdXNlckRhdGEuZ2V0KCk7 Cit9CisKK3ZvaWQgV2ViQ29udGV4dE1lbnVJdGVtRGF0YTo6c2V0VXNlckRhdGEoQVBJT2JqZWN0 KiB1c2VyRGF0YSkKK3sKKyAgICBtX3VzZXJEYXRhID0gdXNlckRhdGE7Cit9CisgICAgCiB2b2lk IFdlYkNvbnRleHRNZW51SXRlbURhdGE6OmVuY29kZShDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIq IGVuY29kZXIpIGNvbnN0CiB7CiAgICAgZW5jb2Rlci0+ZW5jb2RlKENvcmVJUEM6OkluKHN0YXRp Y19jYXN0PHVpbnQzMl90PihtX3R5cGUpLCBzdGF0aWNfY2FzdDx1aW50MzJfdD4obV9hY3Rpb24p LCBtX3RpdGxlLCBtX2NoZWNrZWQsIG1fZW5hYmxlZCwgbV9zdWJtZW51KSk7CkluZGV4OiBXZWJL aXQyL1NoYXJlZC9XZWJDb250ZXh0TWVudUl0ZW1EYXRhLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 Mi9TaGFyZWQvV2ViQ29udGV4dE1lbnVJdGVtRGF0YS5oCShyZXZpc2lvbiA3MjcwMCkKKysrIFdl YktpdDIvU2hhcmVkL1dlYkNvbnRleHRNZW51SXRlbURhdGEuaAkod29ya2luZyBjb3B5KQpAQCAt NDAsNiArNDAsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewog CitjbGFzcyBBUElPYmplY3Q7CisKIGNsYXNzIFdlYkNvbnRleHRNZW51SXRlbURhdGEgewogcHVi bGljOgogICAgIFdlYkNvbnRleHRNZW51SXRlbURhdGEoKTsKQEAgLTU2LDYgKzU4LDkgQEAgcHVi bGljOgogICAgIAogICAgIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbSBjb3JlKCkgY29uc3Q7CiAg ICAgCisgICAgQVBJT2JqZWN0KiB1c2VyRGF0YSgpIGNvbnN0OworICAgIHZvaWQgc2V0VXNlckRh dGEoQVBJT2JqZWN0Kik7CisgICAgCiAgICAgdm9pZCBlbmNvZGUoQ29yZUlQQzo6QXJndW1lbnRF bmNvZGVyKikgY29uc3Q7CiAgICAgc3RhdGljIGJvb2wgZGVjb2RlKENvcmVJUEM6OkFyZ3VtZW50 RGVjb2RlciosIFdlYkNvbnRleHRNZW51SXRlbURhdGEmKTsKIApAQCAtNjYsNiArNzEsNyBAQCBw cml2YXRlOgogICAgIGJvb2wgbV9lbmFibGVkOwogICAgIGJvb2wgbV9jaGVja2VkOwogICAgIFZl Y3RvcjxXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiBtX3N1Ym1lbnU7CisgICAgUmVmUHRyPEFQSU9i amVjdD4gbV91c2VyRGF0YTsKIH07CiAKIFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiBr aXRJdGVtcyhWZWN0b3I8V2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtPiYsIFdlYkNvcmU6OkNvbnRl eHRNZW51Kik7CkluZGV4OiBXZWJLaXQyL1NoYXJlZC9BUEkvYy9XS0NvbnRleHRNZW51SXRlbS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tDb250ZXh0TWVudUl0ZW0u Y3BwCShyZXZpc2lvbiA3MjcwMCkKKysrIFdlYktpdDIvU2hhcmVkL0FQSS9jL1dLQ29udGV4dE1l bnVJdGVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODgsMyArODgsMTMgQEAgV0tBcnJheVJlZiBX S0NvbnRleHRNZW51Q29weVN1Ym1lbnVJdGVtcwogewogICAgIHJldHVybiB0b0FQSSh0b0ltcGwo aXRlbVJlZiktPnN1Ym1lbnVJdGVtc0FzSW1tdXRhYmxlQXJyYXkoKS5sZWFrUmVmKCkpOwogfQor CitXS1R5cGVSZWYgV0tDb250ZXh0TWVudUl0ZW1HZXRVc2VyRGF0YShXS0NvbnRleHRNZW51SXRl bVJlZiBpdGVtUmVmKQoreworICAgIHJldHVybiB0b0FQSSh0b0ltcGwoaXRlbVJlZiktPnVzZXJE YXRhKCkpOworfQorCit2b2lkIFdLQ29udGV4dE1lbnVJdGVtU2V0VXNlckRhdGEoV0tDb250ZXh0 TWVudUl0ZW1SZWYgaXRlbVJlZiwgV0tUeXBlUmVmIHVzZXJEYXRhUmVmKQoreworICAgIHRvSW1w bChpdGVtUmVmKS0+c2V0VXNlckRhdGEodG9JbXBsKHVzZXJEYXRhUmVmKSk7Cit9CkluZGV4OiBX ZWJLaXQyL1NoYXJlZC9BUEkvYy9XS0NvbnRleHRNZW51SXRlbS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdDIvU2hhcmVkL0FQSS9jL1dLQ29udGV4dE1lbnVJdGVtLmgJKHJldmlzaW9uIDcyNzAwKQor KysgV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tDb250ZXh0TWVudUl0ZW0uaAkod29ya2luZyBjb3B5 KQpAQCAtNDcsNiArNDcsOSBAQCBXS19FWFBPUlQgYm9vbCBXS0NvbnRleHRNZW51SXRlbUdldEVu YWJsCiBXS19FWFBPUlQgYm9vbCBXS0NvbnRleHRNZW51SXRlbUdldENoZWNrZWQoV0tDb250ZXh0 TWVudUl0ZW1SZWYpOwogV0tfRVhQT1JUIFdLQXJyYXlSZWYgV0tDb250ZXh0TWVudUNvcHlTdWJt ZW51SXRlbXMoV0tDb250ZXh0TWVudUl0ZW1SZWYpOwogCitXS19FWFBPUlQgV0tUeXBlUmVmIFdL Q29udGV4dE1lbnVJdGVtR2V0VXNlckRhdGEoV0tDb250ZXh0TWVudUl0ZW1SZWYpOworV0tfRVhQ T1JUIHZvaWQgV0tDb250ZXh0TWVudUl0ZW1TZXRVc2VyRGF0YShXS0NvbnRleHRNZW51SXRlbVJl ZiwgV0tUeXBlUmVmKTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAjZW5kaWYKSW5kZXg6IFdl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VDb250ZXh0TWVudUNsaWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50LmNwcAkocmV2aXNp b24gNzI3MDApCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlQ29udGV4dE1lbnVDbGllbnQu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NCw0ICs2NCwxMyBAQCBib29sIFdlYlBhZ2VDb250ZXh0 TWVudUNsaWVudDo6Z2V0Q29udGV4CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK3ZvaWQgV2ViUGFn ZUNvbnRleHRNZW51Q2xpZW50OjpjdXN0b21Db250ZXh0TWVudUl0ZW1TZWxlY3RlZChXZWJQYWdl UHJveHkqIHBhZ2UsIGNvbnN0IFdlYkNvbnRleHRNZW51SXRlbURhdGEmIGl0ZW1EYXRhKQorewor ICAgIGlmICghbV9jbGllbnQuY3VzdG9tQ29udGV4dE1lbnVJdGVtU2VsZWN0ZWQpCisgICAgICAg IHJldHVybjsKKworICAgIFJlZlB0cjxXZWJDb250ZXh0TWVudUl0ZW0+IGl0ZW0gPSBXZWJDb250 ZXh0TWVudUl0ZW06OmNyZWF0ZShpdGVtRGF0YSk7CisgICAgbV9jbGllbnQuY3VzdG9tQ29udGV4 dE1lbnVJdGVtU2VsZWN0ZWQodG9BUEkocGFnZSksIHRvQVBJKGl0ZW0uZ2V0KCkpLCBtX2NsaWVu dC5jbGllbnRJbmZvKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBXZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlQ29udGV4dE1lbnVDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlQ29udGV4dE1lbnVDbGllbnQuaAkocmV2aXNpb24gNzI3MDAp CisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlQ29udGV4dE1lbnVDbGllbnQuaAkod29ya2lu ZyBjb3B5KQpAQCAtMzksNiArMzksNyBAQCBjbGFzcyBXZWJQYWdlUHJveHk7CiBjbGFzcyBXZWJQ YWdlQ29udGV4dE1lbnVDbGllbnQgOiBwdWJsaWMgQVBJQ2xpZW50PFdLUGFnZUNvbnRleHRNZW51 Q2xpZW50PiB7CiBwdWJsaWM6CiAgICAgYm9vbCBnZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1l bnUoV2ViUGFnZVByb3h5KiwgY29uc3QgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+JiBw cm9wb3NlZE1lbnUsIFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYgY3VzdG9tTWVudSwg QVBJT2JqZWN0KiB1c2VyRGF0YSk7CisgICAgdm9pZCBjdXN0b21Db250ZXh0TWVudUl0ZW1TZWxl Y3RlZChXZWJQYWdlUHJveHkqIHBhZ2UsIGNvbnN0IFdlYkNvbnRleHRNZW51SXRlbURhdGEmKTsK IH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCShyZXZpc2lvbiA3MjcwMCkKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyOTEsNiArMTI5MSwxMiBAQCB2b2lkIFdlYlBhZ2VQ cm94eTo6c2hvd0NvbnRleHRNZW51KGNvbnN0CiAKIHZvaWQgV2ViUGFnZVByb3h5Ojpjb250ZXh0 TWVudUl0ZW1TZWxlY3RlZChjb25zdCBXZWJDb250ZXh0TWVudUl0ZW1EYXRhJiBpdGVtKQogewor ICAgIC8vIEFwcGxpY2F0aW9uIGN1c3RvbSBpdGVtcyBkb24ndCBuZWVkIHRvIHJvdW5kLXRyaXAg dGhyb3VnaCB0byBXZWJDb3JlIGluIHRoZSBXZWJQcm9jZXNzLgorICAgIGlmIChpdGVtLmFjdGlv bigpID49IENvbnRleHRNZW51SXRlbUJhc2VBcHBsaWNhdGlvblRhZykgeworICAgICAgICBtX2Nv bnRleHRNZW51Q2xpZW50LmN1c3RvbUNvbnRleHRNZW51SXRlbVNlbGVjdGVkKHRoaXMsIGl0ZW0p OworICAgICAgICByZXR1cm47CisgICAgfQorICAgIAogICAgIHByb2Nlc3MoKS0+c2VuZChNZXNz YWdlczo6V2ViUGFnZTo6RGlkU2VsZWN0SXRlbUZyb21BY3RpdmVDb250ZXh0TWVudShpdGVtKSwg bV9wYWdlSUQpOwogfQogCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAkocmV2aXNpb24g NzI3MDApCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAkod29ya2luZyBjb3B5 KQpAQCAtMjA1LDExICsyMDUsMTMgQEAgZW51bSB7CiAKIC8vIENvbnRleHRNZW51IGNsaWVudAog dHlwZWRlZiB2b2lkICgqV0tQYWdlR2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRDb250ZXh0TWVu dUNhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tBcnJheVJlZiBwcm9wb3NlZE1lbnUsIFdLQXJy YXlSZWYqIG5ld01lbnUsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5m byk7Cit0eXBlZGVmIHZvaWQgKCpXS1BhZ2VDdXN0b21Db250ZXh0TWVudUl0ZW1TZWxlY3RlZENh bGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tDb250ZXh0TWVudUl0ZW1SZWYgY29udGV4dE1lbnVJ dGVtLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKIAogc3RydWN0IFdLUGFnZUNvbnRleHRNZW51 Q2xpZW50IHsKICAgICBpbnQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHZlcnNpb247CiAgICAgY29uc3Qgdm9pZCAqICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjbGllbnRJ bmZvOwogICAgIFdLUGFnZUdldENvbnRleHRNZW51RnJvbVByb3Bvc2VkQ29udGV4dE1lbnVDYWxs YmFjayAgICAgICAgICAgICAgICAgZ2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51OworICAg IFdLUGFnZUN1c3RvbUNvbnRleHRNZW51SXRlbVNlbGVjdGVkQ2FsbGJhY2sgICAgICAgICAgICAg ICAgICAgICAgICAgY3VzdG9tQ29udGV4dE1lbnVJdGVtU2VsZWN0ZWQ7CiB9OwogdHlwZWRlZiBz dHJ1Y3QgV0tQYWdlQ29udGV4dE1lbnVDbGllbnQgV0tQYWdlQ29udGV4dE1lbnVDbGllbnQ7CiAK SW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFj Lm1tCShyZXZpc2lvbiA3MjcwMCkKKysrIFdlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0 TWVudVByb3h5TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw2ICszNCwyOCBAQAogCiB1c2lu ZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAorQGludGVyZmFjZSBXZWJVc2VyRGF0YVdyYXBwZXIgOiBO U09iamVjdCB7CisgICAgUmVmUHRyPFdlYktpdDo6QVBJT2JqZWN0PiBfd2ViVXNlckRhdGE7Cit9 CistIChpZClpbml0V2l0aFVzZXJEYXRhOihXZWJLaXQ6OkFQSU9iamVjdCopdXNlckRhdGE7Cist IChXZWJLaXQ6OkFQSU9iamVjdCopdXNlckRhdGE7CitAZW5kCisKK0BpbXBsZW1lbnRhdGlvbiBX ZWJVc2VyRGF0YVdyYXBwZXIKKworLSAoaWQpaW5pdFdpdGhVc2VyRGF0YTooV2ViS2l0OjpBUElP YmplY3QqKXVzZXJEYXRhCit7CisgICAgX3dlYlVzZXJEYXRhID0gdXNlckRhdGE7CisgICAgcmV0 dXJuIHNlbGY7Cit9CisKKy0gKFdlYktpdDo6QVBJT2JqZWN0Kil1c2VyRGF0YQoreworICAgIHJl dHVybiBfd2ViVXNlckRhdGEuZ2V0KCk7Cit9CisKK0BlbmQKKwogQGludGVyZmFjZSBXZWJNZW51 VGFyZ2V0IDogTlNPYmplY3QgewogICAgIFdlYktpdDo6V2ViQ29udGV4dE1lbnVQcm94eU1hYyog X21lbnVQcm94eTsKIH0KQEAgLTY0LDYgKzg2LDEyIEBAIC0gKHZvaWQpc2V0TWVudVByb3h5OihX ZWJLaXQ6OldlYkNvbnRleHQKIC0gKHZvaWQpZm9yd2FyZENvbnRleHRNZW51QWN0aW9uOihpZClz ZW5kZXIKIHsKICAgICBXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbURhdGEgaXRlbShBY3Rpb25U eXBlLCBzdGF0aWNfY2FzdDxDb250ZXh0TWVudUFjdGlvbj4oW3NlbmRlciB0YWddKSwgW3NlbmRl ciB0aXRsZV0sIFtzZW5kZXIgaXNFbmFibGVkXSwgW3NlbmRlciBzdGF0ZV0gPT0gTlNPblN0YXRl KTsKKyAgICAKKyAgICBpZiAoaWQgcmVwcmVzZW50ZWRPYmplY3QgPSBbc2VuZGVyIHJlcHJlc2Vu dGVkT2JqZWN0XSkgeworICAgICAgICBBU1NFUlQoW3JlcHJlc2VudGVkT2JqZWN0IGlzS2luZE9m Q2xhc3M6W1dlYlVzZXJEYXRhV3JhcHBlciBjbGFzc11dKTsKKyAgICAgICAgaXRlbS5zZXRVc2Vy RGF0YShbc3RhdGljX2Nhc3Q8V2ViVXNlckRhdGFXcmFwcGVyKj4ocmVwcmVzZW50ZWRPYmplY3Qp IHVzZXJEYXRhXSk7CisgICAgfQorICAgICAgICAgICAgCiAgICAgX21lbnVQcm94eS0+Y29udGV4 dE1lbnVJdGVtU2VsZWN0ZWQoaXRlbSk7CiB9CiAKQEAgLTExMiw2ICsxNDAsMTIgQEAgc3RhdGlj IFZlY3RvcjxSZXRhaW5QdHI8TlNNZW51SXRlbT4gPiBucwogICAgICAgICAgICAgW21lbnVJdGVt IHNldEVuYWJsZWQ6aXRlbXNbaV0uZW5hYmxlZCgpXTsKICAgICAgICAgICAgIFttZW51SXRlbSBz ZXRTdGF0ZTppdGVtc1tpXS5jaGVja2VkKCkgPyBOU09uU3RhdGUgOiBOU09mZlN0YXRlXTsKICAg ICAgICAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgaWYgKGl0ZW1zW2ldLnVzZXJEYXRh KCkpIHsKKyAgICAgICAgICAgICAgICBXZWJVc2VyRGF0YVdyYXBwZXIqIHdyYXBwZXIgPSBbW1dl YlVzZXJEYXRhV3JhcHBlciBhbGxvY10gaW5pdFdpdGhVc2VyRGF0YTppdGVtc1tpXS51c2VyRGF0 YSgpXTsKKyAgICAgICAgICAgICAgICBbbWVudUl0ZW0gc2V0UmVwcmVzZW50ZWRPYmplY3Q6d3Jh cHBlcl07CisgICAgICAgICAgICAgICAgW3dyYXBwZXIgcmVsZWFzZV07CisgICAgICAgICAgICB9 CisKICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoUmV0YWluUHRyPE5TTWVudUl0ZW0+KEFkb3B0 TlMsIG1lbnVJdGVtKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQo=