35993 2010-03-10 15:42:02 -0800 [Qt] Access key modifier should be Ctrl+Alt for Darwin derived OS and Alt for the others 2010-03-11 10:50:37 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC Linux RESOLVED FIXED Qt P2 Normal --- 1 diegohcg diegohcg hausmann kenneth tonikitoo oldest_to_newest 198394 0 diegohcg 2010-03-10 15:42:02 -0800 Return Atl Key for access key modifiers in Qt EventHandler LayoutTests: fast/forms/access-key.html fast/forms/focus-selection-textarea.html fast/events/access-key-self-destruct.html fast/forms/legend-access-key.html 198395 1 50448 diegohcg 2010-03-10 15:46:21 -0800 Created attachment 50448 Proposed patch 198461 2 tonikitoo 2010-03-10 19:36:18 -0800 (In reply to comment #1) > Created an attachment (id=50448) [details] > Proposed patch LGTM, Diego. It is similar to what Gtk does, and I agree: Alt is much more common accel modifier than Control. 198503 3 50448 hausmann 2010-03-10 23:24:22 -0800 Comment on attachment 50448 Proposed patch Good catch, Diego! Ironically I changed it from Alt to Ctrl in revision 29688 :-) Today for example fast/forms/legend-access-key.html expects ctrl on platforms where the user agent contains "Mac OS X" and alt on the others. So I think the _correct_ fix would be to return Ctrl for OS(MAC_OS_X) and Alt otherwise. 198553 4 diegohcg 2010-03-11 05:00:21 -0800 (In reply to comment #3) > (From update of attachment 50448 [details]) > Good catch, Diego! > > Ironically I changed it from Alt to Ctrl in revision 29688 :-) > > Today for example fast/forms/legend-access-key.html expects ctrl on platforms > where the user agent contains "Mac OS X" and alt on the others. So I think the > _correct_ fix would be to return Ctrl for OS(MAC_OS_X) and Alt otherwise. Thanks Simon :) You mean: unsigned EventHandler::accessKeyModifiers() { +#if OS(MAC_OS_X) + return PlatformKeyboardEvent::CtrlKey; +#else return PlatformKeyboardEvent::AltKey; +#endif } or maybe: unsigned EventHandler::accessKeyModifiers() { +#if OS(MAC_OS_X) + return PlatformKeyboardEvent::CtrlKey | PlatformKeyboardEvent::AltKey; +#else return PlatformKeyboardEvent::AltKey; +#endif ? in the tests the modifiers for Mac OS X are Ctrl and Alt: modifiers = ["ctrlKey", "altKey"]; 198555 5 hausmann 2010-03-11 05:11:16 -0800 (In reply to comment #4) > (In reply to comment #3) > > (From update of attachment 50448 [details] [details]) > > Good catch, Diego! > > > > Ironically I changed it from Alt to Ctrl in revision 29688 :-) > > > > Today for example fast/forms/legend-access-key.html expects ctrl on platforms > > where the user agent contains "Mac OS X" and alt on the others. So I think the > > _correct_ fix would be to return Ctrl for OS(MAC_OS_X) and Alt otherwise. > > Thanks Simon :) You mean: > > unsigned EventHandler::accessKeyModifiers() > { > +#if OS(MAC_OS_X) > + return PlatformKeyboardEvent::CtrlKey; > +#else > return PlatformKeyboardEvent::AltKey; > +#endif > } > > or maybe: > > unsigned EventHandler::accessKeyModifiers() > { > +#if OS(MAC_OS_X) > + return PlatformKeyboardEvent::CtrlKey | PlatformKeyboardEvent::AltKey; > +#else > return PlatformKeyboardEvent::AltKey; > +#endif > ? > > in the tests the modifiers for Mac OS X are Ctrl and Alt: > modifiers = ["ctrlKey", "altKey"]; The latter seems more accurate, indeed. See also WebCore/page/chromium/EventHandlerChromium.cpp. Interestingly they're using OS(DARWIN) instead of (MAC_OS_X). 198563 6 50490 diegohcg 2010-03-11 05:30:17 -0800 Created attachment 50490 Proposed patch Changed according Simon's comments. Using OS(DARWIN) to be more generic. 198571 7 50490 hausmann 2010-03-11 05:42:19 -0800 Comment on attachment 50490 Proposed patch Looks good to me. Please fix the changelog before landing though. Atl -> Alt and I don't think the main title should be a question :) > From b44596d47f9c1531843b7feae8adc058f6f0a01d Mon Sep 17 00:00:00 2001 > From: Diego Gonzalez <diego.gonzalez@openbossa.org> > Date: Wed, 10 Mar 2010 19:16:26 -0400 > Subject: [PATCH] Return Atl Key for access key modifiers in Qt EventHandler > > LayoutTests: > fast/forms/access-key.html > fast/forms/focus-selection-textarea.html > fast/events/access-key-self-destruct.html > fast/forms/legend-access-key.html > --- > LayoutTests/ChangeLog | 17 +++++++++++++++++ > LayoutTests/platform/qt/Skipped | 4 ---- > WebCore/ChangeLog | 18 ++++++++++++++++++ > WebCore/page/qt/EventHandlerQt.cpp | 6 +++++- > 4 files changed, 40 insertions(+), 5 deletions(-) > > diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog > index f1c4010..74a3301 100644 > --- a/LayoutTests/ChangeLog > +++ b/LayoutTests/ChangeLog > @@ -1,3 +1,20 @@ > +2010-03-10 Diego Gonzalez <diego.gonzalez@openbossa.org> > + > + Reviewed by NOBODY (OOPS!). > + > + Return Atl Key for access key modifiers in Qt EventHandler > + > + LayoutTests: > + fast/forms/access-key.html > + fast/forms/focus-selection-textarea.html > + fast/events/access-key-self-destruct.html > + fast/forms/legend-access-key.html > + > + [Qt] Should not access key modifier be the Alt key? > + https://bugs.webkit.org/show_bug.cgi?id=35993 > + > + * platform/qt/Skipped: > + > 2010-03-05 Dimitri Glazkov <dglazkov@chromium.org> > > Reviewed by Sam Weinig. > diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped > index 8399bcf..c3a9863 100644 > --- a/LayoutTests/platform/qt/Skipped > +++ b/LayoutTests/platform/qt/Skipped > @@ -461,12 +461,10 @@ fast/events/standalone-image-drag-to-editable.html > fast/events/updateLayoutForHitTest.html > fast/forms/input-list.html > fast/forms/input-selectedoption.html > -fast/forms/access-key.html > fast/forms/button-cannot-be-nested.html > fast/forms/control-restrict-line-height.html > fast/forms/drag-into-textarea.html > fast/forms/focus-selection-input.html > -fast/forms/focus-selection-textarea.html > fast/forms/input-readonly-autoscroll.html > fast/forms/input-text-click-outside.html > fast/forms/input-text-double-click.html > @@ -1157,7 +1155,6 @@ fast/dynamic/selection-highlight-adjust.html > fast/encoding/char-decoding.html > fast/encoding/frame-default-enc.html > fast/encoding/invalid-xml.html > -fast/events/access-key-self-destruct.html > fast/events/attempt-scroll-with-no-scrollbars.html > fast/events/key-events-in-input-button.html > fast/forms/input-align-image.html > @@ -1165,7 +1162,6 @@ fast/forms/input-align.html > fast/forms/input-double-click-selection-gap-bug.html > fast/forms/input-radio-checked-tab.html > fast/forms/input-text-option-delete.html > -fast/forms/legend-access-key.html > fast/forms/textarea-rows-cols.html > fast/frames/onlyCommentInIFrame.html > fast/inline/positionedLifetime.html > diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog > index eef9d52..87319d3 100644 > --- a/WebCore/ChangeLog > +++ b/WebCore/ChangeLog > @@ -1,3 +1,21 @@ > +2010-03-10 Diego Gonzalez <diego.gonzalez@openbossa.org> > + > + Reviewed by NOBODY (OOPS!). > + > + Return Atl Key for access key modifiers in Qt EventHandler > + > + LayoutTests: > + fast/forms/access-key.html > + fast/forms/focus-selection-textarea.html > + fast/events/access-key-self-destruct.html > + fast/forms/legend-access-key.html > + > + [Qt] Should not access key modifier be the Alt key? > + https://bugs.webkit.org/show_bug.cgi?id=35993 > + > + * page/qt/EventHandlerQt.cpp: > + (WebCore::EventHandler::accessKeyModifiers): > + > 2010-03-10 Jeremy Orlow <jorlow@chromium.org> > > Reviewed by Darin Fisher. > diff --git a/WebCore/page/qt/EventHandlerQt.cpp b/WebCore/page/qt/EventHandlerQt.cpp > index 3425289..d7982fa 100644 > --- a/WebCore/page/qt/EventHandlerQt.cpp > +++ b/WebCore/page/qt/EventHandlerQt.cpp > @@ -132,7 +132,11 @@ bool EventHandler::passMouseReleaseEventToSubframe(MouseEventWithHitTestResults& > > unsigned EventHandler::accessKeyModifiers() > { > - return PlatformKeyboardEvent::CtrlKey; > +#if OS(DARWIN) > + return PlatformKeyboardEvent::CtrlKey | PlatformKeyboardEvent::AltKey; > +#else > + return PlatformKeyboardEvent::AltKey; > +#endif > } > > } > -- > 1.6.3.3 > 198678 8 tonikitoo 2010-03-11 10:50:37 -0800 I committed(In reply to comment #7) > (From update of attachment 50490 [details]) > Looks good to me. Please fix the changelog before landing though. Atl -> Alt Diego fixed the typo, and I landed manually. Thx Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/platform/qt/Skipped M WebCore/ChangeLog M WebCore/page/qt/EventHandlerQt.cpp Committed r55847 50448 2010-03-10 15:46:21 -0800 2010-03-11 05:30:17 -0800 Proposed patch 0001-Return-Atl-Key-for-access-key-modifiers-in-Qt-EventHa.diff text/plain 4172 diegohcg RnJvbSA0NzZjM2E3ZDM0MzMxNTI3ODYzNjE3ZWRkMjdjNmI5NjE5MGZlN2QyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ28uZ29uemFsZXpAb3BlbmJv c3NhLm9yZz4KRGF0ZTogV2VkLCAxMCBNYXIgMjAxMCAxOToxNjoyNiAtMDQwMApTdWJqZWN0OiBb UEFUQ0hdIFJldHVybiBBdGwgS2V5IGZvciBhY2Nlc3Mga2V5IG1vZGlmaWVycyBpbiBRdCBFdmVu dEhhbmRsZXIKCkxheW91dFRlc3RzOgogICAgZmFzdC9mb3Jtcy9hY2Nlc3Mta2V5Lmh0bWwKICAg IGZhc3QvZm9ybXMvZm9jdXMtc2VsZWN0aW9uLXRleHRhcmVhLmh0bWwKICAgIGZhc3QvZXZlbnRz L2FjY2Vzcy1rZXktc2VsZi1kZXN0cnVjdC5odG1sCiAgICBmYXN0L2Zvcm1zL2xlZ2VuZC1hY2Nl c3Mta2V5Lmh0bWwKLS0tCiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cgICAgICAgICAgICAgIHwgICAx NyArKysrKysrKysrKysrKysrKwogTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZCAgICB8 ICAgIDQgLS0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICB8ICAgMTggKysr KysrKysrKysrKysrKysrCiBXZWJDb3JlL3BhZ2UvcXQvRXZlbnRIYW5kbGVyUXQuY3BwIHwgICAg MiArLQogNCBmaWxlcyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmMWM0MDEwLi43NGEzMzAxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDMt MTAgIERpZWdvIEdvbnphbGV6ICA8ZGllZ28uZ29uemFsZXpAb3BlbmJvc3NhLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXR1cm4gQXRsIEtl eSBmb3IgYWNjZXNzIGtleSBtb2RpZmllcnMgaW4gUXQgRXZlbnRIYW5kbGVyCisKKyAgICAgICAg TGF5b3V0VGVzdHM6CisgICAgICAgICAgICBmYXN0L2Zvcm1zL2FjY2Vzcy1rZXkuaHRtbAorICAg ICAgICAgICAgZmFzdC9mb3Jtcy9mb2N1cy1zZWxlY3Rpb24tdGV4dGFyZWEuaHRtbAorICAgICAg ICAgICAgZmFzdC9ldmVudHMvYWNjZXNzLWtleS1zZWxmLWRlc3RydWN0Lmh0bWwKKyAgICAgICAg ICAgIGZhc3QvZm9ybXMvbGVnZW5kLWFjY2Vzcy1rZXkuaHRtbAorCisgICAgICAgIFtRdF0gU2hv dWxkIG5vdCBhY2Nlc3Mga2V5IG1vZGlmaWVyIGJlIHRoZSBBbHQga2V5PworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU5OTMKKworICAgICAgICAqIHBs YXRmb3JtL3F0L1NraXBwZWQ6CisKIDIwMTAtMDMtMDUgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6 a292QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZCBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL3F0L1NraXBwZWQKaW5kZXggODM5OWJjZi4uYzNhOTg2MyAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9x dC9Ta2lwcGVkCkBAIC00NjEsMTIgKzQ2MSwxMCBAQCBmYXN0L2V2ZW50cy9zdGFuZGFsb25lLWlt YWdlLWRyYWctdG8tZWRpdGFibGUuaHRtbAogZmFzdC9ldmVudHMvdXBkYXRlTGF5b3V0Rm9ySGl0 VGVzdC5odG1sCiBmYXN0L2Zvcm1zL2lucHV0LWxpc3QuaHRtbAogZmFzdC9mb3Jtcy9pbnB1dC1z ZWxlY3RlZG9wdGlvbi5odG1sCi1mYXN0L2Zvcm1zL2FjY2Vzcy1rZXkuaHRtbAogZmFzdC9mb3Jt cy9idXR0b24tY2Fubm90LWJlLW5lc3RlZC5odG1sCiBmYXN0L2Zvcm1zL2NvbnRyb2wtcmVzdHJp Y3QtbGluZS1oZWlnaHQuaHRtbAogZmFzdC9mb3Jtcy9kcmFnLWludG8tdGV4dGFyZWEuaHRtbAog ZmFzdC9mb3Jtcy9mb2N1cy1zZWxlY3Rpb24taW5wdXQuaHRtbAotZmFzdC9mb3Jtcy9mb2N1cy1z ZWxlY3Rpb24tdGV4dGFyZWEuaHRtbAogZmFzdC9mb3Jtcy9pbnB1dC1yZWFkb25seS1hdXRvc2Ny b2xsLmh0bWwKIGZhc3QvZm9ybXMvaW5wdXQtdGV4dC1jbGljay1vdXRzaWRlLmh0bWwKIGZhc3Qv Zm9ybXMvaW5wdXQtdGV4dC1kb3VibGUtY2xpY2suaHRtbApAQCAtMTE1Nyw3ICsxMTU1LDYgQEAg ZmFzdC9keW5hbWljL3NlbGVjdGlvbi1oaWdobGlnaHQtYWRqdXN0Lmh0bWwKIGZhc3QvZW5jb2Rp bmcvY2hhci1kZWNvZGluZy5odG1sCiBmYXN0L2VuY29kaW5nL2ZyYW1lLWRlZmF1bHQtZW5jLmh0 bWwKIGZhc3QvZW5jb2RpbmcvaW52YWxpZC14bWwuaHRtbAotZmFzdC9ldmVudHMvYWNjZXNzLWtl eS1zZWxmLWRlc3RydWN0Lmh0bWwKIGZhc3QvZXZlbnRzL2F0dGVtcHQtc2Nyb2xsLXdpdGgtbm8t c2Nyb2xsYmFycy5odG1sCiBmYXN0L2V2ZW50cy9rZXktZXZlbnRzLWluLWlucHV0LWJ1dHRvbi5o dG1sCiBmYXN0L2Zvcm1zL2lucHV0LWFsaWduLWltYWdlLmh0bWwKQEAgLTExNjUsNyArMTE2Miw2 IEBAIGZhc3QvZm9ybXMvaW5wdXQtYWxpZ24uaHRtbAogZmFzdC9mb3Jtcy9pbnB1dC1kb3VibGUt Y2xpY2stc2VsZWN0aW9uLWdhcC1idWcuaHRtbAogZmFzdC9mb3Jtcy9pbnB1dC1yYWRpby1jaGVj a2VkLXRhYi5odG1sCiBmYXN0L2Zvcm1zL2lucHV0LXRleHQtb3B0aW9uLWRlbGV0ZS5odG1sCi1m YXN0L2Zvcm1zL2xlZ2VuZC1hY2Nlc3Mta2V5Lmh0bWwKIGZhc3QvZm9ybXMvdGV4dGFyZWEtcm93 cy1jb2xzLmh0bWwKIGZhc3QvZnJhbWVzL29ubHlDb21tZW50SW5JRnJhbWUuaHRtbAogZmFzdC9p bmxpbmUvcG9zaXRpb25lZExpZmV0aW1lLmh0bWwKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdl TG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWVmOWQ1Mi4uODczMTlkMyAxMDA2NDQKLS0t IGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy MSBAQAorMjAxMC0wMy0xMCAgRGllZ28gR29uemFsZXogIDxkaWVnby5nb256YWxlekBvcGVuYm9z c2Eub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFJldHVybiBBdGwgS2V5IGZvciBhY2Nlc3Mga2V5IG1vZGlmaWVycyBpbiBRdCBFdmVudEhhbmRs ZXIKKworICAgICAgICBMYXlvdXRUZXN0czoKKyAgICAgICAgICAgIGZhc3QvZm9ybXMvYWNjZXNz LWtleS5odG1sCisgICAgICAgICAgICBmYXN0L2Zvcm1zL2ZvY3VzLXNlbGVjdGlvbi10ZXh0YXJl YS5odG1sCisgICAgICAgICAgICBmYXN0L2V2ZW50cy9hY2Nlc3Mta2V5LXNlbGYtZGVzdHJ1Y3Qu aHRtbAorICAgICAgICAgICAgZmFzdC9mb3Jtcy9sZWdlbmQtYWNjZXNzLWtleS5odG1sCisKKyAg ICAgICAgW1F0XSBTaG91bGQgbm90IGFjY2VzcyBrZXkgbW9kaWZpZXIgYmUgdGhlIEFsdCBrZXk/ CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTk5Mwor CisgICAgICAgICogcGFnZS9xdC9FdmVudEhhbmRsZXJRdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpFdmVudEhhbmRsZXI6OmFjY2Vzc0tleU1vZGlmaWVycyk6CisKIDIwMTAtMDMtMTAgIEplcmVt eSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFy aW4gRmlzaGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL3F0L0V2ZW50SGFuZGxlclF0LmNw cCBiL1dlYkNvcmUvcGFnZS9xdC9FdmVudEhhbmRsZXJRdC5jcHAKaW5kZXggMzQyNTI4OS4uY2Ew N2VhNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL3F0L0V2ZW50SGFuZGxlclF0LmNwcAorKysg Yi9XZWJDb3JlL3BhZ2UvcXQvRXZlbnRIYW5kbGVyUXQuY3BwCkBAIC0xMzIsNyArMTMyLDcgQEAg Ym9vbCBFdmVudEhhbmRsZXI6OnBhc3NNb3VzZVJlbGVhc2VFdmVudFRvU3ViZnJhbWUoTW91c2VF dmVudFdpdGhIaXRUZXN0UmVzdWx0cyYKIAogdW5zaWduZWQgRXZlbnRIYW5kbGVyOjphY2Nlc3NL ZXlNb2RpZmllcnMoKQogewotICAgIHJldHVybiBQbGF0Zm9ybUtleWJvYXJkRXZlbnQ6OkN0cmxL ZXk7CisgICAgcmV0dXJuIFBsYXRmb3JtS2V5Ym9hcmRFdmVudDo6QWx0S2V5OwogfQogCiB9Ci0t IAoxLjYuMy4zCgo= 50490 2010-03-11 05:30:17 -0800 2010-03-11 05:42:18 -0800 Proposed patch 0001-Return-Atl-Key-for-access-key-modifiers-in-Qt-EventHa.diff text/plain 4284 diegohcg RnJvbSBiNDQ1OTZkNDdmOWMxNTMxODQzYjdmZWFlOGFkYzA1OGY2ZjBhMDFkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ28uZ29uemFsZXpAb3BlbmJv c3NhLm9yZz4KRGF0ZTogV2VkLCAxMCBNYXIgMjAxMCAxOToxNjoyNiAtMDQwMApTdWJqZWN0OiBb UEFUQ0hdIFJldHVybiBBdGwgS2V5IGZvciBhY2Nlc3Mga2V5IG1vZGlmaWVycyBpbiBRdCBFdmVu dEhhbmRsZXIKCkxheW91dFRlc3RzOgogICAgZmFzdC9mb3Jtcy9hY2Nlc3Mta2V5Lmh0bWwKICAg IGZhc3QvZm9ybXMvZm9jdXMtc2VsZWN0aW9uLXRleHRhcmVhLmh0bWwKICAgIGZhc3QvZXZlbnRz L2FjY2Vzcy1rZXktc2VsZi1kZXN0cnVjdC5odG1sCiAgICBmYXN0L2Zvcm1zL2xlZ2VuZC1hY2Nl c3Mta2V5Lmh0bWwKLS0tCiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cgICAgICAgICAgICAgIHwgICAx NyArKysrKysrKysrKysrKysrKwogTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZCAgICB8 ICAgIDQgLS0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICB8ICAgMTggKysr KysrKysrKysrKysrKysrCiBXZWJDb3JlL3BhZ2UvcXQvRXZlbnRIYW5kbGVyUXQuY3BwIHwgICAg NiArKysrKy0KIDQgZmlsZXMgY2hhbmdlZCwgNDAgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggZjFjNDAxMC4uNzRhMzMwMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEw LTAzLTEwICBEaWVnbyBHb256YWxleiAgPGRpZWdvLmdvbnphbGV6QG9wZW5ib3NzYS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV0dXJuIEF0 bCBLZXkgZm9yIGFjY2VzcyBrZXkgbW9kaWZpZXJzIGluIFF0IEV2ZW50SGFuZGxlcgorCisgICAg ICAgIExheW91dFRlc3RzOgorICAgICAgICAgICAgZmFzdC9mb3Jtcy9hY2Nlc3Mta2V5Lmh0bWwK KyAgICAgICAgICAgIGZhc3QvZm9ybXMvZm9jdXMtc2VsZWN0aW9uLXRleHRhcmVhLmh0bWwKKyAg ICAgICAgICAgIGZhc3QvZXZlbnRzL2FjY2Vzcy1rZXktc2VsZi1kZXN0cnVjdC5odG1sCisgICAg ICAgICAgICBmYXN0L2Zvcm1zL2xlZ2VuZC1hY2Nlc3Mta2V5Lmh0bWwKKworICAgICAgICBbUXRd IFNob3VsZCBub3QgYWNjZXNzIGtleSBtb2RpZmllciBiZSB0aGUgQWx0IGtleT8KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1OTkzCisKKyAgICAgICAg KiBwbGF0Zm9ybS9xdC9Ta2lwcGVkOgorCiAyMDEwLTAzLTA1ICBEaW1pdHJpIEdsYXprb3YgIDxk Z2xhemtvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCmluZGV4IDgzOTliY2YuLmMzYTk4NjMgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZv cm0vcXQvU2tpcHBlZApAQCAtNDYxLDEyICs0NjEsMTAgQEAgZmFzdC9ldmVudHMvc3RhbmRhbG9u ZS1pbWFnZS1kcmFnLXRvLWVkaXRhYmxlLmh0bWwKIGZhc3QvZXZlbnRzL3VwZGF0ZUxheW91dEZv ckhpdFRlc3QuaHRtbAogZmFzdC9mb3Jtcy9pbnB1dC1saXN0Lmh0bWwKIGZhc3QvZm9ybXMvaW5w dXQtc2VsZWN0ZWRvcHRpb24uaHRtbAotZmFzdC9mb3Jtcy9hY2Nlc3Mta2V5Lmh0bWwKIGZhc3Qv Zm9ybXMvYnV0dG9uLWNhbm5vdC1iZS1uZXN0ZWQuaHRtbAogZmFzdC9mb3Jtcy9jb250cm9sLXJl c3RyaWN0LWxpbmUtaGVpZ2h0Lmh0bWwKIGZhc3QvZm9ybXMvZHJhZy1pbnRvLXRleHRhcmVhLmh0 bWwKIGZhc3QvZm9ybXMvZm9jdXMtc2VsZWN0aW9uLWlucHV0Lmh0bWwKLWZhc3QvZm9ybXMvZm9j dXMtc2VsZWN0aW9uLXRleHRhcmVhLmh0bWwKIGZhc3QvZm9ybXMvaW5wdXQtcmVhZG9ubHktYXV0 b3Njcm9sbC5odG1sCiBmYXN0L2Zvcm1zL2lucHV0LXRleHQtY2xpY2stb3V0c2lkZS5odG1sCiBm YXN0L2Zvcm1zL2lucHV0LXRleHQtZG91YmxlLWNsaWNrLmh0bWwKQEAgLTExNTcsNyArMTE1NSw2 IEBAIGZhc3QvZHluYW1pYy9zZWxlY3Rpb24taGlnaGxpZ2h0LWFkanVzdC5odG1sCiBmYXN0L2Vu Y29kaW5nL2NoYXItZGVjb2RpbmcuaHRtbAogZmFzdC9lbmNvZGluZy9mcmFtZS1kZWZhdWx0LWVu Yy5odG1sCiBmYXN0L2VuY29kaW5nL2ludmFsaWQteG1sLmh0bWwKLWZhc3QvZXZlbnRzL2FjY2Vz cy1rZXktc2VsZi1kZXN0cnVjdC5odG1sCiBmYXN0L2V2ZW50cy9hdHRlbXB0LXNjcm9sbC13aXRo LW5vLXNjcm9sbGJhcnMuaHRtbAogZmFzdC9ldmVudHMva2V5LWV2ZW50cy1pbi1pbnB1dC1idXR0 b24uaHRtbAogZmFzdC9mb3Jtcy9pbnB1dC1hbGlnbi1pbWFnZS5odG1sCkBAIC0xMTY1LDcgKzEx NjIsNiBAQCBmYXN0L2Zvcm1zL2lucHV0LWFsaWduLmh0bWwKIGZhc3QvZm9ybXMvaW5wdXQtZG91 YmxlLWNsaWNrLXNlbGVjdGlvbi1nYXAtYnVnLmh0bWwKIGZhc3QvZm9ybXMvaW5wdXQtcmFkaW8t Y2hlY2tlZC10YWIuaHRtbAogZmFzdC9mb3Jtcy9pbnB1dC10ZXh0LW9wdGlvbi1kZWxldGUuaHRt bAotZmFzdC9mb3Jtcy9sZWdlbmQtYWNjZXNzLWtleS5odG1sCiBmYXN0L2Zvcm1zL3RleHRhcmVh LXJvd3MtY29scy5odG1sCiBmYXN0L2ZyYW1lcy9vbmx5Q29tbWVudEluSUZyYW1lLmh0bWwKIGZh c3QvaW5saW5lL3Bvc2l0aW9uZWRMaWZldGltZS5odG1sCmRpZmYgLS1naXQgYS9XZWJDb3JlL0No YW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGVlZjlkNTIuLjg3MzE5ZDMgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjEgQEAKKzIwMTAtMDMtMTAgIERpZWdvIEdvbnphbGV6ICA8ZGllZ28uZ29uemFsZXpAb3Bl bmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBSZXR1cm4gQXRsIEtleSBmb3IgYWNjZXNzIGtleSBtb2RpZmllcnMgaW4gUXQgRXZlbnRI YW5kbGVyCisKKyAgICAgICAgTGF5b3V0VGVzdHM6CisgICAgICAgICAgICBmYXN0L2Zvcm1zL2Fj Y2Vzcy1rZXkuaHRtbAorICAgICAgICAgICAgZmFzdC9mb3Jtcy9mb2N1cy1zZWxlY3Rpb24tdGV4 dGFyZWEuaHRtbAorICAgICAgICAgICAgZmFzdC9ldmVudHMvYWNjZXNzLWtleS1zZWxmLWRlc3Ry dWN0Lmh0bWwKKyAgICAgICAgICAgIGZhc3QvZm9ybXMvbGVnZW5kLWFjY2Vzcy1rZXkuaHRtbAor CisgICAgICAgIFtRdF0gU2hvdWxkIG5vdCBhY2Nlc3Mga2V5IG1vZGlmaWVyIGJlIHRoZSBBbHQg a2V5PworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU5 OTMKKworICAgICAgICAqIHBhZ2UvcXQvRXZlbnRIYW5kbGVyUXQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RXZlbnRIYW5kbGVyOjphY2Nlc3NLZXlNb2RpZmllcnMpOgorCiAyMDEwLTAzLTEwICBK ZXJlbXkgT3Jsb3cgIDxqb3Jsb3dAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERhcmluIEZpc2hlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9xdC9FdmVudEhhbmRsZXJR dC5jcHAgYi9XZWJDb3JlL3BhZ2UvcXQvRXZlbnRIYW5kbGVyUXQuY3BwCmluZGV4IDM0MjUyODku LmQ3OTgyZmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9xdC9FdmVudEhhbmRsZXJRdC5jcHAK KysrIGIvV2ViQ29yZS9wYWdlL3F0L0V2ZW50SGFuZGxlclF0LmNwcApAQCAtMTMyLDcgKzEzMiwx MSBAQCBib29sIEV2ZW50SGFuZGxlcjo6cGFzc01vdXNlUmVsZWFzZUV2ZW50VG9TdWJmcmFtZShN b3VzZUV2ZW50V2l0aEhpdFRlc3RSZXN1bHRzJgogCiB1bnNpZ25lZCBFdmVudEhhbmRsZXI6OmFj Y2Vzc0tleU1vZGlmaWVycygpCiB7Ci0gICAgcmV0dXJuIFBsYXRmb3JtS2V5Ym9hcmRFdmVudDo6 Q3RybEtleTsKKyNpZiBPUyhEQVJXSU4pCisgICAgcmV0dXJuIFBsYXRmb3JtS2V5Ym9hcmRFdmVu dDo6Q3RybEtleSB8IFBsYXRmb3JtS2V5Ym9hcmRFdmVudDo6QWx0S2V5OworI2Vsc2UKKyAgICBy ZXR1cm4gUGxhdGZvcm1LZXlib2FyZEV2ZW50OjpBbHRLZXk7CisjZW5kaWYKIH0KIAogfQotLSAK MS42LjMuMwoK