49289 2010-11-09 17:21:29 -0800 [chromium] menu key doesn't work when capslock or numslock is on 2010-11-10 14:48:00 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 estade webkit-unassigned commit-queue webkit.review.bot oldest_to_newest 307070 0 estade 2010-11-09 17:21:29 -0800 the menu key is ignored in certain situations, depending on modifier state. patch forthcoming. 307076 1 73443 estade 2010-11-09 17:26:55 -0800 Created attachment 73443 try1 307078 2 webkit.review.bot 2010-11-09 17:30:23 -0800 Attachment 73443 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--diff-files', u'WebKit/chromium/ChangeLog', u'WebKit/chromium/public/WebInputEvent.h', u'WebKit/chromium/src/WebViewImpl.cpp']" exit_code: 1 WebKit/chromium/src/WebViewImpl.cpp:580: One space before end of line comments [whitespace/comments] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 307086 3 73443 tony 2010-11-09 17:39:46 -0800 Comment on attachment 73443 try1 View in context: https://bugs.webkit.org/attachment.cgi?id=73443&action=review > WebKit/chromium/public/WebInputEvent.h:133 > + static const int InputModifiers = ShiftKey | ControlKey | AltKey | MetaKey; Nit: I don't like this name much. Aren't capslock and numlock also input modifiers? Should there just be a static method that returns event.modifiers & (ShiftKey | ControlKey | AltKey | MetaKey) like the other methods? 307103 4 73443 estade 2010-11-09 18:16:30 -0800 Comment on attachment 73443 try1 View in context: https://bugs.webkit.org/attachment.cgi?id=73443&action=review >> WebKit/chromium/public/WebInputEvent.h:133 >> + static const int InputModifiers = ShiftKey | ControlKey | AltKey | MetaKey; > > Nit: I don't like this name much. Aren't capslock and numlock also input modifiers? Should there just be a static method that returns event.modifiers & (ShiftKey | ControlKey | AltKey | MetaKey) like the other methods? I can't think of a better name (really the best name is "modifier", but the enum took that already). I got this name from the getWebInputModifiers() function in WebInputEventConversion.cpp I think it's more versatile as a bitmask but if you would rather it be an applied bitmask I can do that. 307392 5 73443 tony 2010-11-10 09:56:53 -0800 Comment on attachment 73443 try1 View in context: https://bugs.webkit.org/attachment.cgi?id=73443&action=review >>> WebKit/chromium/public/WebInputEvent.h:133 >>> + static const int InputModifiers = ShiftKey | ControlKey | AltKey | MetaKey; >> >> Nit: I don't like this name much. Aren't capslock and numlock also input modifiers? Should there just be a static method that returns event.modifiers & (ShiftKey | ControlKey | AltKey | MetaKey) like the other methods? > > I can't think of a better name (really the best name is "modifier", but the enum took that already). I got this name from the getWebInputModifiers() function in WebInputEventConversion.cpp > > I think it's more versatile as a bitmask but if you would rather it be an applied bitmask I can do that. Ok, if you want to keep it as a bitmask, can you change the if below to have named bools to make it easier to read? E.g.: bool isUnmodifiedMenuKey = !(event.modifiers & WebInputEvent::InputModifiers) && (event.windowsKeyCode == VKEY_APPS); bool isShiftF10 = (event.modifiers == WebInputEvent::ShiftKey) && (event.windowsKeyCode == VKEY_F10) if ((isUnmodifiedMenuKey || isShiftF10) && event.type == contextMenuTriggeringEventType) { Please fix the style complaint too. 307469 6 73521 estade 2010-11-10 11:59:18 -0800 Created attachment 73521 try2 style fixed; readability suggestion implemented. 307473 7 webkit.review.bot 2010-11-10 12:01:11 -0800 Attachment 73521 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--diff-files', u'WebKit/chromium/ChangeLog', u'WebKit/chromium/public/WebInputEvent.h', u'WebKit/chromium/src/WebViewImpl.cpp']" exit_code: 1 WebKit/chromium/src/WebViewImpl.cpp:574: Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side. [whitespace/operators] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 307502 8 73529 estade 2010-11-10 12:56:02 -0800 Created attachment 73529 try3 style again 307578 9 73529 commit-queue 2010-11-10 14:47:55 -0800 Comment on attachment 73529 try3 Clearing flags on attachment: 73529 Committed r71774: <http://trac.webkit.org/changeset/71774> 307579 10 commit-queue 2010-11-10 14:48:00 -0800 All reviewed patches have been landed. Closing bug. 73443 2010-11-09 17:26:55 -0800 2010-11-10 11:59:18 -0800 try1 input_modifiers.diff text/plain 2457 estade SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNzE2OTkpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMTEtMDkgIEV2YW4g U3RhZGUgIDxlc3RhZGVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gbWVudSBrZXkgZG9lc24ndCB3b3JrIHdo ZW4gY2Fwc2xvY2sgb3IgbnVtc2xvY2sgaXMgb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5Mjg5CisKKyAgICAgICAgQWRkIGEgc3BlY2lhbCBiaXRt YXNrIGZvciB0aGUgImlucHV0IiBtb2RpZmllciBrZXlzIChzaGlmdCwgYWx0LCBjcnRsLCBtZXRh KS4gVGhlIE1vZGlmaWVyCisgICAgICAgIGVudW0gaGFzIGdyb3duIHRvIHNvbWV0aGluZyB0aGF0 IG1pZ2h0IGJlIGJldHRlciB0ZXJtZWQgU3RhdGUsIGJ1dCBjaGFuZ2luZyB0aGUgbm9tZW5jbGF0 dXJlCisgICAgICAgIG5vdyBpcyBkaWZmaWN1bHQuIFRoZSBiaXRtYXNrIGdldHMgaXRzIG5hbWUg ZnJvbSB0aGUgcmVsYXRlZCBmdW5jdGlvbiBnZXRXZWJJbnB1dE1vZGlmaWVycy4KKworICAgICAg ICAqIHB1YmxpYy9XZWJJbnB1dEV2ZW50Lmg6IGFkZCBJbnB1dE1vZGlmaWVycyBtYXNrIGZvciB0 cnVlIG1vZGlmaWVyIGtleXMKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOiBkaXNyZWdh cmQgbm9uLW1vZGlmaWVyIGtleXMKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmtleUV2 ZW50KToKKwogMjAxMC0xMS0wOSAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJJbnB1dEV2ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJJbnB1dEV2ZW50LmgJKHJldmlzaW9uIDcxNjk5KQorKysgV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJJbnB1dEV2ZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTEzMCw2ICsxMzAs OCBAQCBwdWJsaWM6CiAgICAgICAgIE51bUxvY2tPbiAgICAgICAgPSAxIDw8IDEwLAogICAgIH07 CiAKKyAgICBzdGF0aWMgY29uc3QgaW50IElucHV0TW9kaWZpZXJzID0gU2hpZnRLZXkgfCBDb250 cm9sS2V5IHwgQWx0S2V5IHwgTWV0YUtleTsKKwogICAgIHVuc2lnbmVkIHNpemU7ICAgLy8gVGhl IHNpemUgb2YgdGhpcyBzdHJ1Y3R1cmUsIGZvciBzZXJpYWxpemF0aW9uLgogICAgIFR5cGUgdHlw ZTsKICAgICBpbnQgbW9kaWZpZXJzOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAJKHJldmlzaW9uIDcxNjk5KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTU3MSwxMyArNTcxLDEzIEBAIGJvb2wgV2ViVmlld0ltcGw6 OmtleUV2ZW50KGNvbnN0IFdlYktleWIKICAgICAgICAgV2ViSW5wdXRFdmVudDo6UmF3S2V5RG93 bjsKICNlbmRpZgogCi0gICAgaWYgKCgoIWV2ZW50Lm1vZGlmaWVycyAmJiAoZXZlbnQud2luZG93 c0tleUNvZGUgPT0gVktFWV9BUFBTKSkKKyAgICBpZiAoKCghKGV2ZW50Lm1vZGlmaWVycyAmIFdl YklucHV0RXZlbnQ6OklucHV0TW9kaWZpZXJzKSAmJiAoZXZlbnQud2luZG93c0tleUNvZGUgPT0g VktFWV9BUFBTKSkKICAgICAgICAgfHwgKChldmVudC5tb2RpZmllcnMgPT0gV2ViSW5wdXRFdmVu dDo6U2hpZnRLZXkpICYmIChldmVudC53aW5kb3dzS2V5Q29kZSA9PSBWS0VZX0YxMCkpKQogICAg ICAgICAmJiBldmVudC50eXBlID09IGNvbnRleHRNZW51VHJpZ2dlcmluZ0V2ZW50VHlwZSkgewog ICAgICAgICBzZW5kQ29udGV4dE1lbnVFdmVudChldmVudCk7CiAgICAgICAgIHJldHVybiB0cnVl OwogICAgIH0KLSNlbmRpZgorI2VuZGlmICAvLyBPUyhXSU5ET1dTKSB8fCBPUyhMSU5VWCkgfHwg T1MoRlJFRUJTRCkKIAogICAgIC8vIEl0J3Mgbm90IGNsZWFyIGlmIHdlIHNob3VsZCBjb250aW51 ZSBhZnRlciBkZXRlY3RpbmcgYSBjYXBzbG9jayBrZXlwcmVzcy4KICAgICAvLyBJJ2xsIGVyciBv biB0aGUgc2lkZSBvZiBjb250aW51aW5nLCB3aGljaCBpcyB0aGUgcHJlLWV4aXN0aW5nIGJlaGF2 aW91ci4K 73521 2010-11-10 11:59:18 -0800 2010-11-10 12:56:02 -0800 try2 input_modifiers.diff text/plain 2683 estade SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNzE2OTkpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMTEtMDkgIEV2YW4g U3RhZGUgIDxlc3RhZGVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gbWVudSBrZXkgZG9lc24ndCB3b3JrIHdo ZW4gY2Fwc2xvY2sgb3IgbnVtc2xvY2sgaXMgb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5Mjg5CisKKyAgICAgICAgQWRkIGEgc3BlY2lhbCBiaXRt YXNrIGZvciB0aGUgImlucHV0IiBtb2RpZmllciBrZXlzIChzaGlmdCwgYWx0LCBjcnRsLCBtZXRh KS4gVGhlIE1vZGlmaWVyCisgICAgICAgIGVudW0gaGFzIGdyb3duIHRvIHNvbWV0aGluZyB0aGF0 IG1pZ2h0IGJlIGJldHRlciB0ZXJtZWQgU3RhdGUsIGJ1dCBjaGFuZ2luZyB0aGUgbm9tZW5jbGF0 dXJlCisgICAgICAgIG5vdyBpcyBkaWZmaWN1bHQuIFRoZSBiaXRtYXNrIGdldHMgaXRzIG5hbWUg ZnJvbSB0aGUgcmVsYXRlZCBmdW5jdGlvbiBnZXRXZWJJbnB1dE1vZGlmaWVycy4KKworICAgICAg ICAqIHB1YmxpYy9XZWJJbnB1dEV2ZW50Lmg6IGFkZCBJbnB1dE1vZGlmaWVycyBtYXNrIGZvciB0 cnVlIG1vZGlmaWVyIGtleXMKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOiBkaXNyZWdh cmQgbm9uLW1vZGlmaWVyIGtleXMKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmtleUV2 ZW50KToKKwogMjAxMC0xMS0wOSAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJJbnB1dEV2ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJJbnB1dEV2ZW50LmgJKHJldmlzaW9uIDcxNjk5KQorKysgV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJJbnB1dEV2ZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTEzMCw2ICsxMzAs OCBAQCBwdWJsaWM6CiAgICAgICAgIE51bUxvY2tPbiAgICAgICAgPSAxIDw8IDEwLAogICAgIH07 CiAKKyAgICBzdGF0aWMgY29uc3QgaW50IElucHV0TW9kaWZpZXJzID0gU2hpZnRLZXkgfCBDb250 cm9sS2V5IHwgQWx0S2V5IHwgTWV0YUtleTsKKwogICAgIHVuc2lnbmVkIHNpemU7ICAgLy8gVGhl IHNpemUgb2YgdGhpcyBzdHJ1Y3R1cmUsIGZvciBzZXJpYWxpemF0aW9uLgogICAgIFR5cGUgdHlw ZTsKICAgICBpbnQgbW9kaWZpZXJzOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAJKHJldmlzaW9uIDcxNjk5KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTU3MSwxMyArNTcxLDE0IEBAIGJvb2wgV2ViVmlld0ltcGw6 OmtleUV2ZW50KGNvbnN0IFdlYktleWIKICAgICAgICAgV2ViSW5wdXRFdmVudDo6UmF3S2V5RG93 bjsKICNlbmRpZgogCi0gICAgaWYgKCgoIWV2ZW50Lm1vZGlmaWVycyAmJiAoZXZlbnQud2luZG93 c0tleUNvZGUgPT0gVktFWV9BUFBTKSkKLSAgICAgICAgfHwgKChldmVudC5tb2RpZmllcnMgPT0g V2ViSW5wdXRFdmVudDo6U2hpZnRLZXkpICYmIChldmVudC53aW5kb3dzS2V5Q29kZSA9PSBWS0VZ X0YxMCkpKQotICAgICAgICAmJiBldmVudC50eXBlID09IGNvbnRleHRNZW51VHJpZ2dlcmluZ0V2 ZW50VHlwZSkgeworICAgIGJvb2wgaXNVbm1vZGlmaWVkTWVudUtleSA9ICEoZXZlbnQubW9kaWZp ZXJzICYgV2ViSW5wdXRFdmVudDo6SW5wdXRNb2RpZmllcnMpICYmCisgICAgICAgIGV2ZW50Lndp bmRvd3NLZXlDb2RlID09IFZLRVlfQVBQUzsKKyAgICBib29sIGlzU2hpZnRGMTAgPSBldmVudC5t b2RpZmllcnMgPT0gV2ViSW5wdXRFdmVudDo6U2hpZnRLZXkgJiYgZXZlbnQud2luZG93c0tleUNv ZGUgPT0gVktFWV9GMTA7CisgICAgaWYgKChpc1VubW9kaWZpZWRNZW51S2V5IHx8IGlzU2hpZnRG MTApICYmIGV2ZW50LnR5cGUgPT0gY29udGV4dE1lbnVUcmlnZ2VyaW5nRXZlbnRUeXBlKSB7CiAg ICAgICAgIHNlbmRDb250ZXh0TWVudUV2ZW50KGV2ZW50KTsKICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgfQotI2VuZGlmCisjZW5kaWYgLy8gT1MoV0lORE9XUykgfHwgT1MoTElOVVgpIHx8IE9T KEZSRUVCU0QpCiAKICAgICAvLyBJdCdzIG5vdCBjbGVhciBpZiB3ZSBzaG91bGQgY29udGludWUg YWZ0ZXIgZGV0ZWN0aW5nIGEgY2Fwc2xvY2sga2V5cHJlc3MuCiAgICAgLy8gSSdsbCBlcnIgb24g dGhlIHNpZGUgb2YgY29udGludWluZywgd2hpY2ggaXMgdGhlIHByZS1leGlzdGluZyBiZWhhdmlv dXIuCg== 73529 2010-11-10 12:56:02 -0800 2010-11-10 14:47:55 -0800 try3 input_modifiers.diff text/plain 2674 estade SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNzE2OTkpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMTEtMDkgIEV2YW4g U3RhZGUgIDxlc3RhZGVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gbWVudSBrZXkgZG9lc24ndCB3b3JrIHdo ZW4gY2Fwc2xvY2sgb3IgbnVtc2xvY2sgaXMgb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5Mjg5CisKKyAgICAgICAgQWRkIGEgc3BlY2lhbCBiaXRt YXNrIGZvciB0aGUgImlucHV0IiBtb2RpZmllciBrZXlzIChzaGlmdCwgYWx0LCBjcnRsLCBtZXRh KS4gVGhlIE1vZGlmaWVyCisgICAgICAgIGVudW0gaGFzIGdyb3duIHRvIHNvbWV0aGluZyB0aGF0 IG1pZ2h0IGJlIGJldHRlciB0ZXJtZWQgU3RhdGUsIGJ1dCBjaGFuZ2luZyB0aGUgbm9tZW5jbGF0 dXJlCisgICAgICAgIG5vdyBpcyBkaWZmaWN1bHQuIFRoZSBiaXRtYXNrIGdldHMgaXRzIG5hbWUg ZnJvbSB0aGUgcmVsYXRlZCBmdW5jdGlvbiBnZXRXZWJJbnB1dE1vZGlmaWVycy4KKworICAgICAg ICAqIHB1YmxpYy9XZWJJbnB1dEV2ZW50Lmg6IGFkZCBJbnB1dE1vZGlmaWVycyBtYXNrIGZvciB0 cnVlIG1vZGlmaWVyIGtleXMKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOiBkaXNyZWdh cmQgbm9uLW1vZGlmaWVyIGtleXMKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmtleUV2 ZW50KToKKwogMjAxMC0xMS0wOSAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJJbnB1dEV2ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJJbnB1dEV2ZW50LmgJKHJldmlzaW9uIDcxNjk5KQorKysgV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJJbnB1dEV2ZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTEzMCw2ICsxMzAs OCBAQCBwdWJsaWM6CiAgICAgICAgIE51bUxvY2tPbiAgICAgICAgPSAxIDw8IDEwLAogICAgIH07 CiAKKyAgICBzdGF0aWMgY29uc3QgaW50IElucHV0TW9kaWZpZXJzID0gU2hpZnRLZXkgfCBDb250 cm9sS2V5IHwgQWx0S2V5IHwgTWV0YUtleTsKKwogICAgIHVuc2lnbmVkIHNpemU7ICAgLy8gVGhl IHNpemUgb2YgdGhpcyBzdHJ1Y3R1cmUsIGZvciBzZXJpYWxpemF0aW9uLgogICAgIFR5cGUgdHlw ZTsKICAgICBpbnQgbW9kaWZpZXJzOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAJKHJldmlzaW9uIDcxNjk5KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTU3MSwxMyArNTcxLDEzIEBAIGJvb2wgV2ViVmlld0ltcGw6 OmtleUV2ZW50KGNvbnN0IFdlYktleWIKICAgICAgICAgV2ViSW5wdXRFdmVudDo6UmF3S2V5RG93 bjsKICNlbmRpZgogCi0gICAgaWYgKCgoIWV2ZW50Lm1vZGlmaWVycyAmJiAoZXZlbnQud2luZG93 c0tleUNvZGUgPT0gVktFWV9BUFBTKSkKLSAgICAgICAgfHwgKChldmVudC5tb2RpZmllcnMgPT0g V2ViSW5wdXRFdmVudDo6U2hpZnRLZXkpICYmIChldmVudC53aW5kb3dzS2V5Q29kZSA9PSBWS0VZ X0YxMCkpKQotICAgICAgICAmJiBldmVudC50eXBlID09IGNvbnRleHRNZW51VHJpZ2dlcmluZ0V2 ZW50VHlwZSkgeworICAgIGJvb2wgaXNVbm1vZGlmaWVkTWVudUtleSA9ICEoZXZlbnQubW9kaWZp ZXJzICYgV2ViSW5wdXRFdmVudDo6SW5wdXRNb2RpZmllcnMpICYmIGV2ZW50LndpbmRvd3NLZXlD b2RlID09IFZLRVlfQVBQUzsKKyAgICBib29sIGlzU2hpZnRGMTAgPSBldmVudC5tb2RpZmllcnMg PT0gV2ViSW5wdXRFdmVudDo6U2hpZnRLZXkgJiYgZXZlbnQud2luZG93c0tleUNvZGUgPT0gVktF WV9GMTA7CisgICAgaWYgKChpc1VubW9kaWZpZWRNZW51S2V5IHx8IGlzU2hpZnRGMTApICYmIGV2 ZW50LnR5cGUgPT0gY29udGV4dE1lbnVUcmlnZ2VyaW5nRXZlbnRUeXBlKSB7CiAgICAgICAgIHNl bmRDb250ZXh0TWVudUV2ZW50KGV2ZW50KTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQot I2VuZGlmCisjZW5kaWYgLy8gT1MoV0lORE9XUykgfHwgT1MoTElOVVgpIHx8IE9TKEZSRUVCU0Qp CiAKICAgICAvLyBJdCdzIG5vdCBjbGVhciBpZiB3ZSBzaG91bGQgY29udGludWUgYWZ0ZXIgZGV0 ZWN0aW5nIGEgY2Fwc2xvY2sga2V5cHJlc3MuCiAgICAgLy8gSSdsbCBlcnIgb24gdGhlIHNpZGUg b2YgY29udGludWluZywgd2hpY2ggaXMgdGhlIHByZS1leGlzdGluZyBiZWhhdmlvdXIuCg==