28154 2009-08-10 10:44:06 -0700 clicking below end of text in a textarea moves cursor to wrong position 2009-08-24 00:12:23 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 danw webkit-unassigned jmalonzo xan.lopez oldest_to_newest 138714 0 danw 2009-08-10 10:44:06 -0700 in most apps (eg, normal gtk, firefox, safari), if you have a multi-line editable text thingy, and you click anywhere below the end of the text, it's equivalent to clicking at the very end of the text. in webkitgtk though, if you click below the end of the text, it's equivalent to clicking on the last line of text *at the same X coordinate as where you clicked*. (Of course if the text ends with a newline then there's no difference.) This is especially annoying when trying to middle-button paste something, and instead of being pasted at the end of the line, it ends up being pasted in the middle of a word or something. 142136 1 38434 xan.lopez 2009-08-22 11:22:11 -0700 Created attachment 38434 editingbehavior.patch Turns out there's already a setting to control precisely this stuff, so just expose it and adjust our default value to be more GTK+-like. 142145 2 38434 jmalonzo 2009-08-22 13:29:44 -0700 Comment on attachment 38434 editingbehavior.patch Hi Xan > +WebCore::EditingBehavior core(WebKitEditingBehavior type) > +{ > + return (WebCore::EditingBehavior)type; Is it possible to use c++ style casts here? > > +typedef enum { > + WEBKIT_EDITING_BEHAVIOR_MAC, > + WEBKIT_EDITING_BEHAVIOR_WINDOWS > +} WebKitEditingBehavior; Is it possible to add a COMPILE_ASSERT for these just in case of future changes? Thanks. r=me with those changes. 142187 3 xan.lopez 2009-08-22 23:37:27 -0700 Thanks, committed as r47687 with those changes. 142224 4 jmalonzo 2009-08-23 04:08:52 -0700 (In reply to comment #3) > Thanks, committed as r47687 with those changes. This changed introduced a regression in the following test: editing/execCommand/toggle-compound-styles.html -> failed The change in http://trac.webkit.org/changeset/46920 might be helpful. I guess we need to rebaseline the test to match mac? 142283 5 xan.lopez 2009-08-24 00:12:23 -0700 (In reply to comment #4) > (In reply to comment #3) > > Thanks, committed as r47687 with those changes. > > This changed introduced a regression in the following test: > editing/execCommand/toggle-compound-styles.html -> failed > > The change in http://trac.webkit.org/changeset/46920 might be helpful. I guess > we need to rebaseline the test to match mac? Yeah, I just did this and the bot is green again, thanks! 38434 2009-08-22 11:22:11 -0700 2009-08-22 13:29:44 -0700 editingbehavior.patch editingbehavior.patch text/plain 9859 xan.lopez RnJvbSBmYjRkZDYyNDExYTVjMGJkNjUzMTcyOWU3ZTA0OGIxYzU3ZjMwYjk0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBT YXQsIDIyIEF1ZyAyMDA5IDIxOjIwOjE0ICswMzAwClN1YmplY3Q6IFtQQVRDSF0gMjAwOS0wOC0y MiAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CgogICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjgxNTQKICAgICAgICBjbGlja2luZyBiZWxvdyBlbmQgb2YgdGV4dCBpbiBhIHRleHRh cmVhIG1vdmVzIGN1cnNvciB0byB3cm9uZyBwb3NpdGlvbgoKICAgICAgICBFeHBvc2UgdGhlIEVk aXRpbmdCZWhhdmlvciBzZXR0aW5nIGFuZCBzZXQgaXQgYnkgZGVmYXVsdCB0byBNYWMsCiAgICAg ICAgc2luY2UgdGhhdCB3aGF0IG1hdGNoZXMgdGhlIEdUSysgZGVmYXVsdCBiZWhhdmlvci4KCiAg ICAgICAgKiB3ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHA6CiAgICAgICAgKFdlYktpdDo6Y29yZSk6 CiAgICAgICAgKiB3ZWJraXQvd2Via2l0cHJpdmF0ZS5oOgogICAgICAgICogd2Via2l0L3dlYmtp dHdlYnNldHRpbmdzLmNwcDoKICAgICAgICAod2Via2l0X3dlYl9zZXR0aW5nc19jbGFzc19pbml0 KToKICAgICAgICAod2Via2l0X3dlYl9zZXR0aW5nc19zZXRfcHJvcGVydHkpOgogICAgICAgICh3 ZWJraXRfd2ViX3NldHRpbmdzX2dldF9wcm9wZXJ0eSk6CiAgICAgICAgKHdlYmtpdF93ZWJfc2V0 dGluZ3NfY29weSk6CiAgICAgICAgKiB3ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuaDoKICAgICAg ICAqIHdlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcDoKICAgICAgICAod2Via2l0X3dlYl92aWV3X3Vw ZGF0ZV9zZXR0aW5ncyk6Ci0tLQogV2ViS2l0L2d0ay9DaGFuZ2VMb2cgICAgICAgICAgICAgICAg ICAgIHwgICAyMiArKysrKysrKysrKysrKysrKwogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJp dmF0ZS5jcHAgICAgIHwgICAgNSArKysrCiBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRl LmggICAgICAgfCAgICAyICsKIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNw cCB8ICAgMzkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiBXZWJLaXQvZ3RrL3dlYmtp dC93ZWJraXR3ZWJzZXR0aW5ncy5oICAgfCAgICA1ICsrKysKIFdlYktpdC9ndGsvd2Via2l0L3dl YmtpdHdlYnZpZXcuY3BwICAgICB8ICAgIDQgKysrCiA2IGZpbGVzIGNoYW5nZWQsIDc0IGluc2Vy dGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9DaGFuZ2VM b2cgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCBlMzZiZDhiLi42NmZlMjM3IDEwMDY0NAot LS0gYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI1IEBACisyMDA5LTA4LTIyICBYYW4gTG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjgxNTQKKyAgICAgICAgY2xpY2tpbmcg YmVsb3cgZW5kIG9mIHRleHQgaW4gYSB0ZXh0YXJlYSBtb3ZlcyBjdXJzb3IgdG8gd3JvbmcgcG9z aXRpb24KKworICAgICAgICBFeHBvc2UgdGhlIEVkaXRpbmdCZWhhdmlvciBzZXR0aW5nIGFuZCBz ZXQgaXQgYnkgZGVmYXVsdCB0byBNYWMsCisgICAgICAgIHNpbmNlIHRoYXQgd2hhdCBtYXRjaGVz IHRoZSBHVEsrIGRlZmF1bHQgYmVoYXZpb3IuCisKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0cHJp dmF0ZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OmNvcmUpOgorICAgICAgICAqIHdlYmtpdC93ZWJr aXRwcml2YXRlLmg6CisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcDoKKyAg ICAgICAgKHdlYmtpdF93ZWJfc2V0dGluZ3NfY2xhc3NfaW5pdCk6CisgICAgICAgICh3ZWJraXRf d2ViX3NldHRpbmdzX3NldF9wcm9wZXJ0eSk6CisgICAgICAgICh3ZWJraXRfd2ViX3NldHRpbmdz X2dldF9wcm9wZXJ0eSk6CisgICAgICAgICh3ZWJraXRfd2ViX3NldHRpbmdzX2NvcHkpOgorICAg ICAgICAqIHdlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5oOgorICAgICAgICAqIHdlYmtpdC93ZWJr aXR3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld191cGRhdGVfc2V0dGluZ3Mp OgorCiAyMDA5LTA4LTIwICBBYXJvbiBCb29kbWFuICA8YWFAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIEhvcGVmdWxseSB0aGUgbGFzdCBzcGVjdWxhdGl2ZSBidWlsZCBmb3IgZ3RrLgpkaWZmIC0t Z2l0IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHAgYi9XZWJLaXQvZ3RrL3dl YmtpdC93ZWJraXRwcml2YXRlLmNwcAppbmRleCAwMmY1NTNmLi41NDU3YjM0IDEwMDY0NAotLS0g YS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmNwcAorKysgYi9XZWJLaXQvZ3RrL3dl YmtpdC93ZWJraXRwcml2YXRlLmNwcApAQCAtMTExLDYgKzExMSwxMSBAQCBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QgY29yZShXZWJLaXROZXR3b3JrUmVxdWVzdCogcmVxdWVzdCkKICAgICByZXR1 cm4gUmVzb3VyY2VSZXF1ZXN0KHVybCk7CiB9CiAKK1dlYkNvcmU6OkVkaXRpbmdCZWhhdmlvciBj b3JlKFdlYktpdEVkaXRpbmdCZWhhdmlvciB0eXBlKQoreworICAgIHJldHVybiAoV2ViQ29yZTo6 RWRpdGluZ0JlaGF2aW9yKXR5cGU7Cit9CisKIH0gLyoqIGVuZCBuYW1lc3BhY2UgV2ViS2l0ICov CiAKIHN0YXRpYyBHdGtXaWRnZXQqIGN1cnJlbnRUb3BsZXZlbENhbGxiYWNrKFdlYktpdFNvdXBB dXRoRGlhbG9nKiBmZWF0dXJlLCBTb3VwTWVzc2FnZSogbWVzc2FnZSwgZ3BvaW50ZXIgdXNlckRh dGEpCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmggYi9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmgKaW5kZXggZDQ0NTEzZS4uM2RjODdlNCAxMDA2 NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5oCisrKyBiL1dlYktpdC9n dGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaApAQCAtNzcsNiArNzcsOCBAQCBuYW1lc3BhY2UgV2Vi S2l0IHsKICAgICBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZSBjb3JlKFdlYktpdFdlYk5hdmlnYXRp b25SZWFzb24gcmVhc29uKTsKIAogICAgIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCBjb3JlKFdl YktpdE5ldHdvcmtSZXF1ZXN0KiByZXF1ZXN0KTsKKworICAgIFdlYkNvcmU6OkVkaXRpbmdCZWhh dmlvciBjb3JlKFdlYktpdEVkaXRpbmdCZWhhdmlvciB0eXBlKTsKIH0KIAogdHlwZWRlZiBzdHJ1 Y3QgewpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuY3Bw IGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuY3BwCmluZGV4IDA2MWQzZTIu LjViZmZlM2UgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdz LmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHAKQEAgLTI0 LDYgKzI0LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJ3ZWJraXR3ZWJzZXR0 aW5ncy5oIgogCisjaW5jbHVkZSAid2Via2l0ZW51bXR5cGVzLmgiCiAjaW5jbHVkZSAid2Via2l0 cHJpdmF0ZS5oIgogI2luY2x1ZGUgIndlYmtpdHZlcnNpb24uaCIKIApAQCAtOTMsNiArOTQsNyBA QCBzdHJ1Y3QgX1dlYktpdFdlYlNldHRpbmdzUHJpdmF0ZSB7CiAgICAgZ2NoYXIqIHVzZXJfYWdl bnQ7CiAgICAgZ2Jvb2xlYW4gamF2YXNjcmlwdF9jYW5fb3Blbl93aW5kb3dzX2F1dG9tYXRpY2Fs bHk7CiAgICAgZ2Jvb2xlYW4gZW5hYmxlX29mZmxpbmVfd2ViX2FwcGxpY2F0aW9uX2NhY2hlOwor ICAgIFdlYktpdEVkaXRpbmdCZWhhdmlvciBlZGl0aW5nX2JlaGF2aW9yOwogfTsKIAogI2RlZmlu ZSBXRUJLSVRfV0VCX1NFVFRJTkdTX0dFVF9QUklWQVRFKG9iaikgKEdfVFlQRV9JTlNUQU5DRV9H RVRfUFJJVkFURSgob2JqKSwgV0VCS0lUX1RZUEVfV0VCX1NFVFRJTkdTLCBXZWJLaXRXZWJTZXR0 aW5nc1ByaXZhdGUpKQpAQCAtMTMwLDcgKzEzMiw4IEBAIGVudW0gewogICAgIFBST1BfRU5BQkxF X1hTU19BVURJVE9SLAogICAgIFBST1BfVVNFUl9BR0VOVCwKICAgICBQUk9QX0pBVkFTQ1JJUFRf Q0FOX09QRU5fV0lORE9XU19BVVRPTUFUSUNBTExZLAotICAgIFBST1BfRU5BQkxFX09GRkxJTkVf V0VCX0FQUExJQ0FUSU9OX0NBQ0hFCisgICAgUFJPUF9FTkFCTEVfT0ZGTElORV9XRUJfQVBQTElD QVRJT05fQ0FDSEUsCisgICAgUFJPUF9FRElUSU5HX0JFSEFWSU9SCiB9OwogCiAvLyBDcmVhdGUg YSBkZWZhdWx0IHVzZXIgYWdlbnQgc3RyaW5nCkBAIC01OTYsOCArNTk5LDMxIEBAIHN0YXRpYyB2 b2lkIHdlYmtpdF93ZWJfc2V0dGluZ3NfY2xhc3NfaW5pdChXZWJLaXRXZWJTZXR0aW5nc0NsYXNz KiBrbGFzcykKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIF8oIldoZXRoZXIgdG8gZW5hYmxlIG9mZmxpbmUgd2ViIGFwcGxpY2F0aW9uIGNh Y2hlIiksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBUUlVFLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZmxhZ3MpKTsKLQotCisgICAgLyoqCisgICAgKiBXZWJLaXRXZWJTZXR0 aW5nczplZGl0aW5nLWJlaGF2aW9yCisgICAgKgorICAgICogVGhpcyBzZXR0aW5nIGNvbnRyb2xz IHZhcmlvdXMgZWRpdGluZyBiZWhhdmlvcnMgdGhhdCBkaWZmZXIKKyAgICAqIGJldHdlZW4gcGxh dGZvcm1zIGFuZCB0aGF0IGhhdmUgYmVlbiBjb21iaW5lZCBpbiB0d28gZ3JvdXBzLAorICAgICog J01hYycgYW5kICdXaW5kb3dzJy4gU29tZSBleGFtcGxlczoKKyAgICAqIAorICAgICogIDEpIENs aWNraW5nIGJlbG93IHRoZSBsYXN0IGxpbmUgb2YgYW4gZWRpdGFibGUgYXJlYSBwdXRzIHRoZQor ICAgICogY2FyZXQgYXQgdGhlIGVuZCBvZiB0aGUgbGFzdCBsaW5lIG9uIE1hYywgYnV0IGluIHRo ZSBtaWRkbGUgb2YKKyAgICAqIHRoZSBsYXN0IGxpbmUgb24gV2luZG93cy4KKyAgICAqCisgICAg KiAgMikgUHVzaGluZyBkb3duIHRoZSBhcnJvdyBrZXkgb24gdGhlIGxhc3QgbGluZSBwdXRzIHRo ZSBjYXJldAorICAgICogIGF0IHRoZSBlbmQgb2YgdGhlIGxhc3QgbGluZSBvbiBNYWMsIGJ1dCBk b2VzIG5vdGhpbmcgb24KKyAgICAqICBXaW5kb3dzLiBBIHNpbWlsYXIgY2FzZSBleGlzdHMgb24g dGhlIHRvcCBsaW5lLgorICAgICoKKyAgICAqIFNpbmNlIDEuMS4xMworICAgICovCisgICAgZ19v YmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eShnb2JqZWN0X2NsYXNzLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgUFJPUF9FRElUSU5HX0JFSEFWSU9SLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZ19wYXJhbV9zcGVjX2VudW0oImVkaXRpbmctYmVo YXZpb3IiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgXygiRWRpdGluZyBiZWhhdmlvciIpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgXygiVGhlIGJlaGF2aW9yIG1vZGUgdG8gdXNlIGlu IGVkaXRpbmcgbW9kZSIpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgV0VCS0lUX1RZUEVfRURJVElOR19CRUhBVklPUiwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdFQktJVF9FRElUSU5H X0JFSEFWSU9SX01BQywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGZsYWdzKSk7CiAKICAgICBnX3R5cGVfY2xhc3NfYWRkX3ByaXZhdGUoa2xh c3MsIHNpemVvZihXZWJLaXRXZWJTZXR0aW5nc1ByaXZhdGUpKTsKIH0KQEAgLTc3OSw2ICs4MDUs OSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NldHRpbmdzX3NldF9wcm9wZXJ0eShHT2JqZWN0 KiBvYmplY3QsIGd1aW50IHByb3BfaWQsIGNvbgogICAgIGNhc2UgUFJPUF9FTkFCTEVfT0ZGTElO RV9XRUJfQVBQTElDQVRJT05fQ0FDSEU6CiAgICAgICAgIHByaXYtPmVuYWJsZV9vZmZsaW5lX3dl Yl9hcHBsaWNhdGlvbl9jYWNoZSA9IGdfdmFsdWVfZ2V0X2Jvb2xlYW4odmFsdWUpOwogICAgICAg ICBicmVhazsKKyAgICBjYXNlIFBST1BfRURJVElOR19CRUhBVklPUjoKKyAgICAgICAgcHJpdi0+ ZWRpdGluZ19iZWhhdmlvciA9IHN0YXRpY19jYXN0PFdlYktpdEVkaXRpbmdCZWhhdmlvcj4oZ192 YWx1ZV9nZXRfZW51bSh2YWx1ZSkpOworICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAg ICAgICBHX09CSkVDVF9XQVJOX0lOVkFMSURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wX2lkLCBw c3BlYyk7CiAgICAgICAgIGJyZWFrOwpAQCAtODg0LDYgKzkxMyw5IEBAIHN0YXRpYyB2b2lkIHdl YmtpdF93ZWJfc2V0dGluZ3NfZ2V0X3Byb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJv cF9pZCwgR1ZhCiAgICBjYXNlIFBST1BfRU5BQkxFX09GRkxJTkVfV0VCX0FQUExJQ0FUSU9OX0NB Q0hFOgogICAgICAgICBnX3ZhbHVlX3NldF9ib29sZWFuKHZhbHVlLCBwcml2LT5lbmFibGVfb2Zm bGluZV93ZWJfYXBwbGljYXRpb25fY2FjaGUpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIFBS T1BfRURJVElOR19CRUhBVklPUjoKKyAgICAgICAgZ192YWx1ZV9zZXRfZW51bSh2YWx1ZSwgcHJp di0+ZWRpdGluZ19iZWhhdmlvcik7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAg ICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BfaWQsIHBz cGVjKTsKICAgICAgICAgYnJlYWs7CkBAIC05NDYsNiArOTc4LDcgQEAgV2ViS2l0V2ViU2V0dGlu Z3MqIHdlYmtpdF93ZWJfc2V0dGluZ3NfY29weShXZWJLaXRXZWJTZXR0aW5ncyogd2ViX3NldHRp bmdzKQogICAgICAgICAgICAgICAgICAidXNlci1hZ2VudCIsIHdlYmtpdF93ZWJfc2V0dGluZ3Nf Z2V0X3VzZXJfYWdlbnQod2ViX3NldHRpbmdzKSwKICAgICAgICAgICAgICAgICAgImphdmFzY3Jp cHQtY2FuLW9wZW4td2luZG93cy1hdXRvbWF0aWNhbGx5IiwgcHJpdi0+amF2YXNjcmlwdF9jYW5f b3Blbl93aW5kb3dzX2F1dG9tYXRpY2FsbHksCiAgICAgICAgICAgICAgICAgICJlbmFibGUtb2Zm bGluZS13ZWItYXBwbGljYXRpb24tY2FjaGUiLCBwcml2LT5lbmFibGVfb2ZmbGluZV93ZWJfYXBw bGljYXRpb25fY2FjaGUsCisgICAgICAgICAgICAgICAgICJlZGl0aW5nLWJlaGF2aW9yIiwgcHJp di0+ZWRpdGluZ19iZWhhdmlvciwKICAgICAgICAgICAgICAgICAgTlVMTCkpOwogCiAgICAgcmV0 dXJuIGNvcHk7CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5n cy5oIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuaAppbmRleCA5ZWFjMzIx Li43Y2Q2MDU0IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5n cy5oCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmgKQEAgLTM0LDYg KzM0LDExIEBAIEdfQkVHSU5fREVDTFMKICNkZWZpbmUgV0VCS0lUX0lTX1dFQl9TRVRUSU5HU19D TEFTUyhrbGFzcykgKEdfVFlQRV9DSEVDS19DTEFTU19UWVBFKChrbGFzcyksICBXRUJLSVRfVFlQ RV9XRUJfU0VUVElOR1MpKQogI2RlZmluZSBXRUJLSVRfV0VCX1NFVFRJTkdTX0dFVF9DTEFTUyhv YmopICAoR19UWVBFX0lOU1RBTkNFX0dFVF9DTEFTUygob2JqKSwgIFdFQktJVF9UWVBFX1dFQl9T RVRUSU5HUywgV2ViS2l0V2ViU2V0dGluZ3NDbGFzcykpCiAKK3R5cGVkZWYgZW51bSB7CisgICAg V0VCS0lUX0VESVRJTkdfQkVIQVZJT1JfTUFDLAorICAgIFdFQktJVF9FRElUSU5HX0JFSEFWSU9S X1dJTkRPV1MKK30gV2ViS2l0RWRpdGluZ0JlaGF2aW9yOworCiB0eXBlZGVmIHN0cnVjdCBfV2Vi S2l0V2ViU2V0dGluZ3NQcml2YXRlIFdlYktpdFdlYlNldHRpbmdzUHJpdmF0ZTsKIAogc3RydWN0 IF9XZWJLaXRXZWJTZXR0aW5ncyB7CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXR3ZWJ2aWV3LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4 IDFlODM4MmQuLmU3NGI4ZmMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdl YnZpZXcuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC0y MjQyLDYgKzIyNDIsOCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfdXBkYXRlX3NldHRp bmdzKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiAgICAgICAgIGVuYWJsZVByaXZhdGVCcm93c2lu ZywgZW5hYmxlQ2FyZXRCcm93c2luZywgZW5hYmxlSFRNTDVEYXRhYmFzZSwgZW5hYmxlSFRNTDVM b2NhbFN0b3JhZ2UsCiAgICAgICAgIGVuYWJsZVhTU0F1ZGl0b3IsIGphdmFzY3JpcHRDYW5PcGVu V2luZG93cywgZW5hYmxlT2ZmbGluZVdlYkFwcENhY2hlOwogCisgICAgV2ViS2l0RWRpdGluZ0Jl aGF2aW9yIGVkaXRpbmdCZWhhdmlvcjsKKwogICAgIGdfb2JqZWN0X2dldCh3ZWJTZXR0aW5ncywK ICAgICAgICAgICAgICAgICAgImRlZmF1bHQtZW5jb2RpbmciLCAmZGVmYXVsdEVuY29kaW5nLAog ICAgICAgICAgICAgICAgICAiY3Vyc2l2ZS1mb250LWZhbWlseSIsICZjdXJzaXZlRm9udEZhbWls eSwKQEAgLTIyNjUsNiArMjI2Nyw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld191cGRh dGVfc2V0dGluZ3MoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICAgICAgICAgICAgICAgImVu YWJsZS14c3MtYXVkaXRvciIsICZlbmFibGVYU1NBdWRpdG9yLAogICAgICAgICAgICAgICAgICAi amF2YXNjcmlwdC1jYW4tb3Blbi13aW5kb3dzLWF1dG9tYXRpY2FsbHkiLCAmamF2YXNjcmlwdENh bk9wZW5XaW5kb3dzLAogICAgICAgICAgICAgICAgICAiZW5hYmxlLW9mZmxpbmUtd2ViLWFwcGxp Y2F0aW9uLWNhY2hlIiwgJmVuYWJsZU9mZmxpbmVXZWJBcHBDYWNoZSwKKyAgICAgICAgICAgICAg ICAgImVkaXRpbmctYmVoYXZpb3IiLCAmZWRpdGluZ0JlaGF2aW9yLAogICAgICAgICAgICAgICAg ICBOVUxMKTsKIAogICAgIHNldHRpbmdzLT5zZXREZWZhdWx0VGV4dEVuY29kaW5nTmFtZShkZWZh dWx0RW5jb2RpbmcpOwpAQCAtMjI4OSw2ICsyMjkyLDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dl Yl92aWV3X3VwZGF0ZV9zZXR0aW5ncyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogICAgIHNldHRp bmdzLT5zZXRYU1NBdWRpdG9yRW5hYmxlZChlbmFibGVYU1NBdWRpdG9yKTsKICAgICBzZXR0aW5n cy0+c2V0SmF2YVNjcmlwdENhbk9wZW5XaW5kb3dzQXV0b21hdGljYWxseShqYXZhc2NyaXB0Q2Fu T3BlbldpbmRvd3MpOwogICAgIHNldHRpbmdzLT5zZXRPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNo ZUVuYWJsZWQoZW5hYmxlT2ZmbGluZVdlYkFwcENhY2hlKTsKKyAgICBzZXR0aW5ncy0+c2V0RWRp dGluZ0JlaGF2aW9yKGNvcmUoZWRpdGluZ0JlaGF2aW9yKSk7CiAKICAgICBnX2ZyZWUoZGVmYXVs dEVuY29kaW5nKTsKICAgICBnX2ZyZWUoY3Vyc2l2ZUZvbnRGYW1pbHkpOwotLSAKMS42LjQKCg==