105308 2012-12-18 08:24:20 -0800 [BlackBerry] Reduce calls to IMF on return 2012-12-18 12:35:44 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 nima.ghanavatian nghanavatian mifenton rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 793674 0 nima.ghanavatian 2012-12-18 08:24:20 -0800 The extra calls of selection change and most importantly, end composition are sent incorrectly on return. This is causing our state to be reset every time we hit enter. 793684 1 179949 nghanavatian 2012-12-18 08:34:59 -0800 Created attachment 179949 Patch 793891 2 179992 nghanavatian 2012-12-18 11:46:47 -0800 Created attachment 179992 Patch 793941 3 179992 webkit.review.bot 2012-12-18 12:35:41 -0800 Comment on attachment 179992 Patch Clearing flags on attachment: 179992 Committed r138054: <http://trac.webkit.org/changeset/138054> 793942 4 webkit.review.bot 2012-12-18 12:35:44 -0800 All reviewed patches have been landed. Closing bug. 179949 2012-12-18 08:34:59 -0800 2012-12-18 11:46:45 -0800 Patch bug-105308-20121218112639.patch text/plain 5751 nghanavatian U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3OTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAxYmFlMmI2MjUxYThhMDcwYTJhMDYyNTVkYzk0NGQwZGZjODljNmRkLi4wMzBlYzVhOGVi MDFiNGM2N2RjM2I3NjZjYWIwZmFjMGI1ZDc1ZTA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMi0xMi0xNyAgTmltYSBHaGFuYXZhdGlhbiAgPG5n aGFuYXZhdGlhbkByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBSZWR1Y2UgY2FsbHMg dG8gSU1GIG9uIHJldHVybgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTA1MzA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUFIyMDc3NDMKKyAgICAgICAgVGhlIGV4dHJhIGNhbGxzIG9mIHNlbGVjdGlvbiBj aGFuZ2UgYW5kIG1vc3QgaW1wb3J0YW50bHksIGVuZCBjb21wb3NpdGlvbgorICAgICAgICBhcmUg c2VudCBpbmNvcnJlY3RseSBvbiByZXR1cm4uIFRoaXMgaXMgY2F1c2luZyBvdXIgc3RhdGUgdG8g YmUgcmVzZXQKKyAgICAgICAgZXZlcnkgdGltZSB3ZSBoaXQgZW50ZXIuCisKKyAgICAgICAgSW50 ZXJuYWxseSByZXZpZXdlZCBieSBNaWtlIEZlbnRvbi4KKworICAgICAgICAqIFdlYktpdFN1cHBv cnQvSW5wdXRIYW5kbGVyLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5wdXRI YW5kbGVyOjpJbnB1dEhhbmRsZXIpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJbnB1 dEhhbmRsZXI6Om5vZGVUZXh0Q2hhbmdlZCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6 OklucHV0SGFuZGxlcjo6c2VsZWN0aW9uQ2hhbmdlZCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpX ZWJLaXQ6OklucHV0SGFuZGxlcjo6aGFuZGxlS2V5Ym9hcmRJbnB1dCk6CisgICAgICAgIChCbGFj a0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6c2hvdWxkTm90aWZ5V2ViVmlldyk6CisgICAg ICAgIChXZWJLaXQpOgorICAgICAgICAqIFdlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmg6Cisg ICAgICAgIChJbnB1dEhhbmRsZXIpOgorCiAyMDEyLTEyLTE3ICBKYWtvYiBQZXRzb3ZpdHMgIDxq cGV0c292aXRzQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIENsZWFuIHVwIGxvZyBv dXRwdXQgaW4gV2ViS2l0L2JsYWNrYmVycnkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcAppbmRleCA4MmMyNTYwYWY4 MGJhNWY1MzczMGMzZDEyOTBjNDcwOTUyMjdkODE0Li5iYThmNzkyMDQyMGUxZjc4ZTQzYjk5M2Ew YThjOTZhOTQ4ZTRjNGYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2Vi S2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHAKQEAgLTEzOSw3ICsxMzksNyBAQCBJbnB1 dEhhbmRsZXI6OklucHV0SGFuZGxlcihXZWJQYWdlUHJpdmF0ZSogcGFnZSkKICAgICAsIG1fZGVs YXlLZXlib2FyZFZpc2liaWxpdHlDaGFuZ2UoZmFsc2UpCiAgICAgLCBtX3JlcXVlc3QoMCkKICAg ICAsIG1fcHJvY2Vzc2luZ1RyYW5zYWN0aW9uSWQoLTEpCi0gICAgLCBtX3JlY2VpdmVkQmFja3Nw YWNlS2V5RG93bihmYWxzZSkKKyAgICAsIG1fc2hvdWxkTm90aWZ5V2ViVmlldyh0cnVlKQogICAg ICwgbV9leHBlY3RlZEtleVVwQ2hhcigwKQogICAgICwgbV9kaWRTcGVsbENoZWNrV29yZChmYWxz ZSkKIHsKQEAgLTExMjAsNyArMTEyMCw3IEBAIHZvaWQgSW5wdXRIYW5kbGVyOjpzZXRJbnB1dFZh bHVlKGNvbnN0IFdURjo6U3RyaW5nJiB2YWx1ZSkKIAogdm9pZCBJbnB1dEhhbmRsZXI6Om5vZGVU ZXh0Q2hhbmdlZChjb25zdCBOb2RlKiBub2RlKQogewotICAgIGlmIChwcm9jZXNzaW5nQ2hhbmdl KCkgfHwgIW5vZGUgfHwgbm9kZSAhPSBtX2N1cnJlbnRGb2N1c0VsZW1lbnQgfHwgbV9yZWNlaXZl ZEJhY2tzcGFjZUtleURvd24pCisgICAgaWYgKHByb2Nlc3NpbmdDaGFuZ2UoKSB8fCAhbm9kZSB8 fCBub2RlICE9IG1fY3VycmVudEZvY3VzRWxlbWVudCB8fCAhbV9zaG91bGROb3RpZnlXZWJWaWV3 KQogICAgICAgICByZXR1cm47CiAKICAgICBJbnB1dExvZyhQbGF0Zm9ybTo6TG9nTGV2ZWxJbmZv LCAiSW5wdXRIYW5kbGVyOjpub2RlVGV4dENoYW5nZWQiKTsKQEAgLTE0OTksNyArMTQ5OSw3IEBA IHZvaWQgSW5wdXRIYW5kbGVyOjpzZWxlY3Rpb25DaGFuZ2VkKCkKIAogICAgIEFTU0VSVChtX2N1 cnJlbnRGb2N1c0VsZW1lbnQtPmRvY3VtZW50KCkgJiYgbV9jdXJyZW50Rm9jdXNFbGVtZW50LT5k b2N1bWVudCgpLT5mcmFtZSgpKTsKIAotICAgIGlmIChtX3JlY2VpdmVkQmFja3NwYWNlS2V5RG93 bikKKyAgICBpZiAoIW1fc2hvdWxkTm90aWZ5V2ViVmlldykKICAgICAgICAgcmV0dXJuOwogCiAg ICAgaW50IG5ld1NlbGVjdGlvblN0YXJ0ID0gc2VsZWN0aW9uU3RhcnQoKTsKQEAgLTE1NzYsOCAr MTU3Niw4IEBAIGJvb2wgSW5wdXRIYW5kbGVyOjpoYW5kbGVLZXlib2FyZElucHV0KGNvbnN0IFBs YXRmb3JtOjpLZXlib2FyZEV2ZW50JiBrZXlib2FyZEV2CiAgICAgICAgICJJbnB1dEhhbmRsZXI6 OmhhbmRsZUtleWJvYXJkSW5wdXQgcmVjZWl2ZWQgY2hhcmFjdGVyPSclYycsIHR5cGU9JWQiLAog ICAgICAgICBrZXlib2FyZEV2ZW50LmNoYXJhY3RlcigpLCBrZXlib2FyZEV2ZW50LnR5cGUoKSk7 CiAKLSAgICAvLyBDbGVhcmluZyB0aGUgbV9yZWNlaXZlZEJhY2tzcGFjZUtleURvd24gc3RhdGUg b24gYW55IEtleWJvYXJkRXZlbnQuCi0gICAgbV9yZWNlaXZlZEJhY2tzcGFjZUtleURvd24gPSBm YWxzZTsKKyAgICAvLyBDbGVhcmluZyB0aGUgbV9zaG91bGROb3RpZnlXZWJWaWV3IHN0YXRlIG9u IGFueSBLZXlib2FyZEV2ZW50LgorICAgIG1fc2hvdWxkTm90aWZ5V2ViVmlldyA9IHRydWU7CiAK ICAgICAvLyBFbmFibGUgaW5wdXQgbW9kZSBpZiB3ZSBhcmUgcHJvY2Vzc2luZyBhIGtleSBldmVu dC4KICAgICBzZXRJbnB1dE1vZGVFbmFibGVkKCk7CkBAIC0xNjE5LDE1ICsxNjE5LDEzIEBAIGJv b2wgSW5wdXRIYW5kbGVyOjpoYW5kbGVLZXlib2FyZElucHV0KGNvbnN0IFBsYXRmb3JtOjpLZXli b2FyZEV2ZW50JiBrZXlib2FyZEV2CiAgICAgICAgIGVsc2UgaWYgKHR5cGUgPT0gUGxhdGZvcm06 OktleWJvYXJkRXZlbnQ6OktleURvd24pIHsKICAgICAgICAgICAgIG1fZXhwZWN0ZWRLZXlVcENo YXIgPSBrZXlib2FyZEV2ZW50LmNoYXJhY3RlcigpOwogCi0gICAgICAgICAgICAvLyBJZiB3ZSBy ZWNlaXZlIHRoZSBLZXlEb3duIG9mIGEgQmFja3NwYWNlLCBzZXQgdGhpcyBmbGFnIHRvIHByZXZl bnQgc2VuZGluZyB1bm5lY2Vzc2FyeSBzZWxlY3Rpb24gYW5kIGNhcmV0IGNoYW5nZXMgdG8gSU1G LgotICAgICAgICAgICAgaWYgKGtleWJvYXJkRXZlbnQuY2hhcmFjdGVyKCkgPT0gS0VZQ09ERV9C QUNLU1BBQ0UpCi0gICAgICAgICAgICAgICAgbV9yZWNlaXZlZEJhY2tzcGFjZUtleURvd24gPSB0 cnVlOworICAgICAgICAgICAgbV9zaG91bGROb3RpZnlXZWJWaWV3ID0gc2hvdWxkTm90aWZ5V2Vi VmlldyhrZXlib2FyZEV2ZW50KTsKICAgICAgICAgfQogCiAgICAgICAgIFBsYXRmb3JtOjpLZXli b2FyZEV2ZW50IGFkanVzdGVkS2V5Ym9hcmRFdmVudChrZXlib2FyZEV2ZW50LmNoYXJhY3Rlcigp LCB0eXBlLCBhZGp1c3RlZE1vZGlmaWVycyk7CiAgICAgICAgIGtleWJvYXJkRXZlbnRIYW5kbGVk ID0gZm9jdXNlZEZyYW1lLT5ldmVudEhhbmRsZXIoKS0+a2V5RXZlbnQoUGxhdGZvcm1LZXlib2Fy ZEV2ZW50KGFkanVzdGVkS2V5Ym9hcmRFdmVudCkpOwogCi0gICAgICAgIG1fcmVjZWl2ZWRCYWNr c3BhY2VLZXlEb3duID0gZmFsc2U7CisgICAgICAgIG1fc2hvdWxkTm90aWZ5V2ViVmlldyA9IHRy dWU7CiAKICAgICAgICAgaWYgKGlzS2V5Q2hhcikgewogICAgICAgICAgICAgdHlwZSA9IFBsYXRm b3JtOjpLZXlib2FyZEV2ZW50OjpLZXlVcDsKQEAgLTE2NDEsNiArMTYzOSwxMiBAQCBib29sIElu cHV0SGFuZGxlcjo6aGFuZGxlS2V5Ym9hcmRJbnB1dChjb25zdCBQbGF0Zm9ybTo6S2V5Ym9hcmRF dmVudCYga2V5Ym9hcmRFdgogICAgIHJldHVybiBrZXlib2FyZEV2ZW50SGFuZGxlZDsKIH0KIAor Ym9vbCBJbnB1dEhhbmRsZXI6OnNob3VsZE5vdGlmeVdlYlZpZXcoY29uc3QgUGxhdGZvcm06Oktl eWJvYXJkRXZlbnQmIGtleWJvYXJkRXZlbnQpCit7CisgICAgLy8gSWYgd2UgcmVjZWl2ZSB0aGUg S2V5RG93biBvZiBhIEJhY2tzcGFjZSBvciBFbnRlciBrZXksIHNldCB0aGlzIGZsYWcgdG8gcHJl dmVudCBzZW5kaW5nIHVubmVjZXNzYXJ5IHNlbGVjdGlvbiBhbmQgY2FyZXQgY2hhbmdlcyB0byBJ TUYuCisgICAgcmV0dXJuICEoa2V5Ym9hcmRFdmVudC5jaGFyYWN0ZXIoKSA9PSBLRVlDT0RFX0JB Q0tTUEFDRSB8fCBrZXlib2FyZEV2ZW50LmNoYXJhY3RlcigpID09IEtFWUNPREVfUkVUVVJOKTsK K30KKwogYm9vbCBJbnB1dEhhbmRsZXI6OmRlbGV0ZVNlbGVjdGlvbigpCiB7CiAgICAgaWYgKCFp c0FjdGl2ZVRleHRFZGl0KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv V2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9X ZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5oCmluZGV4IDBkZGVlY2ZiM2UwNzMxZGI0OTk3YzA1 MDY2ZDI5YjExNjBhODAzNjkuLmM1MjgwMTBmMTU0MGQ3YzQxZWE5NmFkMzUxZDUwMjI3N2M2MzUz MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lu cHV0SGFuZGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0 L0lucHV0SGFuZGxlci5oCkBAIC0yMDksNiArMjA5LDggQEAgcHJpdmF0ZToKICAgICBib29sIHNo b3VsZFNwZWxsQ2hlY2tFbGVtZW50KGNvbnN0IFdlYkNvcmU6OkVsZW1lbnQqKSBjb25zdDsKICAg ICBib29sIGRpZFNwZWxsQ2hlY2tXb3JkKCkgY29uc3QgeyByZXR1cm4gbV9kaWRTcGVsbENoZWNr V29yZDsgfQogCisgICAgYm9vbCBzaG91bGROb3RpZnlXZWJWaWV3KGNvbnN0IFBsYXRmb3JtOjpL ZXlib2FyZEV2ZW50Jik7CisKICAgICBXZWJQYWdlUHJpdmF0ZSogbV93ZWJQYWdlOwogCiAgICAg UmVmUHRyPFdlYkNvcmU6OkVsZW1lbnQ+IG1fY3VycmVudEZvY3VzRWxlbWVudDsKQEAgLTIyOSw3 ICsyMzEsNyBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxXZWJDb3JlOjpUZXh0Q2hlY2tpbmdSZXF1 ZXN0PiBtX3JlcXVlc3Q7CiAgICAgaW50MzJfdCBtX3Byb2Nlc3NpbmdUcmFuc2FjdGlvbklkOwog Ci0gICAgYm9vbCBtX3JlY2VpdmVkQmFja3NwYWNlS2V5RG93bjsKKyAgICBib29sIG1fc2hvdWxk Tm90aWZ5V2ViVmlldzsKICAgICB1bnNpZ25lZCBzaG9ydCBtX2V4cGVjdGVkS2V5VXBDaGFyOwog CiAgICAgaW1mX3NwX3RleHRfdCBtX3NwZWxsQ2hlY2tpbmdPcHRpb25zUmVxdWVzdDsK 179992 2012-12-18 11:46:47 -0800 2012-12-18 12:35:40 -0800 Patch bug-105308-20121218143827.patch text/plain 5824 nghanavatian U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4MDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA4NTdmYWM5NTQyN2RiZDEwMjYwY2Y4YmY3ZTRhMDdjYTQ1N2JiNTYxLi45NWVhMTQ1MDM3 OGJkZmRiYjM1NjZmMmNjZTc2MWM0ZWJiZWI0NzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMi0xMi0xNyAgTmltYSBHaGFuYXZhdGlhbiAgPG5n aGFuYXZhdGlhbkByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBSZWR1Y2UgY2FsbHMg dG8gSU1GIG9uIHJldHVybgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTA1MzA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUFIyMDc3NDMKKyAgICAgICAgVGhlIGV4dHJhIGNhbGxzIG9mIHNlbGVjdGlvbiBj aGFuZ2UgYW5kIG1vc3QgaW1wb3J0YW50bHksIGVuZCBjb21wb3NpdGlvbgorICAgICAgICBhcmUg c2VudCBpbmNvcnJlY3RseSBvbiByZXR1cm4uIFRoaXMgaXMgY2F1c2luZyBvdXIgc3RhdGUgdG8g YmUgcmVzZXQKKyAgICAgICAgZXZlcnkgdGltZSB3ZSBoaXQgZW50ZXIuCisKKyAgICAgICAgSW50 ZXJuYWxseSByZXZpZXdlZCBieSBNaWtlIEZlbnRvbiBhbmQgR2VuIE1hay4KKworICAgICAgICAq IFdlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6Oldl YktpdDo6SW5wdXRIYW5kbGVyOjpJbnB1dEhhbmRsZXIpOgorICAgICAgICAoQmxhY2tCZXJyeTo6 V2ViS2l0OjpJbnB1dEhhbmRsZXI6Om5vZGVUZXh0Q2hhbmdlZCk6CisgICAgICAgIChCbGFja0Jl cnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6c2VsZWN0aW9uQ2hhbmdlZCk6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6aGFuZGxlS2V5Ym9hcmRJbnB1dCk6Cisg ICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6c2hvdWxkTm90aWZ5V2Vi Vmlldyk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAqIFdlYktpdFN1cHBvcnQvSW5wdXRI YW5kbGVyLmg6CisgICAgICAgIChJbnB1dEhhbmRsZXIpOgorCiAyMDEyLTEyLTE4ICBKYWtvYiBQ ZXRzb3ZpdHMgIDxqcGV0c292aXRzQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIFJl bW92ZSB0aGUgdmlzaWJsZSB0aWxlIGJ1ZmZlciBmcm9tIHRoZSBCYWNraW5nU3RvcmUuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRs ZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5k bGVyLmNwcAppbmRleCA4MmMyNTYwYWY4MGJhNWY1MzczMGMzZDEyOTBjNDcwOTUyMjdkODE0Li4x YmFlMzk3N2E1Y2E2YmQzNzU3NDIyY2UyZDViM2Y4MDVlY2NhOTYxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHAK QEAgLTEzOSw3ICsxMzksNyBAQCBJbnB1dEhhbmRsZXI6OklucHV0SGFuZGxlcihXZWJQYWdlUHJp dmF0ZSogcGFnZSkKICAgICAsIG1fZGVsYXlLZXlib2FyZFZpc2liaWxpdHlDaGFuZ2UoZmFsc2Up CiAgICAgLCBtX3JlcXVlc3QoMCkKICAgICAsIG1fcHJvY2Vzc2luZ1RyYW5zYWN0aW9uSWQoLTEp Ci0gICAgLCBtX3JlY2VpdmVkQmFja3NwYWNlS2V5RG93bihmYWxzZSkKKyAgICAsIG1fc2hvdWxk Tm90aWZ5V2ViVmlldyh0cnVlKQogICAgICwgbV9leHBlY3RlZEtleVVwQ2hhcigwKQogICAgICwg bV9kaWRTcGVsbENoZWNrV29yZChmYWxzZSkKIHsKQEAgLTExMjAsNyArMTEyMCw3IEBAIHZvaWQg SW5wdXRIYW5kbGVyOjpzZXRJbnB1dFZhbHVlKGNvbnN0IFdURjo6U3RyaW5nJiB2YWx1ZSkKIAog dm9pZCBJbnB1dEhhbmRsZXI6Om5vZGVUZXh0Q2hhbmdlZChjb25zdCBOb2RlKiBub2RlKQogewot ICAgIGlmIChwcm9jZXNzaW5nQ2hhbmdlKCkgfHwgIW5vZGUgfHwgbm9kZSAhPSBtX2N1cnJlbnRG b2N1c0VsZW1lbnQgfHwgbV9yZWNlaXZlZEJhY2tzcGFjZUtleURvd24pCisgICAgaWYgKHByb2Nl c3NpbmdDaGFuZ2UoKSB8fCAhbm9kZSB8fCBub2RlICE9IG1fY3VycmVudEZvY3VzRWxlbWVudCB8 fCAhbV9zaG91bGROb3RpZnlXZWJWaWV3KQogICAgICAgICByZXR1cm47CiAKICAgICBJbnB1dExv ZyhQbGF0Zm9ybTo6TG9nTGV2ZWxJbmZvLCAiSW5wdXRIYW5kbGVyOjpub2RlVGV4dENoYW5nZWQi KTsKQEAgLTE0OTksNyArMTQ5OSw3IEBAIHZvaWQgSW5wdXRIYW5kbGVyOjpzZWxlY3Rpb25DaGFu Z2VkKCkKIAogICAgIEFTU0VSVChtX2N1cnJlbnRGb2N1c0VsZW1lbnQtPmRvY3VtZW50KCkgJiYg bV9jdXJyZW50Rm9jdXNFbGVtZW50LT5kb2N1bWVudCgpLT5mcmFtZSgpKTsKIAotICAgIGlmICht X3JlY2VpdmVkQmFja3NwYWNlS2V5RG93bikKKyAgICBpZiAoIW1fc2hvdWxkTm90aWZ5V2ViVmll dykKICAgICAgICAgcmV0dXJuOwogCiAgICAgaW50IG5ld1NlbGVjdGlvblN0YXJ0ID0gc2VsZWN0 aW9uU3RhcnQoKTsKQEAgLTE1NzYsOCArMTU3Niw4IEBAIGJvb2wgSW5wdXRIYW5kbGVyOjpoYW5k bGVLZXlib2FyZElucHV0KGNvbnN0IFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50JiBrZXlib2FyZEV2 CiAgICAgICAgICJJbnB1dEhhbmRsZXI6OmhhbmRsZUtleWJvYXJkSW5wdXQgcmVjZWl2ZWQgY2hh cmFjdGVyPSclYycsIHR5cGU9JWQiLAogICAgICAgICBrZXlib2FyZEV2ZW50LmNoYXJhY3Rlcigp LCBrZXlib2FyZEV2ZW50LnR5cGUoKSk7CiAKLSAgICAvLyBDbGVhcmluZyB0aGUgbV9yZWNlaXZl ZEJhY2tzcGFjZUtleURvd24gc3RhdGUgb24gYW55IEtleWJvYXJkRXZlbnQuCi0gICAgbV9yZWNl aXZlZEJhY2tzcGFjZUtleURvd24gPSBmYWxzZTsKKyAgICAvLyBDbGVhcmluZyB0aGUgbV9zaG91 bGROb3RpZnlXZWJWaWV3IHN0YXRlIG9uIGFueSBLZXlib2FyZEV2ZW50LgorICAgIG1fc2hvdWxk Tm90aWZ5V2ViVmlldyA9IHRydWU7CiAKICAgICAvLyBFbmFibGUgaW5wdXQgbW9kZSBpZiB3ZSBh cmUgcHJvY2Vzc2luZyBhIGtleSBldmVudC4KICAgICBzZXRJbnB1dE1vZGVFbmFibGVkKCk7CkBA IC0xNjE5LDE1ICsxNjE5LDEzIEBAIGJvb2wgSW5wdXRIYW5kbGVyOjpoYW5kbGVLZXlib2FyZElu cHV0KGNvbnN0IFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50JiBrZXlib2FyZEV2CiAgICAgICAgIGVs c2UgaWYgKHR5cGUgPT0gUGxhdGZvcm06OktleWJvYXJkRXZlbnQ6OktleURvd24pIHsKICAgICAg ICAgICAgIG1fZXhwZWN0ZWRLZXlVcENoYXIgPSBrZXlib2FyZEV2ZW50LmNoYXJhY3RlcigpOwog Ci0gICAgICAgICAgICAvLyBJZiB3ZSByZWNlaXZlIHRoZSBLZXlEb3duIG9mIGEgQmFja3NwYWNl LCBzZXQgdGhpcyBmbGFnIHRvIHByZXZlbnQgc2VuZGluZyB1bm5lY2Vzc2FyeSBzZWxlY3Rpb24g YW5kIGNhcmV0IGNoYW5nZXMgdG8gSU1GLgotICAgICAgICAgICAgaWYgKGtleWJvYXJkRXZlbnQu Y2hhcmFjdGVyKCkgPT0gS0VZQ09ERV9CQUNLU1BBQ0UpCi0gICAgICAgICAgICAgICAgbV9yZWNl aXZlZEJhY2tzcGFjZUtleURvd24gPSB0cnVlOworICAgICAgICAgICAgbV9zaG91bGROb3RpZnlX ZWJWaWV3ID0gc2hvdWxkTm90aWZ5V2ViVmlldyhrZXlib2FyZEV2ZW50KTsKICAgICAgICAgfQog CiAgICAgICAgIFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50IGFkanVzdGVkS2V5Ym9hcmRFdmVudChr ZXlib2FyZEV2ZW50LmNoYXJhY3RlcigpLCB0eXBlLCBhZGp1c3RlZE1vZGlmaWVycyk7CiAgICAg ICAgIGtleWJvYXJkRXZlbnRIYW5kbGVkID0gZm9jdXNlZEZyYW1lLT5ldmVudEhhbmRsZXIoKS0+ a2V5RXZlbnQoUGxhdGZvcm1LZXlib2FyZEV2ZW50KGFkanVzdGVkS2V5Ym9hcmRFdmVudCkpOwog Ci0gICAgICAgIG1fcmVjZWl2ZWRCYWNrc3BhY2VLZXlEb3duID0gZmFsc2U7CisgICAgICAgIG1f c2hvdWxkTm90aWZ5V2ViVmlldyA9IHRydWU7CiAKICAgICAgICAgaWYgKGlzS2V5Q2hhcikgewog ICAgICAgICAgICAgdHlwZSA9IFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50OjpLZXlVcDsKQEAgLTE2 NDEsNiArMTYzOSwxMiBAQCBib29sIElucHV0SGFuZGxlcjo6aGFuZGxlS2V5Ym9hcmRJbnB1dChj b25zdCBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudCYga2V5Ym9hcmRFdgogICAgIHJldHVybiBrZXli b2FyZEV2ZW50SGFuZGxlZDsKIH0KIAorYm9vbCBJbnB1dEhhbmRsZXI6OnNob3VsZE5vdGlmeVdl YlZpZXcoY29uc3QgUGxhdGZvcm06OktleWJvYXJkRXZlbnQmIGtleWJvYXJkRXZlbnQpCit7Cisg ICAgLy8gSWYgd2UgcmVjZWl2ZSB0aGUgS2V5RG93biBvZiBhIEJhY2tzcGFjZSBvciBFbnRlciBr ZXksIHNldCB0aGlzIGZsYWcgdG8gcHJldmVudCBzZW5kaW5nIHVubmVjZXNzYXJ5IHNlbGVjdGlv biBhbmQgY2FyZXQgY2hhbmdlcyB0byBJTUYuCisgICAgcmV0dXJuICEoa2V5Ym9hcmRFdmVudC5j aGFyYWN0ZXIoKSA9PSBLRVlDT0RFX0JBQ0tTUEFDRSB8fCBrZXlib2FyZEV2ZW50LmNoYXJhY3Rl cigpID09IEtFWUNPREVfUkVUVVJOIHx8IGtleWJvYXJkRXZlbnQuY2hhcmFjdGVyKCkgPT0gS0VZ Q09ERV9LUF9FTlRFUik7Cit9CisKIGJvb2wgSW5wdXRIYW5kbGVyOjpkZWxldGVTZWxlY3Rpb24o KQogewogICAgIGlmICghaXNBY3RpdmVUZXh0RWRpdCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmggYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaAppbmRleCAwZGRlZWNm YjNlMDczMWRiNDk5N2MwNTA2NmQyOWIxMTYwYTgwMzY5Li5jNTI4MDEwZjE1NDBkN2M0MWVhOTZh ZDM1MWQ1MDIyNzdjNjM1MzIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv V2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuaApAQCAtMjA5LDYgKzIwOSw4IEBAIHByaXZh dGU6CiAgICAgYm9vbCBzaG91bGRTcGVsbENoZWNrRWxlbWVudChjb25zdCBXZWJDb3JlOjpFbGVt ZW50KikgY29uc3Q7CiAgICAgYm9vbCBkaWRTcGVsbENoZWNrV29yZCgpIGNvbnN0IHsgcmV0dXJu IG1fZGlkU3BlbGxDaGVja1dvcmQ7IH0KIAorICAgIGJvb2wgc2hvdWxkTm90aWZ5V2ViVmlldyhj b25zdCBQbGF0Zm9ybTo6S2V5Ym9hcmRFdmVudCYpOworCiAgICAgV2ViUGFnZVByaXZhdGUqIG1f d2ViUGFnZTsKIAogICAgIFJlZlB0cjxXZWJDb3JlOjpFbGVtZW50PiBtX2N1cnJlbnRGb2N1c0Vs ZW1lbnQ7CkBAIC0yMjksNyArMjMxLDcgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8V2ViQ29yZTo6 VGV4dENoZWNraW5nUmVxdWVzdD4gbV9yZXF1ZXN0OwogICAgIGludDMyX3QgbV9wcm9jZXNzaW5n VHJhbnNhY3Rpb25JZDsKIAotICAgIGJvb2wgbV9yZWNlaXZlZEJhY2tzcGFjZUtleURvd247Cisg ICAgYm9vbCBtX3Nob3VsZE5vdGlmeVdlYlZpZXc7CiAgICAgdW5zaWduZWQgc2hvcnQgbV9leHBl Y3RlZEtleVVwQ2hhcjsKIAogICAgIGltZl9zcF90ZXh0X3QgbV9zcGVsbENoZWNraW5nT3B0aW9u c1JlcXVlc3Q7Cg==