120459 2013-08-29 02:18:36 -0700 [GTK] [WK2] TestContextMenu default-menu fails 2013-09-05 02:10:46 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 117689 1 brian.holt brian.holt cgarcia commit-queue gustavo mario mrobinson ruthiecftg oldest_to_newest 922376 0 brian.holt 2013-08-29 02:18:36 -0700 The unit test for the default menu fails: ERROR:../../Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp:191:GList* ContextMenuTest::checkCurrentItemIsSeparatorAndGetNext(GList*): assertion failed: (webkit_context_menu_item_is_separator(item)) 922446 1 brian.holt 2013-08-29 07:19:34 -0700 The root cause is that there the test was not updated to reflect that a new tag to download the media item has been been added to the default context menu in https://bugs.webkit.org/show_bug.cgi?id=20599. 922463 2 209981 brian.holt 2013-08-29 07:56:59 -0700 Created attachment 209981 Patch 922464 3 commit-queue 2013-08-29 07:58:12 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 922465 4 brian.holt 2013-08-29 07:58:54 -0700 This doesn't fix the timeout under Xvfb, but the unit test now passes under run-gtk-tests --display=":0". 923747 5 209981 mario 2013-09-02 09:23:14 -0700 Comment on attachment 209981 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=209981&action=review The patch looks almost good to me (see comments below), and I can confirm that it works fine since I applied locally to test it :) Anyway, as you are exposing new items in the public API (the enum), I'd rather have someone else reviewing it. > Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.cpp:130 > + case WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK: > + case WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK: > + return ContextMenuItemTagDownloadMediaToDisk; I would probably add this before WEBKIT_CONTEXT_MENU_ACTION_CUSTOM case. > Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.cpp:224 > + case ContextMenuItemTagDownloadMediaToDisk: > + return menuItem->title() == contextMenuItemTagDownloadVideoToDisk() ? > + WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK : WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK; Ditto. > Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.cpp:322 > + case WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK: > + return contextMenuItemTagDownloadVideoToDisk(); > + case WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK: > + return contextMenuItemTagDownloadAudioToDisk(); Ditto. > Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.h:77 > + * @WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK: Download video to disk. > + * @WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK: Download audio to disk. And again! :) 923919 6 210342 brian.holt 2013-09-03 02:46:03 -0700 Created attachment 210342 Patch 2 924036 7 mrobinson 2013-09-03 09:08:49 -0700 Seems reasonable to me. Since this changes API, it needs the approval of another GTK+ reviewer. 924038 8 210342 gustavo 2013-09-03 09:25:41 -0700 Comment on attachment 210342 Patch 2 Sure, the API is straightforward, LGTM. Guess I'll just go ahead and set +ses 924046 9 210342 commit-queue 2013-09-03 09:50:03 -0700 Comment on attachment 210342 Patch 2 Clearing flags on attachment: 210342 Committed r154987: <http://trac.webkit.org/changeset/154987> 924047 10 commit-queue 2013-09-03 09:50:06 -0700 All reviewed patches have been landed. Closing bug. 924812 11 210342 cgarcia 2013-09-04 23:39:51 -0700 Comment on attachment 210342 Patch 2 View in context: https://bugs.webkit.org/attachment.cgi?id=210342&action=review I'm sorry to be late here, I have just some comments. I think that a commit that adds new API should not be hidden by a commit message saying that this fixes a unit test, even if in fact it fixes a test. I think this should have renamed as something like "Add download media to disk actions to the context menu actions in WebKit2GTK+" or something similar before landing. > Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.h:76 > + * @WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK: Download video to disk. > + * @WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK: Download audio to disk. These should have a Since tag, it should be 2.2 if we are going to merge this in the stable branch (I think we should, fwiw) or 2.4 otherwise. > Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp:312 > + iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK, Visible | Enabled); Would it be posible to add a test for download audio too? 924935 12 brian.holt 2013-09-05 02:10:46 -0700 (In reply to comment #11) > (From update of attachment 210342 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=210342&action=review > > I'm sorry to be late here, I have just some comments. I think that a commit that adds new API should not be hidden by a commit message saying that this fixes a unit test, even if in fact it fixes a test. I think this should have renamed as something like "Add download media to disk actions to the context menu actions in WebKit2GTK+" or something similar before landing. > Good point, I should have thought of that. > > Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.h:76 > > + * @WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK: Download video to disk. > > + * @WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK: Download audio to disk. > > These should have a Since tag, it should be 2.2 if we are going to merge this in the stable branch (I think we should, fwiw) or 2.4 otherwise. Opening a new bug for this: https://bugs.webkit.org/show_bug.cgi?id=120763 > > > Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp:312 > > + iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK, Visible | Enabled); > > Would it be posible to add a test for download audio too? Will sort it in the new bug. 209981 2013-08-29 07:56:59 -0700 2013-09-03 02:45:58 -0700 Patch bug-120459-20130829155742.patch text/plain 5075 brian.holt U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0NzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjQ5MjdkNWFhZWQ2M2Vj NmQxZjYyMmIwYzdlYTdlNWMwNDIyMGEzZS4uNjliMjYzZmQ2MDRjYjUwZGQ2ODhkM2M2NmUxMWJi NjAwODFlZGZiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTA4LTI5ICBCcmlh biBIb2x0ICA8YnJpYW4uaG9sdEBzYW1zdW5nLmNvbT4KKworICAgICAgICBbR1RLXSBbV0syXSBU ZXN0Q29udGV4dE1lbnUgZGVmYXVsdC1tZW51IGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjA0NTkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgY29udGV4dCBtZW51IGl0ZW1zIGZvciBkb3du bG9hZGluZyBtZWRpYSBlbGVtZW50cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdENvbnRleHRNZW51QWN0aW9ucy5jcHA6CisgICAgICAgICh3ZWJraXRDb250ZXh0TWVudUFj dGlvbkdldEFjdGlvblRhZyk6CisgICAgICAgICh3ZWJraXRDb250ZXh0TWVudUFjdGlvbkdldEZv ckNvbnRleHRNZW51SXRlbSk6CisgICAgICAgICh3ZWJraXRDb250ZXh0TWVudUFjdGlvbkdldExh YmVsKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudUFjdGlv bnMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0Q29udGV4dE1lbnUu Y3BwOgorCiAyMDEzLTA4LTI4ICDDgWJyYWjDoW0gR8OhYm9yICA8YWJyaG1AaW5mLnUtc3plZ2Vk Lmh1PgogCiAgICAgICAgIEZpeCB1bnVzZWQgdmFyaWFibGUgd2FybmluZy4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51QWN0aW9u cy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb250ZXh0TWVu dUFjdGlvbnMuY3BwCmluZGV4IDM3OTNkN2MwZjc3Njc1ZjI4YjNkYWRhNzVkNzQ2ZDdkYmUyODBl ODEuLjU2OWIxOGQ1YTBmYWI3ZDYyOTVlZTczZTgxMGIyZTYyMjFmOGYwYWUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51QWN0aW9u cy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29udGV4 dE1lbnVBY3Rpb25zLmNwcApAQCAtMTI1LDYgKzEyNSw5IEBAIENvbnRleHRNZW51QWN0aW9uIHdl YmtpdENvbnRleHRNZW51QWN0aW9uR2V0QWN0aW9uVGFnKFdlYktpdENvbnRleHRNZW51QWN0aW9u IGFjCiAgICAgICAgIHJldHVybiBDb250ZXh0TWVudUl0ZW1UYWdNZWRpYU11dGU7CiAgICAgY2Fz ZSBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9DVVNUT006CiAgICAgICAgIHJldHVybiBDb250 ZXh0TWVudUl0ZW1CYXNlQXBwbGljYXRpb25UYWc7CisgICAgY2FzZSBXRUJLSVRfQ09OVEVYVF9N RU5VX0FDVElPTl9ET1dOTE9BRF9WSURFT19UT19ESVNLOgorICAgIGNhc2UgV0VCS0lUX0NPTlRF WFRfTUVOVV9BQ1RJT05fRE9XTkxPQURfQVVESU9fVE9fRElTSzoKKyAgICAgICAgcmV0dXJuIENv bnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkTWVkaWFUb0Rpc2s7CiAgICAgZGVmYXVsdDoKICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgfQpAQCAtMjE2LDYgKzIxOSw5IEBAIFdlYktp dENvbnRleHRNZW51QWN0aW9uIHdlYmtpdENvbnRleHRNZW51QWN0aW9uR2V0Rm9yQ29udGV4dE1l bnVJdGVtKENvbnRleHRNZW51CiAgICAgICAgIHJldHVybiBXRUJLSVRfQ09OVEVYVF9NRU5VX0FD VElPTl9NRURJQV9NVVRFOwogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtQmFzZUFwcGxpY2F0aW9u VGFnOgogICAgICAgICByZXR1cm4gV0VCS0lUX0NPTlRFWFRfTUVOVV9BQ1RJT05fQ1VTVE9NOwor ICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnRG93bmxvYWRNZWRpYVRvRGlzazoKKyAgICAgICAg cmV0dXJuIG1lbnVJdGVtLT50aXRsZSgpID09IGNvbnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkVmlk ZW9Ub0Rpc2soKSA/CisgICAgICAgICAgICBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9ET1dO TE9BRF9WSURFT19UT19ESVNLIDogV0VCS0lUX0NPTlRFWFRfTUVOVV9BQ1RJT05fRE9XTkxPQURf QVVESU9fVE9fRElTSzsKICAgICBkZWZhdWx0OgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKICAgICB9CkBAIC0zMTAsNiArMzE2LDEwIEBAIFN0cmluZyB3ZWJraXRDb250ZXh0TWVudUFj dGlvbkdldExhYmVsKFdlYktpdENvbnRleHRNZW51QWN0aW9uIGFjdGlvbikKICAgICBjYXNlIFdF QktJVF9DT05URVhUX01FTlVfQUNUSU9OX0NVU1RPTToKICAgICBjYXNlIFdFQktJVF9DT05URVhU X01FTlVfQUNUSU9OX1NQRUxMSU5HX0dVRVNTOgogICAgICAgICByZXR1cm4gU3RyaW5nKCk7Cisg ICAgY2FzZSBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9ET1dOTE9BRF9WSURFT19UT19ESVNL OgorICAgICAgICByZXR1cm4gY29udGV4dE1lbnVJdGVtVGFnRG93bmxvYWRWaWRlb1RvRGlzaygp OworICAgIGNhc2UgV0VCS0lUX0NPTlRFWFRfTUVOVV9BQ1RJT05fRE9XTkxPQURfQVVESU9fVE9f RElTSzoKKyAgICAgICAgcmV0dXJuIGNvbnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkQXVkaW9Ub0Rp c2soKTsKICAgICBkZWZhdWx0OgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb250 ZXh0TWVudUFjdGlvbnMuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dENvbnRleHRNZW51QWN0aW9ucy5oCmluZGV4IDE4NWJkMjUxZmMwZjQ4YzEzNGJkNzEzNGVmMWU2 MzI3ZGVkYTYwMDEuLjgwNmRlZWIwZDg5MDVhYzg3NDMzNTI5MWEzZTFjNGQzMjkwODAzNTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRN ZW51QWN0aW9ucy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dENvbnRleHRNZW51QWN0aW9ucy5oCkBAIC03Myw2ICs3Myw4IEBAIEdfQkVHSU5fREVDTFMKICAq IEBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9NRURJQV9QQVVTRTogUGF1c2UgY3VycmVudCBt ZWRpYSBlbGVtZW50LgogICogQFdFQktJVF9DT05URVhUX01FTlVfQUNUSU9OX01FRElBX01VVEU6 IE11dGUgY3VycmVudCBtZWRpYSBlbGVtZW50LgogICogQFdFQktJVF9DT05URVhUX01FTlVfQUNU SU9OX0NVU1RPTTogQ3VzdG9tIGFjdGlvbiBkZWZpbmVkIGJ5IGFwcGxpY2F0aW9ucy4KKyAqIEBX RUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9ET1dOTE9BRF9WSURFT19UT19ESVNLOiBEb3dubG9h ZCB2aWRlbyB0byBkaXNrLgorICogQFdFQktJVF9DT05URVhUX01FTlVfQUNUSU9OX0RPV05MT0FE X0FVRElPX1RPX0RJU0s6IERvd25sb2FkIGF1ZGlvIHRvIGRpc2suCiAgKgogICogRW51bSB2YWx1 ZXMgdXNlZCB0byBkZW5vdGUgdGhlIHN0b2NrIGFjdGlvbnMgZm9yCiAgKiAjV2ViS2l0Q29udGV4 dE1lbnVJdGVtPCEtLSAtLT5zCkBAIC0xMjEsNiArMTIzLDggQEAgdHlwZWRlZiBlbnVtIHsKICAg ICBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9NRURJQV9QTEFZLAogICAgIFdFQktJVF9DT05U RVhUX01FTlVfQUNUSU9OX01FRElBX1BBVVNFLAogICAgIFdFQktJVF9DT05URVhUX01FTlVfQUNU SU9OX01FRElBX01VVEUsCisgICAgV0VCS0lUX0NPTlRFWFRfTUVOVV9BQ1RJT05fRE9XTkxPQURf VklERU9fVE9fRElTSywKKyAgICBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9ET1dOTE9BRF9B VURJT19UT19ESVNLLAogCiAgICAgV0VCS0lUX0NPTlRFWFRfTUVOVV9BQ1RJT05fQ1VTVE9NID0g MTAwMDAKIH0gV2ViS2l0Q29udGV4dE1lbnVBY3Rpb247CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0Q29udGV4dE1lbnUuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdENvbnRleHRNZW51LmNwcAppbmRl eCBjMzYxZjhiYWYyNmMyYmMxODZiODM4ZjBmODYyZTk2MWY2OWIyNTI2Li5kM2U0MmFmNDFlZGEy MGI5YzhkMTg5MTk5YTM3ZTkyNTJhODA3OGIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0Q29udGV4dE1lbnUuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RDb250ZXh0TWVudS5jcHAKQEAgLTMw OSw2ICszMDksNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICBpdGVyID0gY2hlY2tDdXJyZW50SXRl bUlzU2VwYXJhdG9yQW5kR2V0TmV4dChpdGVyKTsKICAgICAgICAgICAgIGl0ZXIgPSBjaGVja0N1 cnJlbnRJdGVtSXNTdG9ja0FjdGlvbkFuZEdldE5leHQoaXRlciwgV0VCS0lUX0NPTlRFWFRfTUVO VV9BQ1RJT05fQ09QWV9WSURFT19MSU5LX1RPX0NMSVBCT0FSRCwgVmlzaWJsZSB8IEVuYWJsZWQp OwogICAgICAgICAgICAgaXRlciA9IGNoZWNrQ3VycmVudEl0ZW1Jc1N0b2NrQWN0aW9uQW5kR2V0 TmV4dChpdGVyLCBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9PUEVOX1ZJREVPX0lOX05FV19X SU5ET1csIFZpc2libGUgfCBFbmFibGVkKTsKKyAgICAgICAgICAgIGl0ZXIgPSBjaGVja0N1cnJl bnRJdGVtSXNTdG9ja0FjdGlvbkFuZEdldE5leHQoaXRlciwgV0VCS0lUX0NPTlRFWFRfTUVOVV9B Q1RJT05fRE9XTkxPQURfVklERU9fVE9fRElTSywgVmlzaWJsZSB8IEVuYWJsZWQpOwogICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgRWRpdGFibGU6CiAgICAgICAgICAgICBnX2Fzc2Vy dCghd2Via2l0X2hpdF90ZXN0X3Jlc3VsdF9jb250ZXh0X2lzX2xpbmsoaGl0VGVzdFJlc3VsdCkp Owo= 210342 2013-09-03 02:46:03 -0700 2013-09-04 23:39:51 -0700 Patch 2 bug-120459-20130903104649.patch text/plain 5401 brian.holt U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0OTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjQxMDRhZmY5YzIwNWI2 ZThiOWEzMGZiNTFmMjQwZTY5NGVkZjliMC4uYWQwZDE4M2NjYjcyNDllYmFlNmZkNGQzMjlkMDRk OTBmMGFiOGRlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTA5LTAzICBCcmlh biBIb2x0ICA8YnJpYW4uaG9sdEBzYW1zdW5nLmNvbT4KKworICAgICAgICBbR1RLXSBbV0syXSBU ZXN0Q29udGV4dE1lbnUgZGVmYXVsdC1tZW51IGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjA0NTkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgY29udGV4dCBtZW51IGl0ZW1zIGZvciBkb3du bG9hZGluZyBtZWRpYSBlbGVtZW50cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdENvbnRleHRNZW51QWN0aW9ucy5jcHA6CisgICAgICAgICh3ZWJraXRDb250ZXh0TWVudUFj dGlvbkdldEFjdGlvblRhZyk6CisgICAgICAgICh3ZWJraXRDb250ZXh0TWVudUFjdGlvbkdldEZv ckNvbnRleHRNZW51SXRlbSk6CisgICAgICAgICh3ZWJraXRDb250ZXh0TWVudUFjdGlvbkdldExh YmVsKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudUFjdGlv bnMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0Q29udGV4dE1lbnUu Y3BwOgorCiAyMDEzLTA5LTAxICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgog CiAgICAgICAgIFtXSzJdW01hY10gRHJhZyBhbmQgZHJvcCB0ZXN0cyBpbnRlcmZlcmUgd2l0aCB1 c2VyJ3MgVUkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdENvbnRleHRNZW51QWN0aW9ucy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRDb250ZXh0TWVudUFjdGlvbnMuY3BwCmluZGV4IDM3OTNkN2MwZjc3Njc1ZjI4 YjNkYWRhNzVkNzQ2ZDdkYmUyODBlODEuLmU4Y2RmZmQwNGYxYjIyNWFjYzdlYTUzNDg5NjQ2YmJh ZjE0YWRlZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdENvbnRleHRNZW51QWN0aW9ucy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnVBY3Rpb25zLmNwcApAQCAtMTIzLDYgKzEyMyw5IEBA IENvbnRleHRNZW51QWN0aW9uIHdlYmtpdENvbnRleHRNZW51QWN0aW9uR2V0QWN0aW9uVGFnKFdl YktpdENvbnRleHRNZW51QWN0aW9uIGFjCiAgICAgICAgIHJldHVybiBDb250ZXh0TWVudUl0ZW1U YWdNZWRpYVBsYXlQYXVzZTsKICAgICBjYXNlIFdFQktJVF9DT05URVhUX01FTlVfQUNUSU9OX01F RElBX01VVEU6CiAgICAgICAgIHJldHVybiBDb250ZXh0TWVudUl0ZW1UYWdNZWRpYU11dGU7Cisg ICAgY2FzZSBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9ET1dOTE9BRF9WSURFT19UT19ESVNL OgorICAgIGNhc2UgV0VCS0lUX0NPTlRFWFRfTUVOVV9BQ1RJT05fRE9XTkxPQURfQVVESU9fVE9f RElTSzoKKyAgICAgICAgcmV0dXJuIENvbnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkTWVkaWFUb0Rp c2s7CiAgICAgY2FzZSBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9DVVNUT006CiAgICAgICAg IHJldHVybiBDb250ZXh0TWVudUl0ZW1CYXNlQXBwbGljYXRpb25UYWc7CiAgICAgZGVmYXVsdDoK QEAgLTIxNCw2ICsyMTcsOSBAQCBXZWJLaXRDb250ZXh0TWVudUFjdGlvbiB3ZWJraXRDb250ZXh0 TWVudUFjdGlvbkdldEZvckNvbnRleHRNZW51SXRlbShDb250ZXh0TWVudQogICAgICAgICAgICAg V0VCS0lUX0NPTlRFWFRfTUVOVV9BQ1RJT05fTUVESUFfUExBWSA6IFdFQktJVF9DT05URVhUX01F TlVfQUNUSU9OX01FRElBX1BBVVNFOwogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnTWVkaWFN dXRlOgogICAgICAgICByZXR1cm4gV0VCS0lUX0NPTlRFWFRfTUVOVV9BQ1RJT05fTUVESUFfTVVU RTsKKyAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkTWVkaWFUb0Rpc2s6CisgICAg ICAgIHJldHVybiBtZW51SXRlbS0+dGl0bGUoKSA9PSBjb250ZXh0TWVudUl0ZW1UYWdEb3dubG9h ZFZpZGVvVG9EaXNrKCkgPworICAgICAgICAgICAgV0VCS0lUX0NPTlRFWFRfTUVOVV9BQ1RJT05f RE9XTkxPQURfVklERU9fVE9fRElTSyA6IFdFQktJVF9DT05URVhUX01FTlVfQUNUSU9OX0RPV05M T0FEX0FVRElPX1RPX0RJU0s7CiAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1CYXNlQXBwbGljYXRp b25UYWc6CiAgICAgICAgIHJldHVybiBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9DVVNUT007 CiAgICAgZGVmYXVsdDoKQEAgLTMwNiw2ICszMTIsMTAgQEAgU3RyaW5nIHdlYmtpdENvbnRleHRN ZW51QWN0aW9uR2V0TGFiZWwoV2ViS2l0Q29udGV4dE1lbnVBY3Rpb24gYWN0aW9uKQogICAgICAg ICByZXR1cm4gY29udGV4dE1lbnVJdGVtVGFnTWVkaWFQYXVzZSgpOwogICAgIGNhc2UgV0VCS0lU X0NPTlRFWFRfTUVOVV9BQ1RJT05fTUVESUFfTVVURToKICAgICAgICAgcmV0dXJuIGNvbnRleHRN ZW51SXRlbVRhZ01lZGlhTXV0ZSgpOworICAgIGNhc2UgV0VCS0lUX0NPTlRFWFRfTUVOVV9BQ1RJ T05fRE9XTkxPQURfVklERU9fVE9fRElTSzoKKyAgICAgICAgcmV0dXJuIGNvbnRleHRNZW51SXRl bVRhZ0Rvd25sb2FkVmlkZW9Ub0Rpc2soKTsKKyAgICBjYXNlIFdFQktJVF9DT05URVhUX01FTlVf QUNUSU9OX0RPV05MT0FEX0FVRElPX1RPX0RJU0s6CisgICAgICAgIHJldHVybiBjb250ZXh0TWVu dUl0ZW1UYWdEb3dubG9hZEF1ZGlvVG9EaXNrKCk7CiAgICAgY2FzZSBXRUJLSVRfQ09OVEVYVF9N RU5VX0FDVElPTl9OT19BQ1RJT046CiAgICAgY2FzZSBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElP Tl9DVVNUT006CiAgICAgY2FzZSBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9TUEVMTElOR19H VUVTUzoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dENvbnRleHRNZW51QWN0aW9ucy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0Q29udGV4dE1lbnVBY3Rpb25zLmgKaW5kZXggMTg1YmQyNTFmYzBmNDhjMTM0YmQ3MTM0 ZWYxZTYzMjdkZWRhNjAwMS4uNWExNzlkZmE1ZWMwNGEzZGRmNTA2MmQ4ZDMwMGI3YTBjNTAyNzYz OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29u dGV4dE1lbnVBY3Rpb25zLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0Q29udGV4dE1lbnVBY3Rpb25zLmgKQEAgLTcyLDYgKzcyLDggQEAgR19CRUdJTl9ERUNM UwogICogQFdFQktJVF9DT05URVhUX01FTlVfQUNUSU9OX01FRElBX1BMQVk6IFBsYXkgY3VycmVu dCBtZWRpYSBlbGVtZW50LgogICogQFdFQktJVF9DT05URVhUX01FTlVfQUNUSU9OX01FRElBX1BB VVNFOiBQYXVzZSBjdXJyZW50IG1lZGlhIGVsZW1lbnQuCiAgKiBAV0VCS0lUX0NPTlRFWFRfTUVO VV9BQ1RJT05fTUVESUFfTVVURTogTXV0ZSBjdXJyZW50IG1lZGlhIGVsZW1lbnQuCisgKiBAV0VC S0lUX0NPTlRFWFRfTUVOVV9BQ1RJT05fRE9XTkxPQURfVklERU9fVE9fRElTSzogRG93bmxvYWQg dmlkZW8gdG8gZGlzay4KKyAqIEBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9ET1dOTE9BRF9B VURJT19UT19ESVNLOiBEb3dubG9hZCBhdWRpbyB0byBkaXNrLgogICogQFdFQktJVF9DT05URVhU X01FTlVfQUNUSU9OX0NVU1RPTTogQ3VzdG9tIGFjdGlvbiBkZWZpbmVkIGJ5IGFwcGxpY2F0aW9u cy4KICAqCiAgKiBFbnVtIHZhbHVlcyB1c2VkIHRvIGRlbm90ZSB0aGUgc3RvY2sgYWN0aW9ucyBm b3IKQEAgLTEyMSw2ICsxMjMsOCBAQCB0eXBlZGVmIGVudW0gewogICAgIFdFQktJVF9DT05URVhU X01FTlVfQUNUSU9OX01FRElBX1BMQVksCiAgICAgV0VCS0lUX0NPTlRFWFRfTUVOVV9BQ1RJT05f TUVESUFfUEFVU0UsCiAgICAgV0VCS0lUX0NPTlRFWFRfTUVOVV9BQ1RJT05fTUVESUFfTVVURSwK KyAgICBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9ET1dOTE9BRF9WSURFT19UT19ESVNLLAor ICAgIFdFQktJVF9DT05URVhUX01FTlVfQUNUSU9OX0RPV05MT0FEX0FVRElPX1RPX0RJU0ssCiAK ICAgICBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9DVVNUT00gPSAxMDAwMAogfSBXZWJLaXRD b250ZXh0TWVudUFjdGlvbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL3Rlc3RzL1Rlc3RDb250ZXh0TWVudS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay90ZXN0cy9UZXN0Q29udGV4dE1lbnUuY3BwCmluZGV4IGMzNjFmOGJhZjI2YzJi YzE4NmI4MzhmMGY4NjJlOTYxZjY5YjI1MjYuLmQzZTQyYWY0MWVkYTIwYjljOGQxODkxOTlhMzdl OTI1MmE4MDc4YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L3Rlc3RzL1Rlc3RDb250ZXh0TWVudS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvdGVzdHMvVGVzdENvbnRleHRNZW51LmNwcApAQCAtMzA5LDYgKzMwOSw3IEBAIHB1 YmxpYzoKICAgICAgICAgICAgIGl0ZXIgPSBjaGVja0N1cnJlbnRJdGVtSXNTZXBhcmF0b3JBbmRH ZXROZXh0KGl0ZXIpOwogICAgICAgICAgICAgaXRlciA9IGNoZWNrQ3VycmVudEl0ZW1Jc1N0b2Nr QWN0aW9uQW5kR2V0TmV4dChpdGVyLCBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9DT1BZX1ZJ REVPX0xJTktfVE9fQ0xJUEJPQVJELCBWaXNpYmxlIHwgRW5hYmxlZCk7CiAgICAgICAgICAgICBp dGVyID0gY2hlY2tDdXJyZW50SXRlbUlzU3RvY2tBY3Rpb25BbmRHZXROZXh0KGl0ZXIsIFdFQktJ VF9DT05URVhUX01FTlVfQUNUSU9OX09QRU5fVklERU9fSU5fTkVXX1dJTkRPVywgVmlzaWJsZSB8 IEVuYWJsZWQpOworICAgICAgICAgICAgaXRlciA9IGNoZWNrQ3VycmVudEl0ZW1Jc1N0b2NrQWN0 aW9uQW5kR2V0TmV4dChpdGVyLCBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9ET1dOTE9BRF9W SURFT19UT19ESVNLLCBWaXNpYmxlIHwgRW5hYmxlZCk7CiAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgY2FzZSBFZGl0YWJsZToKICAgICAgICAgICAgIGdfYXNzZXJ0KCF3ZWJraXRfaGl0X3Rl c3RfcmVzdWx0X2NvbnRleHRfaXNfbGluayhoaXRUZXN0UmVzdWx0KSk7Cg==