9695 2006-07-02 08:33:39 -0700 REGRESSION: NativeTextArea: Text areas do not respond to arrow key combinations 2006-07-18 02:18:57 -0700 1 1 1 Unclassified WebKit HTML Editing 420+ Mac OS X 10.4 RESOLVED FIXED InRadar P1 Normal --- 1 ggaren andersca adele oldest_to_newest 48018 0 ggaren 2006-07-02 08:33:39 -0700 1. Type a few lines into a text area. 2. Hit Cmd-UpArrow. (The cursor should move to the top of the text area.) ---> Notice that you have scrolled the page instead of moving the cursor Same thing for Cmd-DownArrow 48364 1 alice.barraclough 2006-07-05 13:49:04 -0700 <rdar://problem/4614085> 48365 2 ggaren 2006-07-05 13:49:49 -0700 Same goes for home and end, and Ctrl-LeftArrow/RightArrow and Option-LeftArrow/RightArrow, which correspond to move by word and move by word ignoring capitals, respectively. 50185 3 9528 andersca 2006-07-17 11:49:35 -0700 Created attachment 9528 Patch I managed to trace this to the commit in r14172. 50188 4 9528 darin 2006-07-17 12:04:24 -0700 Comment on attachment 9528 Patch r=me 50245 5 andersca 2006-07-18 02:18:57 -0700 Committed revision 15499. 9528 2006-07-17 11:49:35 -0700 2006-07-17 12:04:24 -0700 Patch editable-begin-end.txt text/plain 9267 andersca SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE1NDg2KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDYtMDctMTcgIEFuZGVycyBDYXJsc3NvbiAg PGFjYXJsc3NvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNn aT9pZD05Njk1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NjE0MDg1PiAKKyAgICAgICAgVE9U IFJFR1JFU1NJT046IE5hdGl2ZVRleHRBcmVhOiBUZXh0IGFyZWEgZG9lcyBub3QgcmVzcG9uZCB0 byBDbWQtVXBBcnJvdy9DbWQtRG93bkFycm93ICg5Njk1KQorICAgICAgICAKKyAgICAgICAgKiBl ZGl0aW5nL3NlbGVjdGlvbi9tb3ZlLWJlZ2luLWVuZC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg ICAgICAqIGVkaXRpbmcvc2VsZWN0aW9uL21vdmUtYmVnaW4tZW5kLmh0bWw6IEFkZGVkLgorCiAy MDA2LTA3LTE3ICBNYWNpZWogU3RhY2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgQmV0aC4KSW5kZXg6IExheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL21v dmUtYmVnaW4tZW5kLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9lZGl0 aW5nL3NlbGVjdGlvbi9tb3ZlLWJlZ2luLWVuZC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisr KyBMYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9tb3ZlLWJlZ2luLWVuZC1leHBlY3RlZC50 eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMTYgQEAKK0VESVRJTkcgREVMRUdBVEU6IHdlYlZp ZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlv bgorRURJVElORyBERUxFR0FURTogc2hvdWxkQ2hhbmdlU2VsZWN0ZWRET01SYW5nZTpyYW5nZSBm cm9tIDkgb2YgI3RleHQgPiBESVYgdG8gOSBvZiAjdGV4dCA+IERJViB0b0RPTVJhbmdlOnJhbmdl IGZyb20gOCBvZiAjdGV4dCA+IERJViB0byA4IG9mICN0ZXh0ID4gRElWIGFmZmluaXR5Ok5TU2Vs ZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0aWxsU2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERF TEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rp b25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZENoYW5nZVNlbGVjdGVkRE9N UmFuZ2U6cmFuZ2UgZnJvbSA4IG9mICN0ZXh0ID4gRElWIHRvIDggb2YgI3RleHQgPiBESVYgdG9E T01SYW5nZTpyYW5nZSBmcm9tIDkgb2YgI3RleHQgPiBESVYgdG8gOSBvZiAjdGV4dCA+IERJViBh ZmZpbml0eTpOU1NlbGVjdGlvbkFmZmluaXR5RG93bnN0cmVhbSBzdGlsbFNlbGVjdGluZzpGQUxT RQorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlk Q2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRDaGFu Z2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gOSBvZiAjdGV4dCA+IERJViB0byA5IG9mICN0 ZXh0ID4gRElWIHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mICN0ZXh0ID4gRElWIHRvIDAgb2Yg I3RleHQgPiBESVYgYWZmaW5pdHk6TlNTZWxlY3Rpb25BZmZpbml0eURvd25zdHJlYW0gc3RpbGxT ZWxlY3Rpbmc6RkFMU0UKK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rp b246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgorRURJVElORyBERUxFR0FU RTogc2hvdWxkQ2hhbmdlU2VsZWN0ZWRET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgI3RleHQgPiBE SVYgdG8gMCBvZiAjdGV4dCA+IERJViB0b0RPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiAjdGV4dCA+ IERJViB0byA5IG9mICN0ZXh0ID4gRElWIGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3du c3RyZWFtIHN0aWxsU2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlk Q2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VE SVRJTkcgREVMRUdBVEU6IHNob3VsZENoYW5nZVNlbGVjdGVkRE9NUmFuZ2U6cmFuZ2UgZnJvbSAw IG9mICN0ZXh0ID4gRElWIHRvIDkgb2YgI3RleHQgPiBESVYgdG9ET01SYW5nZTpyYW5nZSBmcm9t IDkgb2YgI3RleHQgPiBESVYgdG8gOSBvZiAjdGV4dCA+IERJViBhZmZpbml0eTpOU1NlbGVjdGlv bkFmZmluaXR5RG93bnN0cmVhbSBzdGlsbFNlbGVjdGluZzpGQUxTRQorRURJVElORyBERUxFR0FU RTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90 aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRDaGFuZ2VTZWxlY3RlZERPTVJhbmdl OnJhbmdlIGZyb20gOSBvZiAjdGV4dCA+IERJViB0byA5IG9mICN0ZXh0ID4gRElWIHRvRE9NUmFu Z2U6cmFuZ2UgZnJvbSAwIG9mICN0ZXh0ID4gRElWIHRvIDkgb2YgI3RleHQgPiBESVYgYWZmaW5p dHk6TlNTZWxlY3Rpb25BZmZpbml0eURvd25zdHJlYW0gc3RpbGxTZWxlY3Rpbmc6RkFMU0UKK0VE SVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5n ZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgorVGhpcyB0ZXN0cyB0aGF0IG1vdmluZyB0aGUgY2FyZXQg YW5kIHNlbGVjdGluZyB1c2luZyBDb21tYW5kK0xlZnQvUmlnaHQgYXJyb3dzIHdvcmsgY29ycmVj dGx5LiBJZiB0aGlzIHRleHQgaXMgc3VjY2Vzc2Z1bCwgdGhlIHRleHQgIlNVQ0NFU1MiIHdpbGwg YmUgc2hvd24gYmVsb3cuCitTVUNDRVNTCisKSW5kZXg6IExheW91dFRlc3RzL2VkaXRpbmcvc2Vs ZWN0aW9uL21vdmUtYmVnaW4tZW5kLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZWRp dGluZy9zZWxlY3Rpb24vbW92ZS1iZWdpbi1lbmQuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91 dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL21vdmUtYmVnaW4tZW5kLmh0bWwJKHJldmlzaW9uIDAp CkBAIC0wLDAgKzEsNTggQEAKKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8c2NyaXB0Pgor ICAgICAgICAgICAgZnVuY3Rpb24gcnVuVGVzdCgpIHsKKyAgICAgICAgICAgICAgICBpZiAod2lu ZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgICAgICAgICAgICAgICAgICBsYXlvdXRUZXN0 Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgICAgICAgICAgICAgZWxzZSB7CisgICAgICAg ICAgICAgICAgICAgIGFsZXJ0KCdUaGlzIHRlc3QgbXVzdCBiZSBydW4gYnkgRHVtcFJlbmRlclRy ZWUhJykgCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICB9Cisg ICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICAgdmFyIGFyZWEgPSBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgnYXJlYScpOworICAgICAgICAgICAgICAgIGFyZWEuZm9jdXMoKTsKKyAgICAg ICAgICAgICAgICAKKyAgICAgICAgICAgICAgICB2YXIgc2VsID0gd2luZG93LmdldFNlbGVjdGlv bigpOworICAgICAgICAgICAgICAgIC8vIFBvc2l0aW9uIHRoZSBjYXJldCBhdCB0aGUgYmVnaW5u aW5nIG9mIHRoZSBzdHJpbmcuCisgICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIua2V5RG93bihT dHJpbmcuZnJvbUNoYXJDb2RlKDB4ZjcwMikpOworCisgICAgICAgICAgICAgICAgLy8gTm93IG1v dmUgdG8gdGhlIGVuZAorICAgICAgICAgICAgICAgIGV2ZW50U2VuZGVyLmtleURvd24oU3RyaW5n LmZyb21DaGFyQ29kZSgweGY3MDMpLCBbIm1ldGFLZXkiXSk7CisKKyAgICAgICAgICAgICAgICBp ZiAoc2VsLmJhc2VPZmZzZXQgIT0gOSB8fCBzZWwuZXh0ZW50T2Zmc2V0ICE9IDkpCisgICAgICAg ICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICAv LyBOb3cgbW92ZSBiYWNrIHRvIHRoZSBiZWdpbm5pbmcKKyAgICAgICAgICAgICAgICBldmVudFNl bmRlci5rZXlEb3duKFN0cmluZy5mcm9tQ2hhckNvZGUoMHhmNzAyKSwgWyJtZXRhS2V5Il0pOwor CisgICAgICAgICAgICAgICAgaWYgKHNlbC5iYXNlT2Zmc2V0ICE9IDAgfHwgc2VsLmV4dGVudE9m ZnNldCAhPSAwKQorICAgICAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgICAg ICAvLyBOb3cgbW92ZSB0byB0aGUgZW5kLCBzZWxlY3RpbmcKKyAgICAgICAgICAgICAgICBldmVu dFNlbmRlci5rZXlEb3duKFN0cmluZy5mcm9tQ2hhckNvZGUoMHhmNzAzKSwgWyJtZXRhS2V5Iiwg InNoaWZ0S2V5Il0pOworCisgICAgICAgICAgICAgICAgaWYgKHNlbC5iYXNlT2Zmc2V0ICE9IDAg fHwgc2VsLmV4dGVudE9mZnNldCAhPSA5KQorICAgICAgICAgICAgICAgICAgICByZXR1cm47CisK KyAgICAgICAgICAgICAgICAvLyBEZXNlbGVjdCBidXQgcG9zaXRpb24gdGhlIGNhcmV0IGF0IHRo ZSBlbmQgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIua2V5RG93 bihTdHJpbmcuZnJvbUNoYXJDb2RlKDB4ZjcwMykpOworICAgICAgICAgICAgICAgIAorICAgICAg ICAgICAgICAgIGlmIChzZWwuYmFzZU9mZnNldCAhPSA5IHx8IHNlbC5leHRlbnRPZmZzZXQgIT0g OSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIAorICAgICAg ICAgICAgICAgIC8vIE5vdyBtb3ZlIHRvIHRoZSBiZWdpbm5pbmcsIHNlbGVjdGluZworICAgICAg ICAgICAgICAgIGV2ZW50U2VuZGVyLmtleURvd24oU3RyaW5nLmZyb21DaGFyQ29kZSgweGY3MDIp LCBbIm1ldGFLZXkiLCAic2hpZnRLZXkiXSk7CisgICAgICAgICAgICAgICAgCisgICAgICAgICAg ICAgICAgaWYgKHNlbC5iYXNlT2Zmc2V0ICE9IDkgfHwgc2VsLmV4dGVudE9mZnNldCAhPSAwKQor ICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgCisgICAgICAgICAg ICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Jlc3VsdCcpLmlubmVySFRNTCA9ICdTVUND RVNTJworICAgICAgICAgICAgfQorICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisgICAg PGJvZHkgb25sb2FkPSJydW5UZXN0KCk7Ij4KKyAgICAgICAgPHRleHRhcmVhIGlkPSJhcmVhIj5T b21lIHRleHQ8L3RleHRhcmVhPgorICAgICAgICA8ZGl2PlRoaXMgdGVzdHMgdGhhdCBtb3Zpbmcg dGhlIGNhcmV0IGFuZCBzZWxlY3RpbmcgdXNpbmcgQ29tbWFuZCtMZWZ0L1JpZ2h0IGFycm93cyB3 b3JrIGNvcnJlY3RseS4gSWYgdGhpcyB0ZXh0IGlzIHN1Y2Nlc3NmdWwsIHRoZSB0ZXh0ICJTVUND RVNTIiB3aWxsIGJlIHNob3duIGJlbG93LjwvZGl2PgorICAgICAgICA8ZGl2IGlkPSJyZXN1bHQi PkZBSUxVUkU8L2Rpdj4KKyAgICA8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBXZWJDb3JlL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU0ODYpCisr KyBXZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDA2 LTA3LTE3ICBBbmRlcnMgQ2FybHNzb24gIDxhY2FybHNzb25AYXBwbGUuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHA6Ly9idWd6aWxsYS5v cGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTY5NQorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNDYxNDA4NT4gCisgICAgICAgIFRPVCBSRUdSRVNTSU9OOiBOYXRpdmVUZXh0QXJlYTogVGV4 dCBhcmVhIGRvZXMgbm90IHJlc3BvbmQgdG8gQ21kLVVwQXJyb3cvQ21kLURvd25BcnJvdyAoOTY5 NSkKKyAgICAgICAgCisgICAgICAgICogZWRpdGluZy9TZWxlY3Rpb25Db250cm9sbGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdGlvbkNvbnRyb2xsZXI6Om1vZGlmeUV4dGVuZGluZ1Jp Z2h0Rm9yd2FyZCk6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rpb25Db250cm9sbGVyOjptb2Rp ZnlNb3ZpbmdSaWdodEZvcndhcmQpOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0aW9uQ29udHJv bGxlcjo6bW9kaWZ5RXh0ZW5kaW5nTGVmdEJhY2t3YXJkKToKKyAgICAgICAgKFdlYkNvcmU6OlNl bGVjdGlvbkNvbnRyb2xsZXI6Om1vZGlmeU1vdmluZ0xlZnRCYWNrd2FyZCk6CisgICAgICAgIElm IHRoZSBjYXJldCBpcyBpbnNpZGUgYW4gZWRpdGFibGUgcmVnaW9uLCB0aGUgYmVnaW5uaW5nL2Vu ZCBvZiB0aGUgZG9jdW1lbnQgc2hvdWxkIGFjdHVhbGx5IGJlIHRoZQorICAgICAgICBiZWdpbm5p bmcvZW5kIG9mIHRoZSBlZGl0YWJsZSByZWdpb24uCisKIDIwMDYtMDctMTcgIE1hY2llaiBTdGFj aG93aWFrICA8bWpzQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBCZXRoLgpJbmRl eDogV2ViQ29yZS9lZGl0aW5nL1NlbGVjdGlvbkNvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvZWRpdGluZy9TZWxlY3Rpb25Db250cm9sbGVyLmNwcAkocmV2aXNpb24gMTU0ODYp CisrKyBXZWJDb3JlL2VkaXRpbmcvU2VsZWN0aW9uQ29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTI4MSw3ICsyODEsMTEgQEAgVmlzaWJsZVBvc2l0aW9uIFNlbGVjdGlvbkNvbnRyb2xs ZXI6Om1vZAogICAgICAgICAgICAgcG9zID0gZW5kT2ZQYXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9u KG1fc2VsLmVuZCgpLCBtX3NlbC5hZmZpbml0eSgpKSk7CiAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgY2FzZSBEb2N1bWVudEJvdW5kYXJ5OgotICAgICAgICAgICAgcG9zID0gZW5kT2ZEb2N1 bWVudChwb3MpOworICAgICAgICAgICAgcG9zID0gVmlzaWJsZVBvc2l0aW9uKG1fc2VsLmVuZCgp LCBtX3NlbC5hZmZpbml0eSgpKTsKKyAgICAgICAgICAgIGlmIChwb3MuZGVlcEVxdWl2YWxlbnQo KS5ub2RlKCktPmlzQ29udGVudEVkaXRhYmxlKCkpCisgICAgICAgICAgICAgICAgcG9zID0gZW5k T2ZFZGl0YWJsZUNvbnRlbnQocG9zKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAg ICBwb3MgPSBlbmRPZkRvY3VtZW50KHBvcyk7CiAgICAgICAgICAgICBicmVhazsKICAgICB9CiAg ICAgCkBAIC0zMjYsOCArMzMwLDEzIEBAIFZpc2libGVQb3NpdGlvbiBTZWxlY3Rpb25Db250cm9s bGVyOjptb2QKICAgICAgICAgICAgIHBvcyA9IGVuZE9mUGFyYWdyYXBoKFZpc2libGVQb3NpdGlv bihtX3NlbC5lbmQoKSwgbV9zZWwuYWZmaW5pdHkoKSkpOwogICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIGNhc2UgRG9jdW1lbnRCb3VuZGFyeToKLSAgICAgICAgICAgIHBvcyA9IGVuZE9mRG9j dW1lbnQoVmlzaWJsZVBvc2l0aW9uKG1fc2VsLmVuZCgpLCBtX3NlbC5hZmZpbml0eSgpKSk7Cisg ICAgICAgICAgICBwb3MgPSBWaXNpYmxlUG9zaXRpb24obV9zZWwuZW5kKCksIG1fc2VsLmFmZmlu aXR5KCkpOworICAgICAgICAgICAgaWYgKHBvcy5kZWVwRXF1aXZhbGVudCgpLm5vZGUoKS0+aXND b250ZW50RWRpdGFibGUoKSkKKyAgICAgICAgICAgICAgICBwb3MgPSBlbmRPZkVkaXRhYmxlQ29u dGVudChwb3MpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHBvcyA9IGVuZE9m RG9jdW1lbnQocG9zKTsKICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgCiAgICAgfQog ICAgIHJldHVybiBwb3M7CiB9CkBAIC0zNzIsNyArMzgxLDExIEBAIFZpc2libGVQb3NpdGlvbiBT ZWxlY3Rpb25Db250cm9sbGVyOjptb2QKICAgICAgICAgICAgIHBvcyA9IHN0YXJ0T2ZQYXJhZ3Jh cGgoVmlzaWJsZVBvc2l0aW9uKG1fc2VsLnN0YXJ0KCksIG1fc2VsLmFmZmluaXR5KCkpKTsKICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIERvY3VtZW50Qm91bmRhcnk6Ci0gICAgICAg ICAgICBwb3MgPSBzdGFydE9mRG9jdW1lbnQocG9zKTsKKyAgICAgICAgICAgIHBvcyA9IFZpc2li bGVQb3NpdGlvbihtX3NlbC5zdGFydCgpLCBtX3NlbC5hZmZpbml0eSgpKTsKKyAgICAgICAgICAg IGlmIChwb3MuZGVlcEVxdWl2YWxlbnQoKS5ub2RlKCktPmlzQ29udGVudEVkaXRhYmxlKCkpCisg ICAgICAgICAgICAgICAgcG9zID0gc3RhcnRPZkVkaXRhYmxlQ29udGVudChwb3MpOworICAgICAg ICAgICAgZWxzZSAKKyAgICAgICAgICAgICAgICBwb3MgPSBzdGFydE9mRG9jdW1lbnQoVmlzaWJs ZVBvc2l0aW9uKG1fc2VsLnN0YXJ0KCksIG1fc2VsLmFmZmluaXR5KCkpKTsKICAgICAgICAgICAg IGJyZWFrOwogICAgIH0KICAgICByZXR1cm4gcG9zOwpAQCAtNDExLDcgKzQyNCwxMSBAQCBWaXNp YmxlUG9zaXRpb24gU2VsZWN0aW9uQ29udHJvbGxlcjo6bW9kCiAgICAgICAgICAgICBwb3MgPSBz dGFydE9mUGFyYWdyYXBoKFZpc2libGVQb3NpdGlvbihtX3NlbC5zdGFydCgpLCBtX3NlbC5hZmZp bml0eSgpKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBEb2N1bWVudEJvdW5k YXJ5OgotICAgICAgICAgICAgcG9zID0gc3RhcnRPZkRvY3VtZW50KFZpc2libGVQb3NpdGlvbiht X3NlbC5zdGFydCgpLCBtX3NlbC5hZmZpbml0eSgpKSk7CisgICAgICAgICAgICBwb3MgPSBWaXNp YmxlUG9zaXRpb24obV9zZWwuc3RhcnQoKSwgbV9zZWwuYWZmaW5pdHkoKSk7CisgICAgICAgICAg ICBpZiAocG9zLmRlZXBFcXVpdmFsZW50KCkubm9kZSgpLT5pc0NvbnRlbnRFZGl0YWJsZSgpKQor ICAgICAgICAgICAgICAgIHBvcyA9IHN0YXJ0T2ZFZGl0YWJsZUNvbnRlbnQocG9zKTsKKyAgICAg ICAgICAgIGVsc2UgCisgICAgICAgICAgICAgICAgcG9zID0gc3RhcnRPZkRvY3VtZW50KFZpc2li bGVQb3NpdGlvbihtX3NlbC5zdGFydCgpLCBtX3NlbC5hZmZpbml0eSgpKSk7CiAgICAgICAgICAg ICBicmVhazsKICAgICB9CiAgICAgcmV0dXJuIHBvczsK