116959 2013-05-29 06:07:49 -0700 [EFl][WK2] Sub menu items should be of EWK_SUBMENU_TYPE and not checkable 2013-06-04 07:02:14 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mpakulavelrutka mpakulavelrutka cdumez commit-queue gyuyoung.kim lucas.de.marchi rakuco oldest_to_newest 894913 0 mpakulavelrutka 2013-05-29 06:07:49 -0700 Currently using ewk API it is possible to create a sub menu item which is not an EWK_SUBMENU_TYPE or set checkable flag for it, while it is not possible for items created by WebKit. This patch changes ewk context menu API to match WebKit behaviour, by creating sub menus with proper type and checkable flags. 894917 1 203190 mpakulavelrutka 2013-05-29 06:22:29 -0700 Created attachment 203190 patch 896838 2 203190 gyuyoung.kim 2013-06-04 04:53:13 -0700 Comment on attachment 203190 patch View in context: https://bugs.webkit.org/attachment.cgi?id=203190&action=review LGTM. This patch follows a policy of WK2 Context menu C APIs. > Source/WebKit2/ChangeLog:10 > + This patch changes ewk context menu API to match WebKit behaviour, by creating sub menus with WebKit behaviour -> WebKit2 behaviour ? It looks WebKit1 has other behaviour differ from port to port. > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context_menu.cpp:103 > + Ewk_Context_Menu_Item* newItem3 = ewk_context_menu_item_new_with_submenu(EWK_CONTEXT_MENU_ITEM_TAG_OTHER, "New Custom Item 3", true, subMenu2); Isn't it better to use other action ? 896840 3 mpakulavelrutka 2013-06-04 05:00:54 -0700 (In reply to comment #2) > (From update of attachment 203190 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=203190&action=review > > LGTM. This patch follows a policy of WK2 Context menu C APIs. > > > Source/WebKit2/ChangeLog:10 > > + This patch changes ewk context menu API to match WebKit behaviour, by creating sub menus with > > WebKit behaviour -> WebKit2 behaviour ? It looks WebKit1 has other behaviour differ from port to port. Ok I will fix it. > > > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context_menu.cpp:103 > > + Ewk_Context_Menu_Item* newItem3 = ewk_context_menu_item_new_with_submenu(EWK_CONTEXT_MENU_ITEM_TAG_OTHER, "New Custom Item 3", true, subMenu2); > > Isn't it better to use other action ? I am fix context menu API tests in this bug https://bugs.webkit.org/show_bug.cgi?id=116601. There I am changing TAG_OTHER to TAG_CUSTOM as TAG_OTHER seems to be some kind of WebKit-GTK specific tag. 896843 4 203684 mpakulavelrutka 2013-06-04 05:07:04 -0700 Created attachment 203684 fixed changelog 896880 5 203684 commit-queue 2013-06-04 07:02:09 -0700 Comment on attachment 203684 fixed changelog Clearing flags on attachment: 203684 Committed r151168: <http://trac.webkit.org/changeset/151168> 896881 6 commit-queue 2013-06-04 07:02:14 -0700 All reviewed patches have been landed. Closing bug. 203190 2013-05-29 06:22:29 -0700 2013-06-04 05:07:04 -0700 patch ewk-submenu-api.diff text/plain 5725 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzMzQxZjNmLi45NGRiZmRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTMtMDUtMjkgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZsXVtXSzJdIFN1YiBtZW51IGl0ZW1zIHNob3VsZCBiZSBv ZiBFV0tfU1VCTUVOVV9UWVBFIGFuZCBub3QgY2hlY2thYmxlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTY5NTkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDdXJyZW50bHkgdXNpbmcgZXdrIEFQSSBpdCBp cyBwb3NzaWJsZSB0byBjcmVhdGUgYSBzdWIgbWVudSBpdGVtIHdoaWNoIGlzIG5vdCBhbiBFV0tf U1VCTUVOVV9UWVBFCisgICAgICAgIG9yIHNldCBjaGVja2FibGUgZmxhZyBmb3IgaXQsIHdoaWxl IGl0IGlzIG5vdCBwb3NzaWJsZSBmb3IgaXRlbXMgY3JlYXRlZCBieSBXZWJLaXQuIAorICAgICAg ICBUaGlzIHBhdGNoIGNoYW5nZXMgZXdrIGNvbnRleHQgbWVudSBBUEkgdG8gbWF0Y2ggV2ViS2l0 IGJlaGF2aW91ciwgYnkgY3JlYXRpbmcgc3ViIG1lbnVzIHdpdGgKKyAgICAgICAgcHJvcGVyIHR5 cGUgYW5kIGNoZWNrYWJsZSBmbGFncy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3 a19jb250ZXh0X21lbnVfaXRlbS5jcHA6CisgICAgICAgIChld2tfY29udGV4dF9tZW51X2l0ZW1f bmV3X3dpdGhfc3VibWVudSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRl eHRfbWVudV9pdGVtLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9l d2syX2NvbnRleHRfbWVudS5jcHA6CisgICAgICAgIChzaG93Q29udGV4dE1lbnUpOgorCiAyMDEz LTA1LTI5ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkLiBGaXggbWFrZSBkaXN0Y2hlY2suCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcApp bmRleCA4YzU1NWRiLi41ZTRjYTk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAKQEAgLTY2LDExICs2 NiwxMSBAQCBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXco RXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZQogICAgIHJldHVybiBFd2tfQ29udGV4dF9N ZW51X0l0ZW06OmNyZWF0ZSh0eXBlLCBhY3Rpb24sIHRpdGxlLCBjaGVja2VkLCBlbmFibGVkKS5s ZWFrUHRyKCk7CiB9CiAKLUV3a19Db250ZXh0X01lbnVfSXRlbSogZXdrX2NvbnRleHRfbWVudV9p dGVtX25ld193aXRoX3N1Ym1lbnUoRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdr X0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5h X0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a19Db250ZXh0X01lbnUqIHN1Yk1l bnUpCitFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0 aF9zdWJtZW51KEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFy KiB0aXRsZSwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a19Db250ZXh0X01lbnUqIHN1Yk1lbnUpCiB7 CiAgICAgRVdLX09CSl9HRVRfSU1QTF9PUl9SRVRVUk4oRXdrQ29udGV4dE1lbnUsIHN1Yk1lbnUs IHN1Yk1lbnVJbXBsLCAwKTsKIAotICAgIHJldHVybiBFd2tfQ29udGV4dF9NZW51X0l0ZW06OmNy ZWF0ZSh0eXBlLCBhY3Rpb24sIHRpdGxlLCBjaGVja2VkLCBlbmFibGVkLCBzdWJNZW51SW1wbCku bGVha1B0cigpOworICAgIHJldHVybiBFd2tfQ29udGV4dF9NZW51X0l0ZW06OmNyZWF0ZShFV0tf U1VCTUVOVV9UWVBFLCBhY3Rpb24sIHRpdGxlLCBmYWxzZSwgZW5hYmxlZCwgc3ViTWVudUltcGwp LmxlYWtQdHIoKTsKIH0KIAogRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgZXdrX2NvbnRleHRf bWVudV9pdGVtX3R5cGVfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21l bnVfaXRlbS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRf bWVudV9pdGVtLmgKaW5kZXggYjAxNGNiYy4uNjgxMTAxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmgKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmgKQEAg LTE0NCwxOSArMTQ0LDE3IEBAIHR5cGVkZWYgZW51bSB7CiBFQVBJIEV3a19Db250ZXh0X01lbnVf SXRlbSAqZXdrX2NvbnRleHRfbWVudV9pdGVtX25ldyhFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlw ZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciAq dGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCk7CiAKIC8qKgotICog Q3JlYXRlcyBhIG5ldyBpdGVtIG9mIHRoZSBjb250ZXh0IG1lbnUuCisgKiBDcmVhdGVzIGEgbmV3 IHN1YiBtZW51IHR5cGUgaXRlbSBvZiB0aGUgY29udGV4dCBtZW51LgogICoKLSAqIEBwYXJhbSB0 eXBlIHNwZWNpZmllcyBhIHR5cGUgb2YgdGhlIGl0ZW0KICAqIEBwYXJhbSBhY3Rpb24gc3BlY2lm aWVzIGEgYWN0aW9uIG9mIHRoZSBpdGVtCiAgKiBAcGFyYW0gdGl0bGUgc3BlY2lmaWVzIGEgdGl0 bGUgb2YgdGhlIGl0ZW0KLSAqIEBwYXJhbSBjaGVja2VkIEBjIEVJTkFfVFJVRSBpZiB0aGUgaXRl bSBzaG91bGQgYmUgdG9nZ2xlZCBvciBAYyBFSU5BX0ZBTFNFIGlmIG5vdAogICogQHBhcmFtIGVu YWJsZWQgQGMgRUlOQV9UUlVFIHRvIGVuYWJsZSB0aGUgaXRlbSBvciBAYyBFSU5BX0ZBTFNFIHRv IGRpc2FibGUKICAqIEBwYXJhbSBzdWJtZW51IHNwZWNpZmllcyBhIHN1Ym1lbnUgb2YgdGhlIGl0 ZW0KICAqIEByZXR1cm4gdGhlIHBvaW50ZXIgdG8gdGhlIG5ldyBpdGVtCiAgKgogICogQHNlZSBl d2tfY29udGV4dF9tZW51X2l0ZW1fbmV3CiAgKi8KLUVBUEkgRXdrX0NvbnRleHRfTWVudV9JdGVt ICpld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3X3dpdGhfc3VibWVudShFd2tfQ29udGV4dF9NZW51 X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29u c3QgY2hhciAqdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdr X0NvbnRleHRfTWVudSAqc3VibWVudSk7CitFQVBJIEV3a19Db250ZXh0X01lbnVfSXRlbSAqZXdr X2NvbnRleHRfbWVudV9pdGVtX25ld193aXRoX3N1Ym1lbnUoRXdrX0NvbnRleHRfTWVudV9JdGVt X0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIgKnRpdGxlLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdr X0NvbnRleHRfTWVudSAqc3VibWVudSk7CiAKIC8qKgogICogR2V0cyB0eXBlIG9mIHRoZSBpdGVt LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVz dF9ld2syX2NvbnRleHRfbWVudS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNwcAppbmRleCBiYTJjOGRlLi43NjEyNTJh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0 X2V3azJfY29udGV4dF9tZW51LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNwcApAQCAtODgsNyArODgsNyBAQCBz dGF0aWMgRWluYV9Cb29sIHNob3dDb250ZXh0TWVudShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFy dERhdGEsIEV2YXNfQ29vcmQgeCwgRQogICAgIC8vIFdoZW4gY29udGV4dCBtZW51IGlzIGNyZWF0 ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9uZXdfd2l0aF9pdGVtcywgaXRlbXMgc2hvdWxkIGhh dmUgcGFyZW50IG1lbnUuCiAgICAgRVhQRUNUX0VRKHN1Yk1lbnUsIGV3a19jb250ZXh0X21lbnVf aXRlbV9wYXJlbnRfbWVudV9nZXQoc3ViTWVudUl0ZW0xKSk7CiAKLSAgICBFd2tfQ29udGV4dF9N ZW51X0l0ZW0qIG5ld0l0ZW0yID0gZXdrX2NvbnRleHRfbWVudV9pdGVtX25ld193aXRoX3N1Ym1l bnUoRVdLX1NVQk1FTlVfVFlQRSwgRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19PVEhFUiwgIk5l dyBDdXN0b20gSXRlbSAyIiwgZmFsc2UsIHRydWUsIHN1Yk1lbnUpOworICAgIEV3a19Db250ZXh0 X01lbnVfSXRlbSogbmV3SXRlbTIgPSBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3X3dpdGhfc3Vi bWVudShFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX09USEVSLCAiTmV3IEN1c3RvbSBJdGVtIDIi LCB0cnVlLCBzdWJNZW51KTsKICAgICAvLyBXaGVuIGNvbnRleHQgbWVudSBpdGVtIGlzIGNyZWF0 ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9pdGVtX25ld193aXRoX3N1Ym1lbnUsIGl0IHNob3Vs ZCBub3QgaGF2ZSBwYXJlbnQgbWVudS4KICAgICBFWFBFQ1RfRVEoMCwgZXdrX2NvbnRleHRfbWVu dV9pdGVtX3BhcmVudF9tZW51X2dldChuZXdJdGVtKSk7CiAgICAgZXdrX2NvbnRleHRfbWVudV9p dGVtX2FwcGVuZChjb250ZXh0TWVudSwgbmV3SXRlbTIpOwpAQCAtMTAwLDcgKzEwMCw3IEBAIHN0 YXRpYyBFaW5hX0Jvb2wgc2hvd0NvbnRleHRNZW51KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0 RGF0YSwgRXZhc19Db29yZCB4LCBFCiAgICAgRVhQRUNUX0VRKGNvbnRleHRNZW51LCBld2tfY29u dGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0pKTsKIAogICAgIEV3a19Db250 ZXh0X01lbnUqIHN1Yk1lbnUyID0gZXdrX2NvbnRleHRfbWVudV9uZXcoKTsKLSAgICBFd2tfQ29u dGV4dF9NZW51X0l0ZW0qIG5ld0l0ZW0zID0gZXdrX2NvbnRleHRfbWVudV9pdGVtX25ld193aXRo X3N1Ym1lbnUoRVdLX1NVQk1FTlVfVFlQRSwgRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19PVEhF UiwgIk5ldyBDdXN0b20gSXRlbSAzIiwgZmFsc2UsIHRydWUsIHN1Yk1lbnUyKTsKKyAgICBFd2tf Q29udGV4dF9NZW51X0l0ZW0qIG5ld0l0ZW0zID0gZXdrX2NvbnRleHRfbWVudV9pdGVtX25ld193 aXRoX3N1Ym1lbnUoRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19PVEhFUiwgIk5ldyBDdXN0b20g SXRlbSAzIiwgdHJ1ZSwgc3ViTWVudTIpOwogICAgIGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBl bmQoY29udGV4dE1lbnUsIG5ld0l0ZW0zKTsKIAogICAgIGxpc3QgPSBld2tfY29udGV4dF9tZW51 X2l0ZW1zX2dldChjb250ZXh0TWVudSk7Cg== 203684 2013-06-04 05:07:04 -0700 2013-06-04 07:02:09 -0700 fixed changelog ewk_submenu_api3.diff text/plain 5813 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlM2Q3NDE4Li5kYzFkZGVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMg QEAKIDIwMTMtMDYtMDQgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KIAorICAgICAgICBbRUZsXVtXSzJdIFN1YiBtZW51IGl0ZW1zIHNob3VsZCBiZSBv ZiBFV0tfU1VCTUVOVV9UWVBFIGFuZCBub3QgY2hlY2thYmxlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTY5NTkKKworICAgICAgICBSZXZpZXdlZCBi eSBHeXV5b3VuZyBLaW0uCisKKyAgICAgICAgQ3VycmVudGx5IHVzaW5nIGV3ayBBUEkgaXQgaXMg cG9zc2libGUgdG8gY3JlYXRlIGEgc3ViIG1lbnUgaXRlbSB3aGljaCBpcyBub3QgYW4gRVdLX1NV Qk1FTlVfVFlQRQorICAgICAgICBvciBzZXQgY2hlY2thYmxlIGZsYWcgZm9yIGl0LCB3aGlsZSBp dCBpcyBub3QgcG9zc2libGUgZm9yIGl0ZW1zIGNyZWF0ZWQgYnkgV2ViS2l0LiAKKyAgICAgICAg VGhpcyBwYXRjaCBjaGFuZ2VzIGV3ayBjb250ZXh0IG1lbnUgQVBJIHRvIG1hdGNoIFdlYktpdDIg YmVoYXZpb3VyLCBieSBjcmVhdGluZyBzdWIgbWVudXMgd2l0aAorICAgICAgICBwcm9wZXIgdHlw ZSBhbmQgY2hlY2thYmxlIGZsYWdzLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdr X2NvbnRleHRfbWVudV9pdGVtLmNwcDoKKyAgICAgICAgKGV3a19jb250ZXh0X21lbnVfaXRlbV9u ZXdfd2l0aF9zdWJtZW51KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4 dF9tZW51X2l0ZW0uaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3 azJfY29udGV4dF9tZW51LmNwcDoKKyAgICAgICAgKHNob3dDb250ZXh0TWVudSk6CisKKzIwMTMt MDYtMDQgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1zdW5nLmNvbT4K KwogICAgICAgICBbRUZMXVtXSzJdIEN1c3RvbSBjb250ZXh0IG1lbnUgaXRlbXMgY2Fubm90IGJl IHNlbGVjdGVkCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTY4MzAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAKaW5kZXggOGM1NTVkYi4uNWU0Y2E5OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVu dV9pdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29u dGV4dF9tZW51X2l0ZW0uY3BwCkBAIC02NiwxMSArNjYsMTEgQEAgRXdrX0NvbnRleHRfTWVudV9J dGVtKiBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3KEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBl IHR5cGUKICAgICByZXR1cm4gRXdrX0NvbnRleHRfTWVudV9JdGVtOjpjcmVhdGUodHlwZSwgYWN0 aW9uLCB0aXRsZSwgY2hlY2tlZCwgZW5hYmxlZCkubGVha1B0cigpOwogfQogCi1Fd2tfQ29udGV4 dF9NZW51X0l0ZW0qIGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KEV3a19D b250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24g YWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBl bmFibGVkLCBFd2tfQ29udGV4dF9NZW51KiBzdWJNZW51KQorRXdrX0NvbnRleHRfTWVudV9JdGVt KiBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3X3dpdGhfc3VibWVudShFd2tfQ29udGV4dF9NZW51 X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBlbmFibGVk LCBFd2tfQ29udGV4dF9NZW51KiBzdWJNZW51KQogewogICAgIEVXS19PQkpfR0VUX0lNUExfT1Jf UkVUVVJOKEV3a0NvbnRleHRNZW51LCBzdWJNZW51LCBzdWJNZW51SW1wbCwgMCk7CiAKLSAgICBy ZXR1cm4gRXdrX0NvbnRleHRfTWVudV9JdGVtOjpjcmVhdGUodHlwZSwgYWN0aW9uLCB0aXRsZSwg Y2hlY2tlZCwgZW5hYmxlZCwgc3ViTWVudUltcGwpLmxlYWtQdHIoKTsKKyAgICByZXR1cm4gRXdr X0NvbnRleHRfTWVudV9JdGVtOjpjcmVhdGUoRVdLX1NVQk1FTlVfVFlQRSwgYWN0aW9uLCB0aXRs ZSwgZmFsc2UsIGVuYWJsZWQsIHN1Yk1lbnVJbXBsKS5sZWFrUHRyKCk7CiB9CiAKIEV3a19Db250 ZXh0X01lbnVfSXRlbV9UeXBlIGV3a19jb250ZXh0X21lbnVfaXRlbV90eXBlX2dldChjb25zdCBF d2tfQ29udGV4dF9NZW51X0l0ZW0qIGl0ZW0pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5oCmluZGV4IGIwMTRjYmMu LjY4MTEwMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a19jb250ZXh0X21lbnVfaXRlbS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5oCkBAIC0xNDQsMTkgKzE0NCwxNyBAQCB0eXBlZGVm IGVudW0gewogRUFQSSBFd2tfQ29udGV4dF9NZW51X0l0ZW0gKmV3a19jb250ZXh0X21lbnVfaXRl bV9uZXcoRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9J dGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIgKnRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwg RWluYV9Cb29sIGVuYWJsZWQpOwogCiAvKioKLSAqIENyZWF0ZXMgYSBuZXcgaXRlbSBvZiB0aGUg Y29udGV4dCBtZW51LgorICogQ3JlYXRlcyBhIG5ldyBzdWIgbWVudSB0eXBlIGl0ZW0gb2YgdGhl IGNvbnRleHQgbWVudS4KICAqCi0gKiBAcGFyYW0gdHlwZSBzcGVjaWZpZXMgYSB0eXBlIG9mIHRo ZSBpdGVtCiAgKiBAcGFyYW0gYWN0aW9uIHNwZWNpZmllcyBhIGFjdGlvbiBvZiB0aGUgaXRlbQog ICogQHBhcmFtIHRpdGxlIHNwZWNpZmllcyBhIHRpdGxlIG9mIHRoZSBpdGVtCi0gKiBAcGFyYW0g Y2hlY2tlZCBAYyBFSU5BX1RSVUUgaWYgdGhlIGl0ZW0gc2hvdWxkIGJlIHRvZ2dsZWQgb3IgQGMg RUlOQV9GQUxTRSBpZiBub3QKICAqIEBwYXJhbSBlbmFibGVkIEBjIEVJTkFfVFJVRSB0byBlbmFi bGUgdGhlIGl0ZW0gb3IgQGMgRUlOQV9GQUxTRSB0byBkaXNhYmxlCiAgKiBAcGFyYW0gc3VibWVu dSBzcGVjaWZpZXMgYSBzdWJtZW51IG9mIHRoZSBpdGVtCiAgKiBAcmV0dXJuIHRoZSBwb2ludGVy IHRvIHRoZSBuZXcgaXRlbQogICoKICAqIEBzZWUgZXdrX2NvbnRleHRfbWVudV9pdGVtX25ldwog ICovCi1FQVBJIEV3a19Db250ZXh0X01lbnVfSXRlbSAqZXdrX2NvbnRleHRfbWVudV9pdGVtX25l d193aXRoX3N1Ym1lbnUoRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRl eHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIgKnRpdGxlLCBFaW5hX0Jvb2wg Y2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a19Db250ZXh0X01lbnUgKnN1Ym1lbnUpOwor RUFQSSBFd2tfQ29udGV4dF9NZW51X0l0ZW0gKmV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0 aF9zdWJtZW51KEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFy ICp0aXRsZSwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a19Db250ZXh0X01lbnUgKnN1Ym1lbnUpOwog CiAvKioKICAqIEdldHMgdHlwZSBvZiB0aGUgaXRlbS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0X21lbnUuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHRf bWVudS5jcHAKaW5kZXggYmEyYzhkZS4uNzYxMjUyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHRfbWVudS5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRl eHRfbWVudS5jcHAKQEAgLTg4LDcgKzg4LDcgQEAgc3RhdGljIEVpbmFfQm9vbCBzaG93Q29udGV4 dE1lbnUoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCBFdmFzX0Nvb3JkIHgsIEUKICAg ICAvLyBXaGVuIGNvbnRleHQgbWVudSBpcyBjcmVhdGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVf bmV3X3dpdGhfaXRlbXMsIGl0ZW1zIHNob3VsZCBoYXZlIHBhcmVudCBtZW51LgogICAgIEVYUEVD VF9FUShzdWJNZW51LCBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KHN1Yk1l bnVJdGVtMSkpOwogCi0gICAgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBuZXdJdGVtMiA9IGV3a19j b250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KEVXS19TVUJNRU5VX1RZUEUsIEVXS19D T05URVhUX01FTlVfSVRFTV9UQUdfT1RIRVIsICJOZXcgQ3VzdG9tIEl0ZW0gMiIsIGZhbHNlLCB0 cnVlLCBzdWJNZW51KTsKKyAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIG5ld0l0ZW0yID0gZXdr X2NvbnRleHRfbWVudV9pdGVtX25ld193aXRoX3N1Ym1lbnUoRVdLX0NPTlRFWFRfTUVOVV9JVEVN X1RBR19PVEhFUiwgIk5ldyBDdXN0b20gSXRlbSAyIiwgdHJ1ZSwgc3ViTWVudSk7CiAgICAgLy8g V2hlbiBjb250ZXh0IG1lbnUgaXRlbSBpcyBjcmVhdGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVf aXRlbV9uZXdfd2l0aF9zdWJtZW51LCBpdCBzaG91bGQgbm90IGhhdmUgcGFyZW50IG1lbnUuCiAg ICAgRVhQRUNUX0VRKDAsIGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQobmV3 SXRlbSkpOwogICAgIGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQoY29udGV4dE1lbnUsIG5l d0l0ZW0yKTsKQEAgLTEwMCw3ICsxMDAsNyBAQCBzdGF0aWMgRWluYV9Cb29sIHNob3dDb250ZXh0 TWVudShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIEV2YXNfQ29vcmQgeCwgRQogICAg IEVYUEVDVF9FUShjb250ZXh0TWVudSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51 X2dldChuZXdJdGVtKSk7CiAKICAgICBFd2tfQ29udGV4dF9NZW51KiBzdWJNZW51MiA9IGV3a19j b250ZXh0X21lbnVfbmV3KCk7Ci0gICAgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBuZXdJdGVtMyA9 IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KEVXS19TVUJNRU5VX1RZUEUs IEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfT1RIRVIsICJOZXcgQ3VzdG9tIEl0ZW0gMyIsIGZh bHNlLCB0cnVlLCBzdWJNZW51Mik7CisgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBuZXdJdGVt MyA9IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KEVXS19DT05URVhUX01F TlVfSVRFTV9UQUdfT1RIRVIsICJOZXcgQ3VzdG9tIEl0ZW0gMyIsIHRydWUsIHN1Yk1lbnUyKTsK ICAgICBld2tfY29udGV4dF9tZW51X2l0ZW1fYXBwZW5kKGNvbnRleHRNZW51LCBuZXdJdGVtMyk7 CiAKICAgICBsaXN0ID0gZXdrX2NvbnRleHRfbWVudV9pdGVtc19nZXQoY29udGV4dE1lbnUpOwo=