29169 2009-09-10 22:21:58 -0700 [GTK] EventSender does not set 'window' property on synthesized GDK events 2009-09-13 03:25:31 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 mrobinson webkit-unassigned jmalonzo oldest_to_newest 146458 0 mrobinson 2009-09-10 22:21:58 -0700 I noticed another issue with EventSender events tonight (for some reason this did not manifest before). The synthesized GDK events do not set the 'window' property. Some event handling routines require this, in particular gtk_im_context_filter_keypress. 146459 1 39410 mrobinson 2009-09-10 22:25:27 -0700 Created attachment 39410 Patch for this issue I've attached a patch for this issue. 146476 2 39410 xan.lopez 2009-09-11 00:38:16 -0700 Comment on attachment 39410 Patch for this issue Even though in this case it will be the same thing, I think it's more straightforward to use the widget's window instead of the parent's window, right? 146570 3 39435 mrobinson 2009-09-11 08:27:01 -0700 Created attachment 39435 Patch for this issue (rev2) Very much so. What a silly mistake. :) I've attached a new patch. 146821 4 39435 jmalonzo 2009-09-11 17:08:10 -0700 Comment on attachment 39435 Patch for this issue (rev2) r=me. 146986 5 jmalonzo 2009-09-13 03:25:31 -0700 (In reply to comment #4) > (From update of attachment 39435 [details]) > r=me. Landed as http://trac.webkit.org/changeset/48342. 39410 2009-09-10 22:25:27 -0700 2009-09-11 08:27:01 -0700 Patch for this issue 0001-Set-window-property-on-synthesized-GDK-events.patch text/plain 6286 mrobinson RnJvbSBiYTg5YzU0NGExYWNiN2JiMTk2ZTk5NjRiZGMzMjNjODExY2U3NWY1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJ0aW4gUm9iaW5zb24gPG1hcnRpbi5qYW1lcy5yb2JpbnNv bkBnbWFpbC5jb20+CkRhdGU6IFRodSwgMTAgU2VwIDIwMDkgMjI6MjI6MjIgLTA3MDAKU3ViamVj dDogW1BBVENIXSBTZXQgd2luZG93IHByb3BlcnR5IG9uIHN5bnRoZXNpemVkIEdESyBldmVudHMu CgotLS0KIFdlYktpdFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgfCAg IDE2ICsrKysrKysrKysKIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9FdmVudFNlbmRl ci5jcHAgfCAgIDM4ICsrKysrKysrKysrKysrLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAz OCBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5kZXggZmU5OWU1Ni4uMmU4Nzlm MCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdFRvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDA5LTA5LTEwICBNYXJ0aW4gUm9iaW5zb24gIDxt YXJ0aW4uamFtZXMucm9iaW5zb25AZ21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEV2ZW50U2VuZGVyIGRvZXMgbm90IHNldCAn d2luZG93JyBwcm9wZXJ0eSBvbiBzeW50aGVzaXplZCBHREsgZXZlbnRzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTE2OQorCisgICAgICAgIFNldCB3 aW5kb3cgcHJvcGVydHkgb24gc3ludGhlc2l6ZWQgR0RLIGV2ZW50cyBmb3IgR1RLKyBFdmVudFNl bmRlci4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2d0ay9FdmVudFNlbmRlci5jcHA6Cisg ICAgICAgIChjb250ZXh0Q2xpY2tDYWxsYmFjayk6CisgICAgICAgIChtb3VzZURvd25DYWxsYmFj ayk6CisgICAgICAgIChtb3VzZVVwQ2FsbGJhY2spOgorICAgICAgICAobW91c2VNb3ZlVG9DYWxs YmFjayk6CisgICAgICAgIChrZXlEb3duQ2FsbGJhY2spOgorCiAyMDA5LTA5LTEwICBGdW1pdG9z aGkgVWthaSAgPHVrYWlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFsZXhl eSBQcm9za3VyeWFrb3YuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9n dGsvRXZlbnRTZW5kZXIuY3BwIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0V2ZW50 U2VuZGVyLmNwcAppbmRleCAzNTQzNmVjLi41M2ExNjAzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9ndGsvRXZlbnRTZW5kZXIuY3BwCisrKyBiL1dlYktpdFRvb2xzL0R1 bXBSZW5kZXJUcmVlL2d0ay9FdmVudFNlbmRlci5jcHAKQEAgLTk2LDE1ICs5NiwxNiBAQCBzdGF0 aWMgSlNWYWx1ZVJlZiBjb250ZXh0Q2xpY2tDYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwg SlNPYmplY3RSZWYgZnVuY3RpbwogewogICAgIHdlYmtpdF93ZWJfZnJhbWVfbGF5b3V0KG1haW5G cmFtZSk7CiAKKyAgICBXZWJLaXRXZWJWaWV3KiB2aWV3ID0gd2Via2l0X3dlYl9mcmFtZV9nZXRf d2ViX3ZpZXcobWFpbkZyYW1lKTsKKyAgICBpZiAoIXZpZXcpCisgICAgICAgIHJldHVybiBKU1Zh bHVlTWFrZVVuZGVmaW5lZChjb250ZXh0KTsKKwogICAgIEdka0V2ZW50IGV2ZW50OwogICAgIG1l bXNldCgmZXZlbnQsIDAsIHNpemVvZihldmVudCkpOwogICAgIGV2ZW50LmJ1dHRvbi5idXR0b24g PSAzOwogICAgIGV2ZW50LmJ1dHRvbi54ID0gbGFzdE1vdXNlUG9zaXRpb25YOwogICAgIGV2ZW50 LmJ1dHRvbi55ID0gbGFzdE1vdXNlUG9zaXRpb25ZOwotCi0gICAgV2ViS2l0V2ViVmlldyogdmll dyA9IHdlYmtpdF93ZWJfZnJhbWVfZ2V0X3dlYl92aWV3KG1haW5GcmFtZSk7Ci0gICAgaWYgKCF2 aWV3KQotICAgICAgICByZXR1cm4gSlNWYWx1ZU1ha2VVbmRlZmluZWQoY29udGV4dCk7CisgICAg ZXZlbnQuYnV0dG9uLndpbmRvdyA9IGd0a193aWRnZXRfZ2V0X3BhcmVudF93aW5kb3coR1RLX1dJ REdFVCh2aWV3KSk7CiAKICAgICBnYm9vbGVhbiByZXR1cm5fdmFsOwogICAgIGRvd24gPSB0cnVl OwpAQCAtMTI5LDYgKzEzMCwxMCBAQCBzdGF0aWMgdm9pZCB1cGRhdGVDbGlja0NvdW50KGludCAv KiBidXR0b24gKi8pCiAKIHN0YXRpYyBKU1ZhbHVlUmVmIG1vdXNlRG93bkNhbGxiYWNrKEpTQ29u dGV4dFJlZiBjb250ZXh0LCBKU09iamVjdFJlZiBmdW5jdGlvbiwgSlNPYmplY3RSZWYgdGhpc09i amVjdCwgc2l6ZV90IGFyZ3VtZW50Q291bnQsIGNvbnN0IEpTVmFsdWVSZWYgYXJndW1lbnRzW10s IEpTVmFsdWVSZWYqIGV4Y2VwdGlvbikKIHsKKyAgICBXZWJLaXRXZWJWaWV3KiB2aWV3ID0gd2Vi a2l0X3dlYl9mcmFtZV9nZXRfd2ViX3ZpZXcobWFpbkZyYW1lKTsKKyAgICBpZiAoIXZpZXcpCisg ICAgICAgIHJldHVybiBKU1ZhbHVlTWFrZVVuZGVmaW5lZChjb250ZXh0KTsKKwogICAgIGRvd24g PSB0cnVlOwogCiAgICAgR2RrRXZlbnQgZXZlbnQ7CkBAIC0xMzcsMTYgKzE0MiwxMyBAQCBzdGF0 aWMgSlNWYWx1ZVJlZiBtb3VzZURvd25DYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwgSlNP YmplY3RSZWYgZnVuY3Rpb24sCiAgICAgZXZlbnQuYnV0dG9uLmJ1dHRvbiA9IDE7CiAgICAgZXZl bnQuYnV0dG9uLnggPSBsYXN0TW91c2VQb3NpdGlvblg7CiAgICAgZXZlbnQuYnV0dG9uLnkgPSBs YXN0TW91c2VQb3NpdGlvblk7CisgICAgZXZlbnQuYnV0dG9uLndpbmRvdyA9IGd0a193aWRnZXRf Z2V0X3BhcmVudF93aW5kb3coR1RLX1dJREdFVCh2aWV3KSk7CiAKICAgICB1cGRhdGVDbGlja0Nv dW50KDEpOwogCiAgICAgaWYgKCFtc2dRdWV1ZVtlbmRPZlF1ZXVlXS5kZWxheSkgewogICAgICAg ICB3ZWJraXRfd2ViX2ZyYW1lX2xheW91dChtYWluRnJhbWUpOwogCi0gICAgICAgIFdlYktpdFdl YlZpZXcqIHZpZXcgPSB3ZWJraXRfd2ViX2ZyYW1lX2dldF93ZWJfdmlldyhtYWluRnJhbWUpOwot ICAgICAgICBpZiAoIXZpZXcpCi0gICAgICAgICAgICByZXR1cm4gSlNWYWx1ZU1ha2VVbmRlZmlu ZWQoY29udGV4dCk7Ci0KICAgICAgICAgZ2Jvb2xlYW4gcmV0dXJuX3ZhbDsKICAgICAgICAgZ19z aWduYWxfZW1pdF9ieV9uYW1lKHZpZXcsICJidXR0b25fcHJlc3NfZXZlbnQiLCAmZXZlbnQsICZy ZXR1cm5fdmFsKTsKICAgICAgICAgaWYgKGNsaWNrQ291bnQgPT0gMikgewpAQCAtMTY0LDYgKzE2 NiwxMSBAQCBzdGF0aWMgSlNWYWx1ZVJlZiBtb3VzZURvd25DYWxsYmFjayhKU0NvbnRleHRSZWYg Y29udGV4dCwgSlNPYmplY3RSZWYgZnVuY3Rpb24sCiAKIHN0YXRpYyBKU1ZhbHVlUmVmIG1vdXNl VXBDYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwgSlNPYmplY3RSZWYgZnVuY3Rpb24sIEpT T2JqZWN0UmVmIHRoaXNPYmplY3QsIHNpemVfdCBhcmd1bWVudENvdW50LCBjb25zdCBKU1ZhbHVl UmVmIGFyZ3VtZW50c1tdLCBKU1ZhbHVlUmVmKiBleGNlcHRpb24pCiB7CisKKyAgICBXZWJLaXRX ZWJWaWV3KiB2aWV3ID0gd2Via2l0X3dlYl9mcmFtZV9nZXRfd2ViX3ZpZXcobWFpbkZyYW1lKTsK KyAgICBpZiAoIXZpZXcpCisgICAgICAgIHJldHVybiBKU1ZhbHVlTWFrZVVuZGVmaW5lZChjb250 ZXh0KTsKKwogICAgIGRvd24gPSBmYWxzZTsKIAogICAgIEdka0V2ZW50IGV2ZW50OwpAQCAtMTcy LDYgKzE3OSw3IEBAIHN0YXRpYyBKU1ZhbHVlUmVmIG1vdXNlVXBDYWxsYmFjayhKU0NvbnRleHRS ZWYgY29udGV4dCwgSlNPYmplY3RSZWYgZnVuY3Rpb24sIEpTCiAgICAgZXZlbnQuYnV0dG9uLmJ1 dHRvbiA9IDE7CiAgICAgZXZlbnQuYnV0dG9uLnggPSBsYXN0TW91c2VQb3NpdGlvblg7CiAgICAg ZXZlbnQuYnV0dG9uLnkgPSBsYXN0TW91c2VQb3NpdGlvblk7CisgICAgZXZlbnQuYnV0dG9uLndp bmRvdyA9IGd0a193aWRnZXRfZ2V0X3BhcmVudF93aW5kb3coR1RLX1dJREdFVCh2aWV3KSk7CiAK ICAgICBpZiAoKGRyYWdNb2RlICYmICFyZXBsYXlpbmdTYXZlZEV2ZW50cykgfHwgbXNnUXVldWVb ZW5kT2ZRdWV1ZV0uZGVsYXkpIHsKICAgICAgICAgbXNnUXVldWVbZW5kT2ZRdWV1ZV0uZXZlbnQg PSBldmVudDsKQEAgLTE4MCwxMCArMTg4LDYgQEAgc3RhdGljIEpTVmFsdWVSZWYgbW91c2VVcENh bGxiYWNrKEpTQ29udGV4dFJlZiBjb250ZXh0LCBKU09iamVjdFJlZiBmdW5jdGlvbiwgSlMKICAg ICB9IGVsc2UgewogICAgICAgICB3ZWJraXRfd2ViX2ZyYW1lX2xheW91dChtYWluRnJhbWUpOwog Ci0gICAgICAgIFdlYktpdFdlYlZpZXcqIHZpZXcgPSB3ZWJraXRfd2ViX2ZyYW1lX2dldF93ZWJf dmlldyhtYWluRnJhbWUpOwotICAgICAgICBpZiAoIXZpZXcpCi0gICAgICAgICAgICByZXR1cm4g SlNWYWx1ZU1ha2VVbmRlZmluZWQoY29udGV4dCk7Ci0KICAgICAgICAgZ2Jvb2xlYW4gcmV0dXJu X3ZhbDsKICAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKHZpZXcsICJidXR0b25fcmVsZWFz ZV9ldmVudCIsICZldmVudCwgJnJldHVybl92YWwpOwogICAgIH0KQEAgLTE5Niw2ICsyMDAsMTAg QEAgc3RhdGljIEpTVmFsdWVSZWYgbW91c2VVcENhbGxiYWNrKEpTQ29udGV4dFJlZiBjb250ZXh0 LCBKU09iamVjdFJlZiBmdW5jdGlvbiwgSlMKIAogc3RhdGljIEpTVmFsdWVSZWYgbW91c2VNb3Zl VG9DYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwgSlNPYmplY3RSZWYgZnVuY3Rpb24sIEpT T2JqZWN0UmVmIHRoaXNPYmplY3QsIHNpemVfdCBhcmd1bWVudENvdW50LCBjb25zdCBKU1ZhbHVl UmVmIGFyZ3VtZW50c1tdLCBKU1ZhbHVlUmVmKiBleGNlcHRpb24pCiB7CisgICAgV2ViS2l0V2Vi VmlldyogdmlldyA9IHdlYmtpdF93ZWJfZnJhbWVfZ2V0X3dlYl92aWV3KG1haW5GcmFtZSk7Cisg ICAgaWYgKCF2aWV3KQorICAgICAgICByZXR1cm4gSlNWYWx1ZU1ha2VVbmRlZmluZWQoY29udGV4 dCk7CisKICAgICBpZiAoYXJndW1lbnRDb3VudCA8IDIpCiAgICAgICAgIHJldHVybiBKU1ZhbHVl TWFrZVVuZGVmaW5lZChjb250ZXh0KTsKIApAQCAtMjA5LDYgKzIxNyw3IEBAIHN0YXRpYyBKU1Zh bHVlUmVmIG1vdXNlTW92ZVRvQ2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0 UmVmIGZ1bmN0aW9uCiAgICAgZXZlbnQubW90aW9uLnggPSBsYXN0TW91c2VQb3NpdGlvblg7CiAg ICAgZXZlbnQubW90aW9uLnkgPSBsYXN0TW91c2VQb3NpdGlvblk7CiAgICAgZXZlbnQubW90aW9u LnRpbWUgPSBHREtfQ1VSUkVOVF9USU1FOworICAgIGV2ZW50Lm1vdGlvbi53aW5kb3cgPSBndGtf d2lkZ2V0X2dldF9wYXJlbnRfd2luZG93KEdUS19XSURHRVQodmlldykpOwogCiAgICAgaWYgKGRy YWdNb2RlICYmIGRvd24gJiYgIXJlcGxheWluZ1NhdmVkRXZlbnRzKSB7CiAgICAgICAgIG1zZ1F1 ZXVlW2VuZE9mUXVldWVdLmV2ZW50ID0gZXZlbnQ7CkBAIC0yMTYsMTAgKzIyNSw2IEBAIHN0YXRp YyBKU1ZhbHVlUmVmIG1vdXNlTW92ZVRvQ2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpT T2JqZWN0UmVmIGZ1bmN0aW9uCiAgICAgfSBlbHNlIHsKICAgICAgICAgd2Via2l0X3dlYl9mcmFt ZV9sYXlvdXQobWFpbkZyYW1lKTsKIAotICAgICAgICBXZWJLaXRXZWJWaWV3KiB2aWV3ID0gd2Vi a2l0X3dlYl9mcmFtZV9nZXRfd2ViX3ZpZXcobWFpbkZyYW1lKTsKLSAgICAgICAgaWYgKCF2aWV3 KQotICAgICAgICAgICAgcmV0dXJuIEpTVmFsdWVNYWtlVW5kZWZpbmVkKGNvbnRleHQpOwotCiAg ICAgICAgIGdib29sZWFuIHJldHVybl92YWw7CiAgICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFt ZSh2aWV3LCAibW90aW9uX25vdGlmeV9ldmVudCIsICZldmVudCwgJnJldHVybl92YWwpOwogICAg IH0KQEAgLTM4MSw2ICszODYsNyBAQCBzdGF0aWMgSlNWYWx1ZVJlZiBrZXlEb3duQ2FsbGJhY2so SlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0UmVmIGZ1bmN0aW9uLCBKUwogICAgIG1lbXNl dCgmZXZlbnQsIDAsIHNpemVvZihldmVudCkpOwogICAgIGV2ZW50LmtleS5rZXl2YWwgPSBnZGtL ZXlTeW07CiAgICAgZXZlbnQua2V5LnN0YXRlID0gc3RhdGU7CisgICAgZXZlbnQua2V5LndpbmRv dyA9IGd0a193aWRnZXRfZ2V0X3BhcmVudF93aW5kb3coR1RLX1dJREdFVCh2aWV3KSk7CiAKICAg ICBnYm9vbGVhbiByZXR1cm5fdmFsOwogICAgIGV2ZW50LmtleS50eXBlID0gR0RLX0tFWV9QUkVT UzsKLS0gCjEuNi4wLjQKCg== 39435 2009-09-11 08:27:01 -0700 2009-09-11 17:08:09 -0700 Patch for this issue (rev2) 0001-Set-the-window-property-on-synthesized-GDK-events-in.patch text/plain 6318 mrobinson RnJvbSBhYWNhYjFhNjM1OGRlOTk1MTY2NDMwOTBlMWU5M2U3ZTkyYmFiMmVkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJ0aW4gUm9iaW5zb24gPG1hcnRpbi5qYW1lcy5yb2JpbnNv bkBnbWFpbC5jb20+CkRhdGU6IEZyaSwgMTEgU2VwIDIwMDkgMDg6MjI6NDkgLTA3MDAKU3ViamVj dDogW1BBVENIXSBTZXQgdGhlIHdpbmRvdyBwcm9wZXJ0eSBvbiBzeW50aGVzaXplZCBHREsgZXZl bnRzIGluIHRoZSBHVEsrIEV2ZW50U2VuZGVyLgoKLS0tCiBXZWJLaXRUb29scy9DaGFuZ2VMb2cg ICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNiArKysrKysrKysrCiBXZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9ndGsvRXZlbnRTZW5kZXIuY3BwIHwgICAzOCArKysrKysrKysrKysrKy0t LS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzggaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hh bmdlTG9nCmluZGV4IDFhZTY0ZjUuLmY0ZDUxNzQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0No YW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAw OS0wOS0xMSAgTWFydGluIFJvYmluc29uICA8bWFydGluLmphbWVzLnJvYmluc29uQGdtYWlsLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RL XSBFdmVudFNlbmRlciBkb2VzIG5vdCBzZXQgJ3dpbmRvdycgcHJvcGVydHkgb24gc3ludGhlc2l6 ZWQgR0RLIGV2ZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjkxNjkKKworICAgICAgICBTZXQgdGhlIHdpbmRvdyBwcm9wZXJ0eSBvbiBzeW50aGVz aXplZCBHREsgZXZlbnRzIGluIHRoZSBHVEsrIEV2ZW50U2VuZGVyLgorCisgICAgICAgICogRHVt cFJlbmRlclRyZWUvZ3RrL0V2ZW50U2VuZGVyLmNwcDoKKyAgICAgICAgKGNvbnRleHRDbGlja0Nh bGxiYWNrKToKKyAgICAgICAgKG1vdXNlRG93bkNhbGxiYWNrKToKKyAgICAgICAgKG1vdXNlVXBD YWxsYmFjayk6CisgICAgICAgIChtb3VzZU1vdmVUb0NhbGxiYWNrKToKKyAgICAgICAgKGtleURv d25DYWxsYmFjayk6CisKIDIwMDktMDktMTAgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxl LmNvbT4KIAogICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi8yOTE0Nz4gcnVuLXdlYmtpdC10 ZXN0czogIG1ha2UgLWggc2hvdyBoZWxwIApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJl bmRlclRyZWUvZ3RrL0V2ZW50U2VuZGVyLmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVl L2d0ay9FdmVudFNlbmRlci5jcHAKaW5kZXggMzU0MzZlYy4uM2MzZmJiYSAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0V2ZW50U2VuZGVyLmNwcAorKysgYi9XZWJL aXRUb29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRXZlbnRTZW5kZXIuY3BwCkBAIC05NiwxNSArOTYs MTYgQEAgc3RhdGljIEpTVmFsdWVSZWYgY29udGV4dENsaWNrQ2FsbGJhY2soSlNDb250ZXh0UmVm IGNvbnRleHQsIEpTT2JqZWN0UmVmIGZ1bmN0aW8KIHsKICAgICB3ZWJraXRfd2ViX2ZyYW1lX2xh eW91dChtYWluRnJhbWUpOwogCisgICAgV2ViS2l0V2ViVmlldyogdmlldyA9IHdlYmtpdF93ZWJf ZnJhbWVfZ2V0X3dlYl92aWV3KG1haW5GcmFtZSk7CisgICAgaWYgKCF2aWV3KQorICAgICAgICBy ZXR1cm4gSlNWYWx1ZU1ha2VVbmRlZmluZWQoY29udGV4dCk7CisKICAgICBHZGtFdmVudCBldmVu dDsKICAgICBtZW1zZXQoJmV2ZW50LCAwLCBzaXplb2YoZXZlbnQpKTsKICAgICBldmVudC5idXR0 b24uYnV0dG9uID0gMzsKICAgICBldmVudC5idXR0b24ueCA9IGxhc3RNb3VzZVBvc2l0aW9uWDsK ICAgICBldmVudC5idXR0b24ueSA9IGxhc3RNb3VzZVBvc2l0aW9uWTsKLQotICAgIFdlYktpdFdl YlZpZXcqIHZpZXcgPSB3ZWJraXRfd2ViX2ZyYW1lX2dldF93ZWJfdmlldyhtYWluRnJhbWUpOwot ICAgIGlmICghdmlldykKLSAgICAgICAgcmV0dXJuIEpTVmFsdWVNYWtlVW5kZWZpbmVkKGNvbnRl eHQpOworICAgIGV2ZW50LmJ1dHRvbi53aW5kb3cgPSBndGtfd2lkZ2V0X2dldF93aW5kb3coR1RL X1dJREdFVCh2aWV3KSk7CiAKICAgICBnYm9vbGVhbiByZXR1cm5fdmFsOwogICAgIGRvd24gPSB0 cnVlOwpAQCAtMTI5LDYgKzEzMCwxMCBAQCBzdGF0aWMgdm9pZCB1cGRhdGVDbGlja0NvdW50KGlu dCAvKiBidXR0b24gKi8pCiAKIHN0YXRpYyBKU1ZhbHVlUmVmIG1vdXNlRG93bkNhbGxiYWNrKEpT Q29udGV4dFJlZiBjb250ZXh0LCBKU09iamVjdFJlZiBmdW5jdGlvbiwgSlNPYmplY3RSZWYgdGhp c09iamVjdCwgc2l6ZV90IGFyZ3VtZW50Q291bnQsIGNvbnN0IEpTVmFsdWVSZWYgYXJndW1lbnRz W10sIEpTVmFsdWVSZWYqIGV4Y2VwdGlvbikKIHsKKyAgICBXZWJLaXRXZWJWaWV3KiB2aWV3ID0g d2Via2l0X3dlYl9mcmFtZV9nZXRfd2ViX3ZpZXcobWFpbkZyYW1lKTsKKyAgICBpZiAoIXZpZXcp CisgICAgICAgIHJldHVybiBKU1ZhbHVlTWFrZVVuZGVmaW5lZChjb250ZXh0KTsKKwogICAgIGRv d24gPSB0cnVlOwogCiAgICAgR2RrRXZlbnQgZXZlbnQ7CkBAIC0xMzcsMTYgKzE0MiwxMyBAQCBz dGF0aWMgSlNWYWx1ZVJlZiBtb3VzZURvd25DYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwg SlNPYmplY3RSZWYgZnVuY3Rpb24sCiAgICAgZXZlbnQuYnV0dG9uLmJ1dHRvbiA9IDE7CiAgICAg ZXZlbnQuYnV0dG9uLnggPSBsYXN0TW91c2VQb3NpdGlvblg7CiAgICAgZXZlbnQuYnV0dG9uLnkg PSBsYXN0TW91c2VQb3NpdGlvblk7CisgICAgZXZlbnQuYnV0dG9uLndpbmRvdyA9IGd0a193aWRn ZXRfZ2V0X3dpbmRvdyhHVEtfV0lER0VUKHZpZXcpKTsKIAogICAgIHVwZGF0ZUNsaWNrQ291bnQo MSk7CiAKICAgICBpZiAoIW1zZ1F1ZXVlW2VuZE9mUXVldWVdLmRlbGF5KSB7CiAgICAgICAgIHdl YmtpdF93ZWJfZnJhbWVfbGF5b3V0KG1haW5GcmFtZSk7CiAKLSAgICAgICAgV2ViS2l0V2ViVmll dyogdmlldyA9IHdlYmtpdF93ZWJfZnJhbWVfZ2V0X3dlYl92aWV3KG1haW5GcmFtZSk7Ci0gICAg ICAgIGlmICghdmlldykKLSAgICAgICAgICAgIHJldHVybiBKU1ZhbHVlTWFrZVVuZGVmaW5lZChj b250ZXh0KTsKLQogICAgICAgICBnYm9vbGVhbiByZXR1cm5fdmFsOwogICAgICAgICBnX3NpZ25h bF9lbWl0X2J5X25hbWUodmlldywgImJ1dHRvbl9wcmVzc19ldmVudCIsICZldmVudCwgJnJldHVy bl92YWwpOwogICAgICAgICBpZiAoY2xpY2tDb3VudCA9PSAyKSB7CkBAIC0xNjQsNiArMTY2LDEx IEBAIHN0YXRpYyBKU1ZhbHVlUmVmIG1vdXNlRG93bkNhbGxiYWNrKEpTQ29udGV4dFJlZiBjb250 ZXh0LCBKU09iamVjdFJlZiBmdW5jdGlvbiwKIAogc3RhdGljIEpTVmFsdWVSZWYgbW91c2VVcENh bGxiYWNrKEpTQ29udGV4dFJlZiBjb250ZXh0LCBKU09iamVjdFJlZiBmdW5jdGlvbiwgSlNPYmpl Y3RSZWYgdGhpc09iamVjdCwgc2l6ZV90IGFyZ3VtZW50Q291bnQsIGNvbnN0IEpTVmFsdWVSZWYg YXJndW1lbnRzW10sIEpTVmFsdWVSZWYqIGV4Y2VwdGlvbikKIHsKKworICAgIFdlYktpdFdlYlZp ZXcqIHZpZXcgPSB3ZWJraXRfd2ViX2ZyYW1lX2dldF93ZWJfdmlldyhtYWluRnJhbWUpOworICAg IGlmICghdmlldykKKyAgICAgICAgcmV0dXJuIEpTVmFsdWVNYWtlVW5kZWZpbmVkKGNvbnRleHQp OworCiAgICAgZG93biA9IGZhbHNlOwogCiAgICAgR2RrRXZlbnQgZXZlbnQ7CkBAIC0xNzIsNiAr MTc5LDcgQEAgc3RhdGljIEpTVmFsdWVSZWYgbW91c2VVcENhbGxiYWNrKEpTQ29udGV4dFJlZiBj b250ZXh0LCBKU09iamVjdFJlZiBmdW5jdGlvbiwgSlMKICAgICBldmVudC5idXR0b24uYnV0dG9u ID0gMTsKICAgICBldmVudC5idXR0b24ueCA9IGxhc3RNb3VzZVBvc2l0aW9uWDsKICAgICBldmVu dC5idXR0b24ueSA9IGxhc3RNb3VzZVBvc2l0aW9uWTsKKyAgICBldmVudC5idXR0b24ud2luZG93 ID0gZ3RrX3dpZGdldF9nZXRfd2luZG93KEdUS19XSURHRVQodmlldykpOwogCiAgICAgaWYgKChk cmFnTW9kZSAmJiAhcmVwbGF5aW5nU2F2ZWRFdmVudHMpIHx8IG1zZ1F1ZXVlW2VuZE9mUXVldWVd LmRlbGF5KSB7CiAgICAgICAgIG1zZ1F1ZXVlW2VuZE9mUXVldWVdLmV2ZW50ID0gZXZlbnQ7CkBA IC0xODAsMTAgKzE4OCw2IEBAIHN0YXRpYyBKU1ZhbHVlUmVmIG1vdXNlVXBDYWxsYmFjayhKU0Nv bnRleHRSZWYgY29udGV4dCwgSlNPYmplY3RSZWYgZnVuY3Rpb24sIEpTCiAgICAgfSBlbHNlIHsK ICAgICAgICAgd2Via2l0X3dlYl9mcmFtZV9sYXlvdXQobWFpbkZyYW1lKTsKIAotICAgICAgICBX ZWJLaXRXZWJWaWV3KiB2aWV3ID0gd2Via2l0X3dlYl9mcmFtZV9nZXRfd2ViX3ZpZXcobWFpbkZy YW1lKTsKLSAgICAgICAgaWYgKCF2aWV3KQotICAgICAgICAgICAgcmV0dXJuIEpTVmFsdWVNYWtl VW5kZWZpbmVkKGNvbnRleHQpOwotCiAgICAgICAgIGdib29sZWFuIHJldHVybl92YWw7CiAgICAg ICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZSh2aWV3LCAiYnV0dG9uX3JlbGVhc2VfZXZlbnQiLCAm ZXZlbnQsICZyZXR1cm5fdmFsKTsKICAgICB9CkBAIC0xOTYsNiArMjAwLDEwIEBAIHN0YXRpYyBK U1ZhbHVlUmVmIG1vdXNlVXBDYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwgSlNPYmplY3RS ZWYgZnVuY3Rpb24sIEpTCiAKIHN0YXRpYyBKU1ZhbHVlUmVmIG1vdXNlTW92ZVRvQ2FsbGJhY2so SlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0UmVmIGZ1bmN0aW9uLCBKU09iamVjdFJlZiB0 aGlzT2JqZWN0LCBzaXplX3QgYXJndW1lbnRDb3VudCwgY29uc3QgSlNWYWx1ZVJlZiBhcmd1bWVu dHNbXSwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKQogeworICAgIFdlYktpdFdlYlZpZXcqIHZpZXcg PSB3ZWJraXRfd2ViX2ZyYW1lX2dldF93ZWJfdmlldyhtYWluRnJhbWUpOworICAgIGlmICghdmll dykKKyAgICAgICAgcmV0dXJuIEpTVmFsdWVNYWtlVW5kZWZpbmVkKGNvbnRleHQpOworCiAgICAg aWYgKGFyZ3VtZW50Q291bnQgPCAyKQogICAgICAgICByZXR1cm4gSlNWYWx1ZU1ha2VVbmRlZmlu ZWQoY29udGV4dCk7CiAKQEAgLTIwOSw2ICsyMTcsNyBAQCBzdGF0aWMgSlNWYWx1ZVJlZiBtb3Vz ZU1vdmVUb0NhbGxiYWNrKEpTQ29udGV4dFJlZiBjb250ZXh0LCBKU09iamVjdFJlZiBmdW5jdGlv bgogICAgIGV2ZW50Lm1vdGlvbi54ID0gbGFzdE1vdXNlUG9zaXRpb25YOwogICAgIGV2ZW50Lm1v dGlvbi55ID0gbGFzdE1vdXNlUG9zaXRpb25ZOwogICAgIGV2ZW50Lm1vdGlvbi50aW1lID0gR0RL X0NVUlJFTlRfVElNRTsKKyAgICBldmVudC5tb3Rpb24ud2luZG93ID0gZ3RrX3dpZGdldF9nZXRf d2luZG93KEdUS19XSURHRVQodmlldykpOwogCiAgICAgaWYgKGRyYWdNb2RlICYmIGRvd24gJiYg IXJlcGxheWluZ1NhdmVkRXZlbnRzKSB7CiAgICAgICAgIG1zZ1F1ZXVlW2VuZE9mUXVldWVdLmV2 ZW50ID0gZXZlbnQ7CkBAIC0yMTYsMTAgKzIyNSw2IEBAIHN0YXRpYyBKU1ZhbHVlUmVmIG1vdXNl TW92ZVRvQ2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0UmVmIGZ1bmN0aW9u CiAgICAgfSBlbHNlIHsKICAgICAgICAgd2Via2l0X3dlYl9mcmFtZV9sYXlvdXQobWFpbkZyYW1l KTsKIAotICAgICAgICBXZWJLaXRXZWJWaWV3KiB2aWV3ID0gd2Via2l0X3dlYl9mcmFtZV9nZXRf d2ViX3ZpZXcobWFpbkZyYW1lKTsKLSAgICAgICAgaWYgKCF2aWV3KQotICAgICAgICAgICAgcmV0 dXJuIEpTVmFsdWVNYWtlVW5kZWZpbmVkKGNvbnRleHQpOwotCiAgICAgICAgIGdib29sZWFuIHJl dHVybl92YWw7CiAgICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZSh2aWV3LCAibW90aW9uX25v dGlmeV9ldmVudCIsICZldmVudCwgJnJldHVybl92YWwpOwogICAgIH0KQEAgLTM4MSw2ICszODYs NyBAQCBzdGF0aWMgSlNWYWx1ZVJlZiBrZXlEb3duQ2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRl eHQsIEpTT2JqZWN0UmVmIGZ1bmN0aW9uLCBKUwogICAgIG1lbXNldCgmZXZlbnQsIDAsIHNpemVv ZihldmVudCkpOwogICAgIGV2ZW50LmtleS5rZXl2YWwgPSBnZGtLZXlTeW07CiAgICAgZXZlbnQu a2V5LnN0YXRlID0gc3RhdGU7CisgICAgZXZlbnQua2V5LndpbmRvdyA9IGd0a193aWRnZXRfZ2V0 X3dpbmRvdyhHVEtfV0lER0VUKHZpZXcpKTsKIAogICAgIGdib29sZWFuIHJldHVybl92YWw7CiAg ICAgZXZlbnQua2V5LnR5cGUgPSBHREtfS0VZX1BSRVNTOwotLSAKMS42LjAuNAoK