100937 2012-11-01 02:46:36 -0700 [BlackBerry] DRT - eventSender.keyDown() needs to support pageUp, pageDown, home, end key 2012-11-09 04:55:08 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 0 xiaobwang webkit-unassigned mifenton mxie rwlbuis tonikitoo webkit.review.bot oldest_to_newest 756022 0 xiaobwang 2012-11-01 02:46:36 -0700 These keys are used in existing Layout tests, we should support them. 756041 1 171805 xiaobwang 2012-11-01 03:26:11 -0700 Created attachment 171805 patch 756045 2 xiaobwang 2012-11-01 03:30:36 -0700 The following tests will be unblocked by this patch. editing/input/scroll-viewport-page-up-down.html editing/selection/move-begin-end.html fast/forms/select-popup-pagekeys.html 756106 3 171805 rwlbuis 2012-11-01 05:06:28 -0700 Comment on attachment 171805 patch View in context: https://bugs.webkit.org/attachment.cgi?id=171805&action=review > Tools/ChangeLog:8 > + 1. Translate these keys to their corresponding BlackBerry key code. Agreed. > Tools/ChangeLog:9 > + 2. Break down a KeyChar event to a KeyDown/KeyUp pair. Why is that needed? What does it fix? 761104 4 171805 rwlbuis 2012-11-07 15:27:46 -0800 Comment on attachment 171805 patch View in context: https://bugs.webkit.org/attachment.cgi?id=171805&action=review > Tools/ChangeLog:10 > + Also you should state the tests this fixes. 762629 5 171805 xiaobwang 2012-11-08 23:42:49 -0800 Comment on attachment 171805 patch View in context: https://bugs.webkit.org/attachment.cgi?id=171805&action=review >> Tools/ChangeLog:9 >> + 2. Break down a KeyChar event to a KeyDown/KeyUp pair. > > Why is that needed? What does it fix? It's because we only handle scrolling on a KeyDown event in WebPage::keyEvent(), and internally a KeyChar event is interpreted as a KeyDown event + a KeyUp event, in InputHandler::handleKeyboardInput(). >> Tools/ChangeLog:10 >> + > > Also you should state the tests this fixes. Yes, will add the test list here. 762644 6 173220 xiaobwang 2012-11-09 00:10:57 -0800 Created attachment 173220 patch - updated 762831 7 173220 rwlbuis 2012-11-09 04:35:23 -0800 Comment on attachment 173220 patch - updated View in context: https://bugs.webkit.org/attachment.cgi?id=173220&action=review LGTM. > Tools/ChangeLog:12 > + KeyUp event in InputHandler::handleKeyboardInput(). No PR? > Tools/DumpRenderTree/blackberry/EventSender.cpp:185 > + page->keyEvent(BlackBerry::Platform::KeyboardEvent(charCode, BlackBerry::Platform::KeyboardEvent::KeyUp, modifiers)); We should be considering using BlackBerry::Platform::KeyboardEvent; to get rid of the namespaces. You'd need just KeyboardEvent then. 762846 8 173220 webkit.review.bot 2012-11-09 04:55:05 -0800 Comment on attachment 173220 patch - updated Clearing flags on attachment: 173220 Committed r134052: <http://trac.webkit.org/changeset/134052> 762847 9 webkit.review.bot 2012-11-09 04:55:08 -0800 All reviewed patches have been landed. Closing bug. 171805 2012-11-01 03:26:11 -0700 2012-11-09 00:10:57 -0800 patch 0001-BlackBerry-DRT-eventSender.keyDown-needs-to-support-.patch text/plain 3791 xiaobwang RnJvbSA3MjE4MjdkNGQzYzc3MmI4MWE5YmE0OTlmYTdhOTdiMzJhNDc3ZjMxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYaWFvYm8gV2FuZyA8eGJ3YW5nQHRvcmNobW9iaWxlLmNvbS5j bj4KRGF0ZTogVGh1LCAxIE5vdiAyMDEyIDE4OjIzOjI1ICswODAwClN1YmplY3Q6IFtQQVRDSF0g W0JsYWNrQmVycnldIERSVCAtIGV2ZW50U2VuZGVyLmtleURvd24oKSBuZWVkcyB0byBzdXBwb3J0 CiBwYWdlVXAsIHBhZ2VEb3duLCBob21lLCBlbmQga2V5CiBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAwOTM3CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCjEu IFRyYW5zbGF0ZSB0aGVzZSBrZXlzIHRvIHRoZWlyIGNvcnJlc3BvbmRpbmcgQmxhY2tCZXJyeSBr ZXkgY29kZS4KMi4gQnJlYWsgZG93biBhIEtleUNoYXIgZXZlbnQgdG8gYSBLZXlEb3duL0tleVVw IHBhaXIuCgoqIER1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRXZlbnRTZW5kZXIuY3BwOgooa2V5 RG93bkNhbGxiYWNrKToKLS0tCiBUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB8ICAgMTMgKysrKysrKysrKysrKwogVG9vbHMvRHVtcFJlbmRlclRyZWUvYmxh Y2tiZXJyeS9FdmVudFNlbmRlci5jcHAgfCAgIDIwICsrKysrKysrKysrKy0tLS0tLS0tCiAyIGZp bGVzIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGUyOTJmY2IuLjViY2Mw OTYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNiBAQAorMjAxMi0xMS0wMSAgWGlhb2JvIFdhbmcgIDx4YndhbmdAdG9yY2htb2Jp bGUuY29tLmNuPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBEUlQgLSBldmVudFNlbmRlci5rZXlE b3duKCkgbmVlZHMgdG8gc3VwcG9ydCBwYWdlVXAsIHBhZ2VEb3duLCBob21lLCBlbmQga2V5Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDA5MzcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAxLiBUcmFuc2xh dGUgdGhlc2Uga2V5cyB0byB0aGVpciBjb3JyZXNwb25kaW5nIEJsYWNrQmVycnkga2V5IGNvZGUu CisgICAgICAgIDIuIEJyZWFrIGRvd24gYSBLZXlDaGFyIGV2ZW50IHRvIGEgS2V5RG93bi9LZXlV cCBwYWlyLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJyeS9FdmVudFNlbmRl ci5jcHA6CisgICAgICAgIChrZXlEb3duQ2FsbGJhY2spOgorCiAyMDEyLTEwLTMxICBEaXJrIFBy YW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE5SV1Q6IGxpbnQgd2Fybmlu Z3MgZG9uJ3Qgc2hvdyB1cCBieSBkZWZhdWx0CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVy VHJlZS9ibGFja2JlcnJ5L0V2ZW50U2VuZGVyLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Js YWNrYmVycnkvRXZlbnRTZW5kZXIuY3BwCmluZGV4IGFiN2Y4MDguLjBmNzY5MTQgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRXZlbnRTZW5kZXIuY3BwCisrKyBi L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRXZlbnRTZW5kZXIuY3BwCkBAIC0xMzEs MTEgKzEzMSwxNCBAQCBzdGF0aWMgSlNWYWx1ZVJlZiBrZXlEb3duQ2FsbGJhY2soSlNDb250ZXh0 UmVmIGNvbnRleHQsIEpTT2JqZWN0UmVmIGZ1bmN0aW9uLCBKUwogICAgICAgICBjaGFyQ29kZSA9 IEtFWUNPREVfVVA7CiAgICAgZWxzZSBpZiAoSlNTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmluZyhj aGFyYWN0ZXIsICJkb3duQXJyb3ciKSkKICAgICAgICAgY2hhckNvZGUgPSBLRVlDT0RFX0RPV047 Ci0gICAgZWxzZSBpZiAoSlNTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmluZyhjaGFyYWN0ZXIsICJw YWdlVXAiKQotICAgICAgICAgICAgIHx8IEpTU3RyaW5nSXNFcXVhbFRvVVRGOENTdHJpbmcoY2hh cmFjdGVyLCAicGFnZURvd24iKQotICAgICAgICAgICAgIHx8IEpTU3RyaW5nSXNFcXVhbFRvVVRG OENTdHJpbmcoY2hhcmFjdGVyLCAiaG9tZSIpCi0gICAgICAgICAgICAgfHwgSlNTdHJpbmdJc0Vx dWFsVG9VVEY4Q1N0cmluZyhjaGFyYWN0ZXIsICJlbmQiKSkKLSAgICAgICAgIHJldHVybiBKU1Zh bHVlTWFrZVVuZGVmaW5lZChjb250ZXh0KTsKKyAgICBlbHNlIGlmIChKU1N0cmluZ0lzRXF1YWxU b1VURjhDU3RyaW5nKGNoYXJhY3RlciwgInBhZ2VVcCIpKQorICAgICAgICBjaGFyQ29kZSA9IEtF WUNPREVfUEdfVVA7CisgICAgZWxzZSBpZiAoSlNTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmluZyhj aGFyYWN0ZXIsICJwYWdlRG93biIpKQorICAgICAgICBjaGFyQ29kZSA9IEtFWUNPREVfUEdfRE9X TjsKKyAgICBlbHNlIGlmIChKU1N0cmluZ0lzRXF1YWxUb1VURjhDU3RyaW5nKGNoYXJhY3Rlciwg ImhvbWUiKSkKKyAgICAgICAgY2hhckNvZGUgPSBLRVlDT0RFX0hPTUU7CisgICAgZWxzZSBpZiAo SlNTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmluZyhjaGFyYWN0ZXIsICJlbmQiKSkKKyAgICAgICAg Y2hhckNvZGUgPSBLRVlDT0RFX0VORDsKICAgICBlbHNlIGlmIChKU1N0cmluZ0lzRXF1YWxUb1VU RjhDU3RyaW5nKGNoYXJhY3RlciwgImRlbGV0ZSIpKQogICAgICAgICBjaGFyQ29kZSA9IEtFWUNP REVfQkFDS1NQQUNFOwogICAgIGVsc2UgewpAQCAtMTc4LDcgKzE4MSw4IEBAIHN0YXRpYyBKU1Zh bHVlUmVmIGtleURvd25DYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwgSlNPYmplY3RSZWYg ZnVuY3Rpb24sIEpTCiAgICAgaWYgKG5lZWRzQ3RybEtleU1vZGlmaWVyKQogICAgICAgICBtb2Rp ZmllcnMgfD0gS0VZTU9EX0NUUkw7CiAKLSAgICBwYWdlLT5rZXlFdmVudChCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6S2V5Ym9hcmRFdmVudChjaGFyQ29kZSwgQmxhY2tCZXJyeTo6UGxhdGZvcm06Oktl eWJvYXJkRXZlbnQ6OktleUNoYXIsIG1vZGlmaWVycykpOworICAgIHBhZ2UtPmtleUV2ZW50KEJs YWNrQmVycnk6OlBsYXRmb3JtOjpLZXlib2FyZEV2ZW50KGNoYXJDb2RlLCBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6S2V5Ym9hcmRFdmVudDo6S2V5RG93biwgbW9kaWZpZXJzKSk7CisgICAgcGFnZS0+ a2V5RXZlbnQoQmxhY2tCZXJyeTo6UGxhdGZvcm06OktleWJvYXJkRXZlbnQoY2hhckNvZGUsIEJs YWNrQmVycnk6OlBsYXRmb3JtOjpLZXlib2FyZEV2ZW50OjpLZXlVcCwgbW9kaWZpZXJzKSk7CiAK ICAgICByZXR1cm4gSlNWYWx1ZU1ha2VVbmRlZmluZWQoY29udGV4dCk7CiB9CkBAIC0zOTQsOCAr Mzk4LDggQEAgc3RhdGljIEpTQ2xhc3NSZWYgZ2V0Q2xhc3MoSlNDb250ZXh0UmVmIGNvbnRleHQp CiAKICAgICBpZiAoIWV2ZW50U2VuZGVyQ2xhc3MpIHsKICAgICAgICAgSlNDbGFzc0RlZmluaXRp b24gY2xhc3NEZWZpbml0aW9uID0gewotICAgICAgICAgICAgICAgIDAsIDAsIDAsIDAsIDAsIDAs Ci0gICAgICAgICAgICAgICAgMCwgMCwgMCwgMCwgMCwgMCwgMCwgMCwgMCwgMCwgMH07CisgICAg ICAgICAgICAwLCAwLCAwLCAwLCAwLCAwLAorICAgICAgICAgICAgMCwgMCwgMCwgMCwgMCwgMCwg MCwgMCwgMCwgMCwgMH07CiAgICAgICAgIGNsYXNzRGVmaW5pdGlvbi5zdGF0aWNGdW5jdGlvbnMg PSBzdGF0aWNGdW5jdGlvbnM7CiAgICAgICAgIGNsYXNzRGVmaW5pdGlvbi5zdGF0aWNWYWx1ZXMg PSBzdGF0aWNWYWx1ZXM7CiAKLS0gCjEuNy42Cgo= 173220 2012-11-09 00:10:57 -0800 2012-11-09 04:55:04 -0800 patch - updated 0001-BlackBerry-DRT-eventSender.keyDown-needs-to-support-.patch text/plain 4617 xiaobwang RnJvbSA5NWY2ZjdlMGJlZWVmMTI4MjI2NzNjYTA3MjIyYjBlOTdlMDI5ZDEzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYaWFvYm8gV2FuZyA8eGJ3YW5nQHRvcmNobW9iaWxlLmNvbS5j bj4KRGF0ZTogRnJpLCA5IE5vdiAyMDEyIDE2OjA3OjA4ICswODAwClN1YmplY3Q6IFtQQVRDSF0g W0JsYWNrQmVycnldIERSVCAtIGV2ZW50U2VuZGVyLmtleURvd24oKSBuZWVkcyB0byBzdXBwb3J0 CiBwYWdlVXAsIHBhZ2VEb3duLCBob21lLCBlbmQga2V5CiBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAwOTM3CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCjEu IFRyYW5zbGF0ZSB0aGVzZSBrZXlzIHRvIHRoZWlyIGNvcnJlc3BvbmRpbmcgQmxhY2tCZXJyeSBr ZXkgY29kZS4KMi4gQnJlYWsgZG93biBhIEtleUNoYXIgZXZlbnQgdG8gYSBLZXlEb3duL0tleVVw IHBhaXIuIFRoaXMgaXMgcmVxdWlyZWQKYmVjYXVzZSB3ZSBvbmx5IGhhbmRsZSBzY3JvbGxpbmcg b24gYSBLZXlEb3duIGV2ZW50IGluIFdlYlBhZ2U6OmtleUV2ZW50KCkKLCBhbmQgaW50ZXJuYWxs eSBhIEtleUNoYXIgZXZlbnQgaXMgaW50ZXJwcmV0ZWQgYXMgYSBLZXlEb3duIGV2ZW50ICsgYQpL ZXlVcCBldmVudCBpbiBJbnB1dEhhbmRsZXI6OmhhbmRsZUtleWJvYXJkSW5wdXQoKS4KClRlc3Rz IGZpeGVkOgoxLiBlZGl0aW5nL2lucHV0L3Njcm9sbC12aWV3cG9ydC1wYWdlLXVwLWRvd24uaHRt bAoyLiBlZGl0aW5nL3NlbGVjdGlvbi9tb3ZlLWJlZ2luLWVuZC5odG1sCjMuIGZhc3QvZm9ybXMv c2VsZWN0LXBvcHVwLXBhZ2VrZXlzLmh0bWwKCiogRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJyeS9F dmVudFNlbmRlci5jcHA6CihrZXlEb3duQ2FsbGJhY2spOgotLS0KIFRvb2xzL0NoYW5nZUxvZyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAyMSArKysrKysrKysrKysrKysrKysr KysKIFRvb2xzL0R1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRXZlbnRTZW5kZXIuY3BwIHwgICAy MCArKysrKysrKysrKystLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAzMyBpbnNlcnRpb25zKCsp LCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCAwNWE4YmUwLi5hZWMwOGJiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VM b2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTItMTEtMDkgIFhp YW9ibyBXYW5nICA8eGJ3YW5nQHRvcmNobW9iaWxlLmNvbS5jbj4KKworICAgICAgICBbQmxhY2tC ZXJyeV0gRFJUIC0gZXZlbnRTZW5kZXIua2V5RG93bigpIG5lZWRzIHRvIHN1cHBvcnQgcGFnZVVw LCBwYWdlRG93biwgaG9tZSwgZW5kIGtleQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAwOTM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgMS4gVHJhbnNsYXRlIHRoZXNlIGtleXMgdG8gdGhlaXIgY29ycmVz cG9uZGluZyBCbGFja0JlcnJ5IGtleSBjb2RlLgorICAgICAgICAyLiBCcmVhayBkb3duIGEgS2V5 Q2hhciBldmVudCB0byBhIEtleURvd24vS2V5VXAgcGFpci4gVGhpcyBpcyByZXF1aXJlZAorICAg ICAgICBiZWNhdXNlIHdlIG9ubHkgaGFuZGxlIHNjcm9sbGluZyBvbiBhIEtleURvd24gZXZlbnQg aW4gV2ViUGFnZTo6a2V5RXZlbnQoKQorICAgICAgICAsIGFuZCBpbnRlcm5hbGx5IGEgS2V5Q2hh ciBldmVudCBpcyBpbnRlcnByZXRlZCBhcyBhIEtleURvd24gZXZlbnQgKyBhCisgICAgICAgIEtl eVVwIGV2ZW50IGluIElucHV0SGFuZGxlcjo6aGFuZGxlS2V5Ym9hcmRJbnB1dCgpLgorCisgICAg ICAgIFRlc3RzIGZpeGVkOgorICAgICAgICAxLiBlZGl0aW5nL2lucHV0L3Njcm9sbC12aWV3cG9y dC1wYWdlLXVwLWRvd24uaHRtbAorICAgICAgICAyLiBlZGl0aW5nL3NlbGVjdGlvbi9tb3ZlLWJl Z2luLWVuZC5odG1sCisgICAgICAgIDMuIGZhc3QvZm9ybXMvc2VsZWN0LXBvcHVwLXBhZ2VrZXlz Lmh0bWwKKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRXZlbnRTZW5kZXIu Y3BwOgorICAgICAgICAoa2V5RG93bkNhbGxiYWNrKToKKwogMjAxMi0xMS0wOCAgQ2hyaXN0b3Bo ZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgogCiAgICAgICAgIFtFRkxdW1dL Ml0gQWRkIHByb3BlciBzdXBwb3J0IGZvciBmdWxsc2NyZWVuIEFQSSB0byBNaW5pQnJvd3Nlcgpk aWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJyeS9FdmVudFNlbmRlci5j cHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9ibGFja2JlcnJ5L0V2ZW50U2VuZGVyLmNwcAppbmRl eCBhYjdmODA4Li4wZjc2OTE0IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9ibGFj a2JlcnJ5L0V2ZW50U2VuZGVyLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9ibGFja2Jl cnJ5L0V2ZW50U2VuZGVyLmNwcApAQCAtMTMxLDExICsxMzEsMTQgQEAgc3RhdGljIEpTVmFsdWVS ZWYga2V5RG93bkNhbGxiYWNrKEpTQ29udGV4dFJlZiBjb250ZXh0LCBKU09iamVjdFJlZiBmdW5j dGlvbiwgSlMKICAgICAgICAgY2hhckNvZGUgPSBLRVlDT0RFX1VQOwogICAgIGVsc2UgaWYgKEpT U3RyaW5nSXNFcXVhbFRvVVRGOENTdHJpbmcoY2hhcmFjdGVyLCAiZG93bkFycm93IikpCiAgICAg ICAgIGNoYXJDb2RlID0gS0VZQ09ERV9ET1dOOwotICAgIGVsc2UgaWYgKEpTU3RyaW5nSXNFcXVh bFRvVVRGOENTdHJpbmcoY2hhcmFjdGVyLCAicGFnZVVwIikKLSAgICAgICAgICAgICB8fCBKU1N0 cmluZ0lzRXF1YWxUb1VURjhDU3RyaW5nKGNoYXJhY3RlciwgInBhZ2VEb3duIikKLSAgICAgICAg ICAgICB8fCBKU1N0cmluZ0lzRXF1YWxUb1VURjhDU3RyaW5nKGNoYXJhY3RlciwgImhvbWUiKQot ICAgICAgICAgICAgIHx8IEpTU3RyaW5nSXNFcXVhbFRvVVRGOENTdHJpbmcoY2hhcmFjdGVyLCAi ZW5kIikpCi0gICAgICAgICByZXR1cm4gSlNWYWx1ZU1ha2VVbmRlZmluZWQoY29udGV4dCk7Cisg ICAgZWxzZSBpZiAoSlNTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmluZyhjaGFyYWN0ZXIsICJwYWdl VXAiKSkKKyAgICAgICAgY2hhckNvZGUgPSBLRVlDT0RFX1BHX1VQOworICAgIGVsc2UgaWYgKEpT U3RyaW5nSXNFcXVhbFRvVVRGOENTdHJpbmcoY2hhcmFjdGVyLCAicGFnZURvd24iKSkKKyAgICAg ICAgY2hhckNvZGUgPSBLRVlDT0RFX1BHX0RPV047CisgICAgZWxzZSBpZiAoSlNTdHJpbmdJc0Vx dWFsVG9VVEY4Q1N0cmluZyhjaGFyYWN0ZXIsICJob21lIikpCisgICAgICAgIGNoYXJDb2RlID0g S0VZQ09ERV9IT01FOworICAgIGVsc2UgaWYgKEpTU3RyaW5nSXNFcXVhbFRvVVRGOENTdHJpbmco Y2hhcmFjdGVyLCAiZW5kIikpCisgICAgICAgIGNoYXJDb2RlID0gS0VZQ09ERV9FTkQ7CiAgICAg ZWxzZSBpZiAoSlNTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmluZyhjaGFyYWN0ZXIsICJkZWxldGUi KSkKICAgICAgICAgY2hhckNvZGUgPSBLRVlDT0RFX0JBQ0tTUEFDRTsKICAgICBlbHNlIHsKQEAg LTE3OCw3ICsxODEsOCBAQCBzdGF0aWMgSlNWYWx1ZVJlZiBrZXlEb3duQ2FsbGJhY2soSlNDb250 ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0UmVmIGZ1bmN0aW9uLCBKUwogICAgIGlmIChuZWVkc0N0 cmxLZXlNb2RpZmllcikKICAgICAgICAgbW9kaWZpZXJzIHw9IEtFWU1PRF9DVFJMOwogCi0gICAg cGFnZS0+a2V5RXZlbnQoQmxhY2tCZXJyeTo6UGxhdGZvcm06OktleWJvYXJkRXZlbnQoY2hhckNv ZGUsIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpLZXlib2FyZEV2ZW50OjpLZXlDaGFyLCBtb2RpZmll cnMpKTsKKyAgICBwYWdlLT5rZXlFdmVudChCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6S2V5Ym9hcmRF dmVudChjaGFyQ29kZSwgQmxhY2tCZXJyeTo6UGxhdGZvcm06OktleWJvYXJkRXZlbnQ6OktleURv d24sIG1vZGlmaWVycykpOworICAgIHBhZ2UtPmtleUV2ZW50KEJsYWNrQmVycnk6OlBsYXRmb3Jt OjpLZXlib2FyZEV2ZW50KGNoYXJDb2RlLCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6S2V5Ym9hcmRF dmVudDo6S2V5VXAsIG1vZGlmaWVycykpOwogCiAgICAgcmV0dXJuIEpTVmFsdWVNYWtlVW5kZWZp bmVkKGNvbnRleHQpOwogfQpAQCAtMzk0LDggKzM5OCw4IEBAIHN0YXRpYyBKU0NsYXNzUmVmIGdl dENsYXNzKEpTQ29udGV4dFJlZiBjb250ZXh0KQogCiAgICAgaWYgKCFldmVudFNlbmRlckNsYXNz KSB7CiAgICAgICAgIEpTQ2xhc3NEZWZpbml0aW9uIGNsYXNzRGVmaW5pdGlvbiA9IHsKLSAgICAg ICAgICAgICAgICAwLCAwLCAwLCAwLCAwLCAwLAotICAgICAgICAgICAgICAgIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDB9OworICAgICAgICAgICAgMCwgMCwgMCwgMCwgMCwgMCwKKyAg ICAgICAgICAgIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDB9OwogICAgICAgICBjbGFz c0RlZmluaXRpb24uc3RhdGljRnVuY3Rpb25zID0gc3RhdGljRnVuY3Rpb25zOwogICAgICAgICBj bGFzc0RlZmluaXRpb24uc3RhdGljVmFsdWVzID0gc3RhdGljVmFsdWVzOwogCi0tIAoxLjcuNgoK