117298 2013-06-06 07:46:10 -0700 [EFL][WK2] Implement customContextMenuItemSelected 2013-06-07 04:20:20 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 116601 1 mpakulavelrutka mpakulavelrutka cdumez commit-queue eflews.bot gyuyoung.kim gyuyoung.kim lucas.de.marchi rakuco oldest_to_newest 897782 0 mpakulavelrutka 2013-06-06 07:46:10 -0700 Currently, when custom context menu item is selected, application is not informed. 898064 1 204015 mpakulavelrutka 2013-06-07 01:53:37 -0700 Created attachment 204015 proposed patch 898066 2 204015 eflews.bot 2013-06-07 01:58:11 -0700 Comment on attachment 204015 proposed patch Attachment 204015 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/695795 898070 3 204017 mpakulavelrutka 2013-06-07 02:08:45 -0700 Created attachment 204017 fixed patch 898091 4 204017 cdumez 2013-06-07 03:31:47 -0700 Comment on attachment 204017 fixed patch View in context: https://bugs.webkit.org/attachment.cgi?id=204017&action=review > Source/WebKit2/UIProcess/API/efl/EwkView.cpp:838 > + OwnPtr<EwkContextMenuItem> item = EwkContextMenuItem::create(contextMenuItem, 0); Wouldn't it be nicer to provide the existing EwkContextMenuItem object instead of creating a new one? I guess we can retrieve the existing one from m_contextMenu somehow. 898098 5 204017 cdumez 2013-06-07 03:51:41 -0700 Comment on attachment 204017 fixed patch Ok, r=me after discussing this offline. Figuring out the ewk item from the WK one is not trivial. 898102 6 204017 commit-queue 2013-06-07 04:20:17 -0700 Comment on attachment 204017 fixed patch Clearing flags on attachment: 204017 Committed r151313: <http://trac.webkit.org/changeset/151313> 898103 7 commit-queue 2013-06-07 04:20:20 -0700 All reviewed patches have been landed. Closing bug. 204015 2013-06-07 01:53:37 -0700 2013-06-07 02:08:45 -0700 proposed patch custom-item-selected.diff text/plain 5602 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwOWE4Zjg2Li5kMzllZDkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTMtMDYtMDYgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEltcGxlbWVudCBjdXN0b21Db250ZXh0TWVu dUl0ZW1TZWxlY3RlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTE3Mjk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV2hlbiBjdXN0b20gY29udGV4dCBtZW51IGl0ZW0gaXMgc2VsZWN0ZWQgdXNpbmcgZXdr IEFQSSwgdGhlIGZlZWRiYWNrIGlzIG5vdAorICAgICAgICBzZW50IGJhY2sgdG8gYXBwbGljYXRp b24sIGFzIGN1c3RvbUNvbnRleHRNZW51SXRlbVNlbGVjdGVkIHdhcyB1bmltcGxlbWVudGVkIGlu CisgICAgICAgIGNvbnRleHRNZW51Q2xpZW50RWZsLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9lZmwvRXdrVmlldy5jcHA6CisgICAgICAgIChFd2tWaWV3OjpjdXN0b21Db250ZXh0TWVudUl0 ZW1TZWxlY3RlZCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3Lmg6IGFkZGVkIGN1c3RvbV9pdGVtX3Nl bGVjdGVkIGNhbGxiYWNrLgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvQ29udGV4dE1lbnVDbGll bnRFZmwuY3BwOgorICAgICAgICAoY3VzdG9tQ29udGV4dE1lbnVJdGVtU2VsZWN0ZWQpOgorICAg ICAgICAoQ29udGV4dE1lbnVDbGllbnRFZmw6OkNvbnRleHRNZW51Q2xpZW50RWZsKToKKwogMjAx My0wNi0wNiAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIENvbXBs ZXRlbHkgaW5pdGlhbGl6ZSBDaGlsZFByb2Nlc3Mgc3RhdGUgb24gbGF1bmNoCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCmluZGV4IDc2MzVhMGYuLjdhZmVk NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCkBA IC01MSw2ICs1MSw3IEBACiAjaW5jbHVkZSAiV2ViUHJlZmVyZW5jZXMuaCIKICNpbmNsdWRlICJl d2tfYmFja19mb3J3YXJkX2xpc3RfcHJpdmF0ZS5oIgogI2luY2x1ZGUgImV3a19jb2xvcl9waWNr ZXJfcHJpdmF0ZS5oIgorI2luY2x1ZGUgImV3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmgi CiAjaW5jbHVkZSAiZXdrX2NvbnRleHRfbWVudV9wcml2YXRlLmgiCiAjaW5jbHVkZSAiZXdrX2Nv bnRleHRfcHJpdmF0ZS5oIgogI2luY2x1ZGUgImV3a19mYXZpY29uX2RhdGFiYXNlX3ByaXZhdGUu aCIKQEAgLTgyNiw2ICs4MjcsMTkgQEAgdm9pZCBFd2tWaWV3OjpkaXNtaXNzQ29sb3JQaWNrZXIo KQogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfVEVYVF9ESVJFQ1RJT05fUklHSFRf VE9fTEVGVCwgUlRMKTsKIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX1RFWFRfRElS RUNUSU9OX0xFRlRfVE9fUklHSFQsIExUUik7CiAKK3ZvaWQgRXdrVmlldzo6Y3VzdG9tQ29udGV4 dE1lbnVJdGVtU2VsZWN0ZWQoV0tDb250ZXh0TWVudUl0ZW1SZWYgY29udGV4dE1lbnVJdGVtKQor eworICAgIEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSA9IHNtYXJ0RGF0YSgpOworICAg IEFTU0VSVChzbWFydERhdGEtPmFwaSk7CisKKyAgICBpZiAoIXNtYXJ0RGF0YS0+YXBpLT5jdXN0 b21faXRlbV9zZWxlY3RlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgT3duUHRyPEV3a0NvbnRl eHRNZW51SXRlbT4gaXRlbSA9IEV3a0NvbnRleHRNZW51SXRlbTo6Y3JlYXRlKGNvbnRleHRNZW51 SXRlbSwgMCk7CisKKyAgICBzbWFydERhdGEtPmFwaS0+Y3VzdG9tX2l0ZW1fc2VsZWN0ZWQoc21h cnREYXRhLCBpdGVtLmdldCgpKTsKK30KKwogdm9pZCBFd2tWaWV3OjpzaG93Q29udGV4dE1lbnUo V0tQb2ludCBwb3NpdGlvbiwgV0tBcnJheVJlZiBpdGVtcykKIHsKICAgICBFd2tfVmlld19TbWFy dF9EYXRhKiBzZCA9IHNtYXJ0RGF0YSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvRXdrVmlldy5oCmluZGV4IDYxNmQ4ZGUuLjA0MzE3YTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmgKQEAgLTE3NSw2ICsxNzUsNyBAQCBwdWJsaWM6CiAg ICAgdm9pZCByZXF1ZXN0UG9wdXBNZW51KFdLUG9wdXBNZW51TGlzdGVuZXJSZWYsIGNvbnN0IFdL UmVjdCYsIFdLUG9wdXBJdGVtVGV4dERpcmVjdGlvbiwgZG91YmxlIHBhZ2VTY2FsZUZhY3Rvciwg V0tBcnJheVJlZiBpdGVtcywgaW50MzJfdCBzZWxlY3RlZEluZGV4KTsKICAgICB2b2lkIGNsb3Nl UG9wdXBNZW51KCk7CiAKKyAgICB2b2lkIGN1c3RvbUNvbnRleHRNZW51SXRlbVNlbGVjdGVkKFdL Q29udGV4dE1lbnVJdGVtUmVmIGNvbnRleHRNZW51SXRlbSk7CiAgICAgdm9pZCBzaG93Q29udGV4 dE1lbnUoV0tQb2ludCBwb3NpdGlvbiwgV0tBcnJheVJlZiBpdGVtcyk7CiAgICAgdm9pZCBoaWRl Q29udGV4dE1lbnUoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3ZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmgKaW5kZXggODEwZTUzNy4uODU5NWZkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfdmlldy5oCkBAIC0xMTQsNiArMTE0LDcgQEAgc3RydWN0IEV3a19WaWV3 X1NtYXJ0X0NsYXNzIHsKICAgICBFdmFzX1NtYXJ0X0NsYXNzIHNjOyAvKio8IGFsbCBidXQgJ2Rh dGEnIGlzIGZyZWUgdG8gYmUgY2hhbmdlZC4gKi8KICAgICB1bnNpZ25lZCBsb25nIHZlcnNpb247 CiAKKyAgICBFaW5hX0Jvb2wgKCpjdXN0b21faXRlbV9zZWxlY3RlZCkoRXdrX1ZpZXdfU21hcnRf RGF0YSAqc2QsIEV3a19Db250ZXh0X01lbnVfSXRlbSAqaXRlbSk7CiAgICAgRWluYV9Cb29sICgq Y29udGV4dF9tZW51X3Nob3cpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBFdmFzX0Nvb3JkIHgs IEV2YXNfQ29vcmQgeSwgRXdrX0NvbnRleHRfTWVudSAqbWVudSk7CiAgICAgRWluYV9Cb29sICgq Y29udGV4dF9tZW51X2hpZGUpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkKTsKIApAQCAtMTczLDcg KzE3NCw3IEBAIHN0cnVjdCBFd2tfVmlld19TbWFydF9DbGFzcyB7CiAgKiBAc2VlIEVXS19WSUVX X1NNQVJUX0NMQVNTX0lOSVRfVkVSU0lPTgogICogQHNlZSBFV0tfVklFV19TTUFSVF9DTEFTU19J TklUX05BTUVfVkVSU0lPTgogICovCi0jZGVmaW5lIEVXS19WSUVXX1NNQVJUX0NMQVNTX0lOSVQo c21hcnRfY2xhc3NfaW5pdCkge3NtYXJ0X2NsYXNzX2luaXQsIEVXS19WSUVXX1NNQVJUX0NMQVNT X1ZFUlNJT04sIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDB9CisjZGVmaW5lIEVXS19WSUVXX1NNQVJUX0NMQVNTX0lO SVQoc21hcnRfY2xhc3NfaW5pdCkge3NtYXJ0X2NsYXNzX2luaXQsIEVXS19WSUVXX1NNQVJUX0NM QVNTX1ZFUlNJT04sIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDB9CiAKIC8qKgogICogSW5pdGlhbGl6ZXIgdG8g emVybyBhIHdob2xlIEV3a19WaWV3X1NtYXJ0X0NsYXNzIHN0cnVjdHVyZS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvQ29udGV4dE1lbnVDbGllbnRFZmwuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9Db250ZXh0TWVudUNsaWVudEVmbC5jcHAKaW5k ZXggYWM0ZmRjYi4uMTZjYTA3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2VmbC9Db250ZXh0TWVudUNsaWVudEVmbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2VmbC9Db250ZXh0TWVudUNsaWVudEVmbC5jcHAKQEAgLTM3LDYgKzM3LDExIEBAIHN0YXRp YyBpbmxpbmUgQ29udGV4dE1lbnVDbGllbnRFZmwqIHRvQ29udGV4dENsaWVudEVmbChjb25zdCB2 b2lkKiBjbGllbnRJbmZvKQogICAgIHJldHVybiBzdGF0aWNfY2FzdDxDb250ZXh0TWVudUNsaWVu dEVmbCo+KGNvbnN0X2Nhc3Q8dm9pZCo+KGNsaWVudEluZm8pKTsKIH0KIAorc3RhdGljIHZvaWQg Y3VzdG9tQ29udGV4dE1lbnVJdGVtU2VsZWN0ZWQoV0tQYWdlUmVmLCBXS0NvbnRleHRNZW51SXRl bVJlZiBjb250ZXh0TWVudUl0ZW0sIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCit7CisgICAgdG9D b250ZXh0Q2xpZW50RWZsKGNsaWVudEluZm8pLT52aWV3KCktPmN1c3RvbUNvbnRleHRNZW51SXRl bVNlbGVjdGVkKGNvbnRleHRNZW51SXRlbSk7Cit9CisKIHN0YXRpYyB2b2lkIHNob3dDb250ZXh0 TWVudShXS1BhZ2VSZWYsIFdLUG9pbnQgbWVudUxvY2F0aW9uLCBXS0FycmF5UmVmIG1lbnVJdGVt cywgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKICAgICB0b0NvbnRleHRDbGllbnRFZmwoY2xp ZW50SW5mbyktPnZpZXcoKS0+c2hvd0NvbnRleHRNZW51KG1lbnVMb2NhdGlvbiwgbWVudUl0ZW1z KTsKQEAgLTU4LDcgKzYzLDcgQEAgQ29udGV4dE1lbnVDbGllbnRFZmw6OkNvbnRleHRNZW51Q2xp ZW50RWZsKEV3a1ZpZXcqIHZpZXcpCiAgICAgY29udGV4dE1lbnVDbGllbnQudmVyc2lvbiA9IGtX S1BhZ2VDb250ZXh0TWVudUNsaWVudEN1cnJlbnRWZXJzaW9uOwogICAgIGNvbnRleHRNZW51Q2xp ZW50LmNsaWVudEluZm8gPSB0aGlzOwogICAgIGNvbnRleHRNZW51Q2xpZW50LmdldENvbnRleHRN ZW51RnJvbVByb3Bvc2VkTWVudV9kZXByZWNhdGVkRm9yVXNlV2l0aFYwID0gMDsKLSAgICBjb250 ZXh0TWVudUNsaWVudC5jdXN0b21Db250ZXh0TWVudUl0ZW1TZWxlY3RlZCA9IDA7CisgICAgY29u dGV4dE1lbnVDbGllbnQuY3VzdG9tQ29udGV4dE1lbnVJdGVtU2VsZWN0ZWQgPSBjdXN0b21Db250 ZXh0TWVudUl0ZW1TZWxlY3RlZDsKICAgICBjb250ZXh0TWVudUNsaWVudC5jb250ZXh0TWVudURp c21pc3NlZCA9IDA7CiAgICAgY29udGV4dE1lbnVDbGllbnQuZ2V0Q29udGV4dE1lbnVGcm9tUHJv cG9zZWRNZW51ID0gMDsKICAgICBjb250ZXh0TWVudUNsaWVudC5zaG93Q29udGV4dE1lbnUgPSBz aG93Q29udGV4dE1lbnU7Cg== 204017 2013-06-07 02:08:45 -0700 2013-06-07 04:20:16 -0700 fixed patch custom-item-selected.diff text/plain 5567 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwOWE4Zjg2Li5kMzllZDkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTMtMDYtMDYgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEltcGxlbWVudCBjdXN0b21Db250ZXh0TWVu dUl0ZW1TZWxlY3RlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTE3Mjk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV2hlbiBjdXN0b20gY29udGV4dCBtZW51IGl0ZW0gaXMgc2VsZWN0ZWQgdXNpbmcgZXdr IEFQSSwgdGhlIGZlZWRiYWNrIGlzIG5vdAorICAgICAgICBzZW50IGJhY2sgdG8gYXBwbGljYXRp b24sIGFzIGN1c3RvbUNvbnRleHRNZW51SXRlbVNlbGVjdGVkIHdhcyB1bmltcGxlbWVudGVkIGlu CisgICAgICAgIGNvbnRleHRNZW51Q2xpZW50RWZsLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9lZmwvRXdrVmlldy5jcHA6CisgICAgICAgIChFd2tWaWV3OjpjdXN0b21Db250ZXh0TWVudUl0 ZW1TZWxlY3RlZCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3Lmg6IGFkZGVkIGN1c3RvbV9pdGVtX3Nl bGVjdGVkIGNhbGxiYWNrLgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvQ29udGV4dE1lbnVDbGll bnRFZmwuY3BwOgorICAgICAgICAoY3VzdG9tQ29udGV4dE1lbnVJdGVtU2VsZWN0ZWQpOgorICAg ICAgICAoQ29udGV4dE1lbnVDbGllbnRFZmw6OkNvbnRleHRNZW51Q2xpZW50RWZsKToKKwogMjAx My0wNi0wNiAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIENvbXBs ZXRlbHkgaW5pdGlhbGl6ZSBDaGlsZFByb2Nlc3Mgc3RhdGUgb24gbGF1bmNoCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCmluZGV4IDc2MzVhMGYuLjQyZDVm ZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCkBA IC01MSw2ICs1MSw3IEBACiAjaW5jbHVkZSAiV2ViUHJlZmVyZW5jZXMuaCIKICNpbmNsdWRlICJl d2tfYmFja19mb3J3YXJkX2xpc3RfcHJpdmF0ZS5oIgogI2luY2x1ZGUgImV3a19jb2xvcl9waWNr ZXJfcHJpdmF0ZS5oIgorI2luY2x1ZGUgImV3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmgi CiAjaW5jbHVkZSAiZXdrX2NvbnRleHRfbWVudV9wcml2YXRlLmgiCiAjaW5jbHVkZSAiZXdrX2Nv bnRleHRfcHJpdmF0ZS5oIgogI2luY2x1ZGUgImV3a19mYXZpY29uX2RhdGFiYXNlX3ByaXZhdGUu aCIKQEAgLTgyNiw2ICs4MjcsMTkgQEAgdm9pZCBFd2tWaWV3OjpkaXNtaXNzQ29sb3JQaWNrZXIo KQogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfVEVYVF9ESVJFQ1RJT05fUklHSFRf VE9fTEVGVCwgUlRMKTsKIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX1RFWFRfRElS RUNUSU9OX0xFRlRfVE9fUklHSFQsIExUUik7CiAKK3ZvaWQgRXdrVmlldzo6Y3VzdG9tQ29udGV4 dE1lbnVJdGVtU2VsZWN0ZWQoV0tDb250ZXh0TWVudUl0ZW1SZWYgY29udGV4dE1lbnVJdGVtKQor eworICAgIEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNkID0gc21hcnREYXRhKCk7CisgICAgQVNTRVJU KHNkLT5hcGkpOworCisgICAgaWYgKCFzZC0+YXBpLT5jdXN0b21faXRlbV9zZWxlY3RlZCkKKyAg ICAgICAgcmV0dXJuOworCisgICAgT3duUHRyPEV3a0NvbnRleHRNZW51SXRlbT4gaXRlbSA9IEV3 a0NvbnRleHRNZW51SXRlbTo6Y3JlYXRlKGNvbnRleHRNZW51SXRlbSwgMCk7CisKKyAgICBzZC0+ YXBpLT5jdXN0b21faXRlbV9zZWxlY3RlZChzZCwgaXRlbS5nZXQoKSk7Cit9CisKIHZvaWQgRXdr Vmlldzo6c2hvd0NvbnRleHRNZW51KFdLUG9pbnQgcG9zaXRpb24sIFdLQXJyYXlSZWYgaXRlbXMp CiB7CiAgICAgRXdrX1ZpZXdfU21hcnRfRGF0YSogc2QgPSBzbWFydERhdGEoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuaAppbmRleCA2MTZkOGRlLi4wNDMxN2E2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oCkBAIC0xNzUs NiArMTc1LDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVxdWVzdFBvcHVwTWVudShXS1BvcHVwTWVu dUxpc3RlbmVyUmVmLCBjb25zdCBXS1JlY3QmLCBXS1BvcHVwSXRlbVRleHREaXJlY3Rpb24sIGRv dWJsZSBwYWdlU2NhbGVGYWN0b3IsIFdLQXJyYXlSZWYgaXRlbXMsIGludDMyX3Qgc2VsZWN0ZWRJ bmRleCk7CiAgICAgdm9pZCBjbG9zZVBvcHVwTWVudSgpOwogCisgICAgdm9pZCBjdXN0b21Db250 ZXh0TWVudUl0ZW1TZWxlY3RlZChXS0NvbnRleHRNZW51SXRlbVJlZiBjb250ZXh0TWVudUl0ZW0p OwogICAgIHZvaWQgc2hvd0NvbnRleHRNZW51KFdLUG9pbnQgcG9zaXRpb24sIFdLQXJyYXlSZWYg aXRlbXMpOwogICAgIHZvaWQgaGlkZUNvbnRleHRNZW51KCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCmluZGV4IDgxMGU1MzcuLjg1OTVmZDcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaApAQCAtMTE0LDYgKzEx NCw3IEBAIHN0cnVjdCBFd2tfVmlld19TbWFydF9DbGFzcyB7CiAgICAgRXZhc19TbWFydF9DbGFz cyBzYzsgLyoqPCBhbGwgYnV0ICdkYXRhJyBpcyBmcmVlIHRvIGJlIGNoYW5nZWQuICovCiAgICAg dW5zaWduZWQgbG9uZyB2ZXJzaW9uOwogCisgICAgRWluYV9Cb29sICgqY3VzdG9tX2l0ZW1fc2Vs ZWN0ZWQpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBFd2tfQ29udGV4dF9NZW51X0l0ZW0gKml0 ZW0pOwogICAgIEVpbmFfQm9vbCAoKmNvbnRleHRfbWVudV9zaG93KShFd2tfVmlld19TbWFydF9E YXRhICpzZCwgRXZhc19Db29yZCB4LCBFdmFzX0Nvb3JkIHksIEV3a19Db250ZXh0X01lbnUgKm1l bnUpOwogICAgIEVpbmFfQm9vbCAoKmNvbnRleHRfbWVudV9oaWRlKShFd2tfVmlld19TbWFydF9E YXRhICpzZCk7CiAKQEAgLTE3Myw3ICsxNzQsNyBAQCBzdHJ1Y3QgRXdrX1ZpZXdfU21hcnRfQ2xh c3MgewogICogQHNlZSBFV0tfVklFV19TTUFSVF9DTEFTU19JTklUX1ZFUlNJT04KICAqIEBzZWUg RVdLX1ZJRVdfU01BUlRfQ0xBU1NfSU5JVF9OQU1FX1ZFUlNJT04KICAqLwotI2RlZmluZSBFV0tf VklFV19TTUFSVF9DTEFTU19JTklUKHNtYXJ0X2NsYXNzX2luaXQpIHtzbWFydF9jbGFzc19pbml0 LCBFV0tfVklFV19TTUFSVF9DTEFTU19WRVJTSU9OLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAw LCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwfQorI2RlZmluZSBF V0tfVklFV19TTUFSVF9DTEFTU19JTklUKHNtYXJ0X2NsYXNzX2luaXQpIHtzbWFydF9jbGFzc19p bml0LCBFV0tfVklFV19TTUFSVF9DTEFTU19WRVJTSU9OLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAw LCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwfQogCiAv KioKICAqIEluaXRpYWxpemVyIHRvIHplcm8gYSB3aG9sZSBFd2tfVmlld19TbWFydF9DbGFzcyBz dHJ1Y3R1cmUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0NvbnRl eHRNZW51Q2xpZW50RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvQ29udGV4 dE1lbnVDbGllbnRFZmwuY3BwCmluZGV4IGFjNGZkY2IuLjE2Y2EwN2QgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvQ29udGV4dE1lbnVDbGllbnRFZmwuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvQ29udGV4dE1lbnVDbGllbnRFZmwuY3BwCkBA IC0zNyw2ICszNywxMSBAQCBzdGF0aWMgaW5saW5lIENvbnRleHRNZW51Q2xpZW50RWZsKiB0b0Nv bnRleHRDbGllbnRFZmwoY29uc3Qgdm9pZCogY2xpZW50SW5mbykKICAgICByZXR1cm4gc3RhdGlj X2Nhc3Q8Q29udGV4dE1lbnVDbGllbnRFZmwqPihjb25zdF9jYXN0PHZvaWQqPihjbGllbnRJbmZv KSk7CiB9CiAKK3N0YXRpYyB2b2lkIGN1c3RvbUNvbnRleHRNZW51SXRlbVNlbGVjdGVkKFdLUGFn ZVJlZiwgV0tDb250ZXh0TWVudUl0ZW1SZWYgY29udGV4dE1lbnVJdGVtLCBjb25zdCB2b2lkKiBj bGllbnRJbmZvKQoreworICAgIHRvQ29udGV4dENsaWVudEVmbChjbGllbnRJbmZvKS0+dmlldygp LT5jdXN0b21Db250ZXh0TWVudUl0ZW1TZWxlY3RlZChjb250ZXh0TWVudUl0ZW0pOworfQorCiBz dGF0aWMgdm9pZCBzaG93Q29udGV4dE1lbnUoV0tQYWdlUmVmLCBXS1BvaW50IG1lbnVMb2NhdGlv biwgV0tBcnJheVJlZiBtZW51SXRlbXMsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAg dG9Db250ZXh0Q2xpZW50RWZsKGNsaWVudEluZm8pLT52aWV3KCktPnNob3dDb250ZXh0TWVudSht ZW51TG9jYXRpb24sIG1lbnVJdGVtcyk7CkBAIC01OCw3ICs2Myw3IEBAIENvbnRleHRNZW51Q2xp ZW50RWZsOjpDb250ZXh0TWVudUNsaWVudEVmbChFd2tWaWV3KiB2aWV3KQogICAgIGNvbnRleHRN ZW51Q2xpZW50LnZlcnNpb24gPSBrV0tQYWdlQ29udGV4dE1lbnVDbGllbnRDdXJyZW50VmVyc2lv bjsKICAgICBjb250ZXh0TWVudUNsaWVudC5jbGllbnRJbmZvID0gdGhpczsKICAgICBjb250ZXh0 TWVudUNsaWVudC5nZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnVfZGVwcmVjYXRlZEZvclVz ZVdpdGhWMCA9IDA7Ci0gICAgY29udGV4dE1lbnVDbGllbnQuY3VzdG9tQ29udGV4dE1lbnVJdGVt U2VsZWN0ZWQgPSAwOworICAgIGNvbnRleHRNZW51Q2xpZW50LmN1c3RvbUNvbnRleHRNZW51SXRl bVNlbGVjdGVkID0gY3VzdG9tQ29udGV4dE1lbnVJdGVtU2VsZWN0ZWQ7CiAgICAgY29udGV4dE1l bnVDbGllbnQuY29udGV4dE1lbnVEaXNtaXNzZWQgPSAwOwogICAgIGNvbnRleHRNZW51Q2xpZW50 LmdldENvbnRleHRNZW51RnJvbVByb3Bvc2VkTWVudSA9IDA7CiAgICAgY29udGV4dE1lbnVDbGll bnQuc2hvd0NvbnRleHRNZW51ID0gc2hvd0NvbnRleHRNZW51Owo=