146965 2015-07-15 04:14:32 -0700 [GTK] Input method filter is always enabled when the view is focused 2015-07-15 22:33:16 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned gustavo mrobinson svillar zan oldest_to_newest 1109606 0 cgarcia 2015-07-15 04:14:32 -0700 It should only be enabled when the view is focused and there's an editable element focused. In r138544, when input methods were implemented, the message SetInputMethodState was added, but it was never used. Instead, the notifyFocusIn method of the IM filter enables the input method unconditionally. We should actually use the SetInputMethodState message to enable/disable input methods when editable elements are focused/unfocused. 1109607 1 256832 cgarcia 2015-07-15 04:21:28 -0700 Created attachment 256832 Patch 1109610 2 256833 cgarcia 2015-07-15 05:21:36 -0700 Created attachment 256833 Updated patch Also avoids updating the cursor rect if input methods are disabled. 1109627 3 256833 mrobinson 2015-07-15 07:47:22 -0700 Comment on attachment 256833 Updated patch Seems reasonable to me. 1109826 4 cgarcia 2015-07-15 22:33:16 -0700 Committed r186888: <http://trac.webkit.org/changeset/186888> 256832 2015-07-15 04:21:28 -0700 2015-07-15 05:21:36 -0700 Patch wk2-input-methods.diff text/plain 6659 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkMjYxMDJiLi5jZjZlZGIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUg QEAKKzIwMTUtMDctMTUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIElucHV0IG1ldGhvZCBmaWx0ZXIgaXMgYWx3YXlzIGVuYWJsZWQg d2hlbiB0aGUgdmlldyBpcyBmb2N1c2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDY5NjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBJdCBzaG91bGQgb25seSBiZSBlbmFibGVkIHdoZW4gdGhlIHZpZXcg aXMgZm9jdXNlZCBhbmQgdGhlcmUncyBhbgorICAgICAgICBlZGl0YWJsZSBlbGVtZW50IGZvY3Vz ZWQuIEluIHIxMzg1NDQsIHdoZW4gaW5wdXQgbWV0aG9kcyB3ZXJlCisgICAgICAgIGltcGxlbWVu dGVkLCB0aGUgbWVzc2FnZSBTZXRJbnB1dE1ldGhvZFN0YXRlIHdhcyBhZGRlZCwgYnV0IGl0IHdh cworICAgICAgICBuZXZlciB1c2VkLiBJbnN0ZWFkLCB0aGUgbm90aWZ5Rm9jdXNJbiBtZXRob2Qg b2YgdGhlIElNIGZpbHRlcgorICAgICAgICBlbmFibGVzIHRoZSBpbnB1dCBtZXRob2QgdW5jb25k aXRpb25hbGx5LiBXZSBzaG91bGQgYWN0dWFsbHkgdXNlCisgICAgICAgIHRoZSBTZXRJbnB1dE1l dGhvZFN0YXRlIG1lc3NhZ2UgdG8gZW5hYmxlL2Rpc2FibGUgaW5wdXQgbWV0aG9kcworICAgICAg ICB3aGVuIGVkaXRhYmxlIGVsZW1lbnRzIGFyZSBmb2N1c2VkL3VuZm9jdXNlZC4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9ndGsvSW5wdXRNZXRob2RGaWx0ZXIuY3BwOgorICAgICAgICAoV2ViS2l0 OjpJbnB1dE1ldGhvZEZpbHRlcjo6c2V0RW5hYmxlZCk6IENhbGwgbm90aWZ5Rm9jdXNlZEluL091 dAorICAgICAgICB3aGVuIGlucHV0cyBtZXRob2RzIGFyZSBlbmFibGVkL2Rpc2FibGVkIGluc3Rl YWQgb2Ygbm90aWZ5aW5nIHRoZQorICAgICAgICBJTSBjb250ZXh0IGRpcmVjdGx5LgorICAgICAg ICAoV2ViS2l0OjpJbnB1dE1ldGhvZEZpbHRlcjo6bm90aWZ5Rm9jdXNlZEluKTogRG8gbm90aGlu ZyB3aGVuCisgICAgICAgIGlucHV0IG1ldGhvZHMgYXJlIGRpc2FibGVkLiBEbyBub3QgZW5hYmxl IGlucHV0IG1ldGhvZHMKKyAgICAgICAgdW5jb250aW9uYWxseSBoZXJlLgorICAgICAgICAoV2Vi S2l0OjpJbnB1dE1ldGhvZEZpbHRlcjo6bm90aWZ5Rm9jdXNlZE91dCk6IERvIG5vdCBkaXNhYmxl CisgICAgICAgIGlucHV0IG1ldGhvZHMgdW5jb250aW9uYWxseSBoZXJlLgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViRWRpdG9yQ2xpZW50OjpzZXRJbnB1dE1ldGhvZFN0YXRlKTogQ2FsbAorICAgICAg ICBXZWJQYWdlOjpzZXRJbnB1dE1ldGhvZFN0YXRlKCkgZm9yIEdUSyBwbGF0Zm9ybS4KKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOiBBZGQgc2V0SW5wdXRNZXRob2RTdGF0 ZSgpIGZvciBHVEsgcGxhdGZvcm0uCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9X ZWJQYWdlR3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0SW5wdXRNZXRob2RT dGF0ZSk6IFVwZGF0ZSBpbnB1dCBtZXRob2Qgc3RhdGUKKyAgICAgICAgYW5kIHNlbmQgU2V0SW5w dXRNZXRob2RTdGF0ZSBtZXNzYWdlIHRvIHRoZSBVSSBwcm9jZXNzIGlmIHN0YXRlIGNoYW5nZWQu CisKIDIwMTUtMDctMTUgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAg ICBGaXhlZCBidWlsZCBmaXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv Z3RrL0lucHV0TWV0aG9kRmlsdGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsv SW5wdXRNZXRob2RGaWx0ZXIuY3BwCmluZGV4IDk5MzVmMDMuLmU1ZDM5YjYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvSW5wdXRNZXRob2RGaWx0ZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvSW5wdXRNZXRob2RGaWx0ZXIuY3BwCkBAIC04 NSwxMSArODUsMTIgQEAgdm9pZCBJbnB1dE1ldGhvZEZpbHRlcjo6c2V0RW5hYmxlZChib29sIGVu YWJsZWQpCiB7CiAgICAgQVNTRVJUKG1fcGFnZSk7CiAKKyAgICAvLyBOb3RpZnkgZm9jdXMgb3V0 IGJlZm9yZSBjaGFuZ2luZyB0aGUgbV9lbmFibGVkLgorICAgIGlmICghZW5hYmxlZCkKKyAgICAg ICAgbm90aWZ5Rm9jdXNlZE91dCgpOwogICAgIG1fZW5hYmxlZCA9IGVuYWJsZWQ7CiAgICAgaWYg KGVuYWJsZWQpCi0gICAgICAgIGd0a19pbV9jb250ZXh0X2ZvY3VzX2luKG1fY29udGV4dC5nZXQo KSk7Ci0gICAgZWxzZQotICAgICAgICBndGtfaW1fY29udGV4dF9mb2N1c19vdXQobV9jb250ZXh0 LmdldCgpKTsKKyAgICAgICAgbm90aWZ5Rm9jdXNlZEluKCk7CiB9CiAKIHZvaWQgSW5wdXRNZXRo b2RGaWx0ZXI6OnNldEN1cnNvclJlY3QoY29uc3QgSW50UmVjdCYgY3Vyc29yUmVjdCkKQEAgLTI2 Myw3ICsyNjQsOSBAQCB2b2lkIElucHV0TWV0aG9kRmlsdGVyOjpub3RpZnlGb2N1c2VkSW4oKQog I2Vsc2UKICAgICBBU1NFUlQobV9wYWdlKTsKICNlbmRpZgotICAgIG1fZW5hYmxlZCA9IHRydWU7 CisgICAgaWYgKCFtX2VuYWJsZWQpCisgICAgICAgIHJldHVybjsKKwogICAgIGd0a19pbV9jb250 ZXh0X2ZvY3VzX2luKG1fY29udGV4dC5nZXQoKSk7CiB9CiAKQEAgLTI4MCw3ICsyODMsNiBAQCB2 b2lkIElucHV0TWV0aG9kRmlsdGVyOjpub3RpZnlGb2N1c2VkT3V0KCkKICAgICBjb25maXJtQ3Vy cmVudENvbXBvc2l0aW9uKCk7CiAgICAgY2FuY2VsQ29udGV4dENvbXBvc2l0aW9uKCk7CiAgICAg Z3RrX2ltX2NvbnRleHRfZm9jdXNfb3V0KG1fY29udGV4dC5nZXQoKSk7Ci0gICAgbV9lbmFibGVk ID0gZmFsc2U7CiB9CiAKIHZvaWQgSW5wdXRNZXRob2RGaWx0ZXI6Om5vdGlmeU1vdXNlQnV0dG9u UHJlc3MoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJFZGl0b3JDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQuY3BwCmluZGV4IDgwZjA5MjAuLmQ3YjJmZTQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRWRp dG9yQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkVkaXRvckNsaWVudC5jcHAKQEAgLTUyMiw5ICs1MjIsMTQgQEAgdm9pZCBXZWJFZGl0 b3JDbGllbnQ6OndpbGxTZXRJbnB1dE1ldGhvZFN0YXRlKCkKIHsKIH0KIAotdm9pZCBXZWJFZGl0 b3JDbGllbnQ6OnNldElucHV0TWV0aG9kU3RhdGUoYm9vbCkKK3ZvaWQgV2ViRWRpdG9yQ2xpZW50 OjpzZXRJbnB1dE1ldGhvZFN0YXRlKGJvb2wgZW5hYmxlZCkKIHsKKyNpZiBQTEFURk9STShHVEsp CisgICAgbV9wYWdlLT5zZXRJbnB1dE1ldGhvZFN0YXRlKGVuYWJsZWQpOworI2Vsc2UKICAgICBu b3RJbXBsZW1lbnRlZCgpOworICAgIFVOVVNFRF9QQVJBTShlbmFibGVkKTsKKyNlbmRpZgogfQog CiBib29sIFdlYkVkaXRvckNsaWVudDo6c3VwcG9ydHNHbG9iYWxTZWxlY3Rpb24oKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggZDY4NmM3ZS4uMjYy MjZkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBA IC04OTYsNiArODk2LDEwIEBAIHB1YmxpYzoKICAgICB2b2lkIHBvc3RNZXNzYWdlKGNvbnN0IFN0 cmluZyYgbWVzc2FnZU5hbWUsIEFQSTo6T2JqZWN0KiBtZXNzYWdlQm9keSk7CiAgICAgdm9pZCBw b3N0U3luY2hyb25vdXNNZXNzYWdlKGNvbnN0IFN0cmluZyYgbWVzc2FnZU5hbWUsIEFQSTo6T2Jq ZWN0KiBtZXNzYWdlQm9keSwgUmVmUHRyPEFQSTo6T2JqZWN0PiYgcmV0dXJuRGF0YSk7CiAKKyNp ZiBQTEFURk9STShHVEspCisgICAgdm9pZCBzZXRJbnB1dE1ldGhvZFN0YXRlKGJvb2wpOworI2Vu ZGlmCisKIHByaXZhdGU6CiAgICAgV2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIGNvbnN0IFdlYlBh Z2VDcmVhdGlvblBhcmFtZXRlcnMmKTsKIApAQCAtMTM4NSw2ICsxMzg5LDEwIEBAIHByaXZhdGU6 CiAgICAgYm9vbCBtX21haW5GcmFtZVByb2dyZXNzQ29tcGxldGVkOwogICAgIGJvb2wgbV9zaG91 bGREaXNwYXRjaEZha2VNb3VzZU1vdmVFdmVudHM7CiAgICAgYm9vbCBtX2lzRWRpdG9yU3RhdGVN aXNzaW5nUG9zdExheW91dERhdGEgeyBmYWxzZSB9OworCisjaWYgUExBVEZPUk0oR1RLKQorICAg IGJvb2wgbV9pbnB1dE1ldGhvZEVuYWJsZWQgeyBmYWxzZSB9OworI2VuZGlmCiB9OwogCiB9IC8v IG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9ndGsvV2ViUGFnZUd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvZ3RrL1dlYlBhZ2VHdGsuY3BwCmluZGV4IGI3ZTdkMWIuLjliMGFiNjggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUGFnZUd0ay5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQYWdlR3RrLmNw cApAQCAtMTc2LDQgKzE3NiwxMyBAQCB2b2lkIFdlYlBhZ2U6OmdldENlbnRlckZvclpvb21HZXN0 dXJlKGNvbnN0IEludFBvaW50JiBjZW50ZXJJblZpZXdDb29yZGluYXRlcywgSQogfQogI2VuZGlm CiAKK3ZvaWQgV2ViUGFnZTo6c2V0SW5wdXRNZXRob2RTdGF0ZShib29sIGVuYWJsZWQpCit7Cisg ICAgaWYgKG1faW5wdXRNZXRob2RFbmFibGVkID09IGVuYWJsZWQpCisgICAgICAgIHJldHVybjsK KworICAgIG1faW5wdXRNZXRob2RFbmFibGVkID0gZW5hYmxlZDsKKyAgICBzZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OlNldElucHV0TWV0aG9kU3RhdGUoZW5hYmxlZCkpOworfQorCiB9IC8v IG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCBhYTUwNzkxLi4zZjdhNTY4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VM b2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTUtMDctMTUgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtd IElucHV0IG1ldGhvZCBmaWx0ZXIgaXMgYWx3YXlzIGVuYWJsZWQgd2hlbiB0aGUgdmlldyBpcyBm b2N1c2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDY5NjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV c2Ugc2V0RW5hYmxlZCgpIGluc3RlYWQgb2Ygbm90aWZ5Rm9jdXNlZEluKCkgdG8gZW5hYmxlIGlu cHV0IG1ldGhvZHMuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvZ3Rr L0lucHV0TWV0aG9kRmlsdGVyLmNwcDoKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRlc3RJbnB1 dE1ldGhvZEZpbHRlcjo6VGVzdElucHV0TWV0aG9kRmlsdGVyKToKKwogMjAxNS0wNy0xNCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIEFzc2VydGlvbnMu aCBzaG91bGQgaW5jbHVkZSBFeHBvcnRNYWNyb3MuaApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXQyL2d0ay9JbnB1dE1ldGhvZEZpbHRlci5jcHAgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvZ3RrL0lucHV0TWV0aG9kRmlsdGVyLmNwcAppbmRl eCA3MmNhOWUyLi40YTBlNjg0IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdDIvZ3RrL0lucHV0TWV0aG9kRmlsdGVyLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdDIvZ3RrL0lucHV0TWV0aG9kRmlsdGVyLmNwcApAQCAtNDcsOCArNDcs NyBAQCBwdWJsaWM6CiAgICAgICAgIGd0a193aWRnZXRfc2hvdyhtX3Rlc3RXaW5kb3cpOwogICAg ICAgICBndGtfaW1fY29udGV4dF9zZXRfY2xpZW50X3dpbmRvdyhjb250ZXh0KCksIGd0a193aWRn ZXRfZ2V0X3dpbmRvdyhtX3Rlc3RXaW5kb3cpKTsKIAotICAgICAgICAvLyBGb2N1cyBpbiBpcyBu ZWNlc3NhcnkgdG8gYWN0aXZhdGUgdGhlIGRlZmF1bHQgaW5wdXQgbWV0aG9kIGluIHRoZSBtdWx0 aWNvbnRleHQuCi0gICAgICAgIG5vdGlmeUZvY3VzZWRJbigpOworICAgICAgICBzZXRFbmFibGVk KHRydWUpOwogICAgIH0KIAogICAgIH5UZXN0SW5wdXRNZXRob2RGaWx0ZXIoKQo= 256833 2015-07-15 05:21:36 -0700 2015-07-15 07:47:22 -0700 Updated patch wk2-input-methods.diff text/plain 7031 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkMjYxMDJiLi44ZWY4NTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcg QEAKKzIwMTUtMDctMTUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIElucHV0IG1ldGhvZCBmaWx0ZXIgaXMgYWx3YXlzIGVuYWJsZWQg d2hlbiB0aGUgdmlldyBpcyBmb2N1c2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDY5NjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBJdCBzaG91bGQgb25seSBiZSBlbmFibGVkIHdoZW4gdGhlIHZpZXcg aXMgZm9jdXNlZCBhbmQgdGhlcmUncyBhbgorICAgICAgICBlZGl0YWJsZSBlbGVtZW50IGZvY3Vz ZWQuIEluIHIxMzg1NDQsIHdoZW4gaW5wdXQgbWV0aG9kcyB3ZXJlCisgICAgICAgIGltcGxlbWVu dGVkLCB0aGUgbWVzc2FnZSBTZXRJbnB1dE1ldGhvZFN0YXRlIHdhcyBhZGRlZCwgYnV0IGl0IHdh cworICAgICAgICBuZXZlciB1c2VkLiBJbnN0ZWFkLCB0aGUgbm90aWZ5Rm9jdXNJbiBtZXRob2Qg b2YgdGhlIElNIGZpbHRlcgorICAgICAgICBlbmFibGVzIHRoZSBpbnB1dCBtZXRob2QgdW5jb25k aXRpb25hbGx5LiBXZSBzaG91bGQgYWN0dWFsbHkgdXNlCisgICAgICAgIHRoZSBTZXRJbnB1dE1l dGhvZFN0YXRlIG1lc3NhZ2UgdG8gZW5hYmxlL2Rpc2FibGUgaW5wdXQgbWV0aG9kcworICAgICAg ICB3aGVuIGVkaXRhYmxlIGVsZW1lbnRzIGFyZSBmb2N1c2VkL3VuZm9jdXNlZC4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9ndGsvSW5wdXRNZXRob2RGaWx0ZXIuY3BwOgorICAgICAgICAoV2ViS2l0 OjpJbnB1dE1ldGhvZEZpbHRlcjo6c2V0RW5hYmxlZCk6IENhbGwgbm90aWZ5Rm9jdXNlZEluL091 dAorICAgICAgICB3aGVuIGlucHV0cyBtZXRob2RzIGFyZSBlbmFibGVkL2Rpc2FibGVkIGluc3Rl YWQgb2Ygbm90aWZ5aW5nIHRoZQorICAgICAgICBJTSBjb250ZXh0IGRpcmVjdGx5LgorICAgICAg ICAoV2ViS2l0OjpJbnB1dE1ldGhvZEZpbHRlcjo6c2V0Q3Vyc29yUmVjdCk6IERvIG5vdCB1cGRh dGUgdGhlCisgICAgICAgIGN1cnNvciBwb3NpdGlvbiBpZiBpbnB1dCBtZXRob2RzIGFyZSBkaWRh YmxlZC4KKyAgICAgICAgKFdlYktpdDo6SW5wdXRNZXRob2RGaWx0ZXI6Om5vdGlmeUZvY3VzZWRJ bik6IERvIG5vdGhpbmcgd2hlbgorICAgICAgICBpbnB1dCBtZXRob2RzIGFyZSBkaXNhYmxlZC4g RG8gbm90IGVuYWJsZSBpbnB1dCBtZXRob2RzCisgICAgICAgIHVuY29udGlvbmFsbHkgaGVyZS4K KyAgICAgICAgKFdlYktpdDo6SW5wdXRNZXRob2RGaWx0ZXI6Om5vdGlmeUZvY3VzZWRPdXQpOiBE byBub3QgZGlzYWJsZQorICAgICAgICBpbnB1dCBtZXRob2RzIHVuY29udGlvbmFsbHkgaGVyZS4K KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYkVkaXRvckNsaWVudDo6c2V0SW5wdXRNZXRob2RTdGF0ZSk6 IENhbGwKKyAgICAgICAgV2ViUGFnZTo6c2V0SW5wdXRNZXRob2RTdGF0ZSgpIGZvciBHVEsgcGxh dGZvcm0uCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDogQWRkIHNldElu cHV0TWV0aG9kU3RhdGUoKSBmb3IgR1RLIHBsYXRmb3JtLgorICAgICAgICAqIFdlYlByb2Nlc3Mv V2ViUGFnZS9ndGsvV2ViUGFnZUd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNl dElucHV0TWV0aG9kU3RhdGUpOiBVcGRhdGUgaW5wdXQgbWV0aG9kIHN0YXRlCisgICAgICAgIGFu ZCBzZW5kIFNldElucHV0TWV0aG9kU3RhdGUgbWVzc2FnZSB0byB0aGUgVUkgcHJvY2VzcyBpZiBz dGF0ZSBjaGFuZ2VkLgorCiAyMDE1LTA3LTE1ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5j b20+CiAKICAgICAgICAgRml4ZWQgYnVpbGQgZml4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2d0ay9JbnB1dE1ldGhvZEZpbHRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZ3RrL0lucHV0TWV0aG9kRmlsdGVyLmNwcAppbmRleCA5OTM1ZjAzLi4xYzBhYmE5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL0lucHV0TWV0aG9kRmls dGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL0lucHV0TWV0aG9kRmls dGVyLmNwcApAQCAtODUsMTYgKzg1LDIxIEBAIHZvaWQgSW5wdXRNZXRob2RGaWx0ZXI6OnNldEVu YWJsZWQoYm9vbCBlbmFibGVkKQogewogICAgIEFTU0VSVChtX3BhZ2UpOwogCisgICAgLy8gTm90 aWZ5IGZvY3VzIG91dCBiZWZvcmUgY2hhbmdpbmcgdGhlIG1fZW5hYmxlZC4KKyAgICBpZiAoIWVu YWJsZWQpCisgICAgICAgIG5vdGlmeUZvY3VzZWRPdXQoKTsKICAgICBtX2VuYWJsZWQgPSBlbmFi bGVkOwogICAgIGlmIChlbmFibGVkKQotICAgICAgICBndGtfaW1fY29udGV4dF9mb2N1c19pbiht X2NvbnRleHQuZ2V0KCkpOwotICAgIGVsc2UKLSAgICAgICAgZ3RrX2ltX2NvbnRleHRfZm9jdXNf b3V0KG1fY29udGV4dC5nZXQoKSk7CisgICAgICAgIG5vdGlmeUZvY3VzZWRJbigpOwogfQogCiB2 b2lkIElucHV0TWV0aG9kRmlsdGVyOjpzZXRDdXJzb3JSZWN0KGNvbnN0IEludFJlY3QmIGN1cnNv clJlY3QpCiB7CiAgICAgQVNTRVJUKG1fcGFnZSk7CisKKyAgICBpZiAoIW1fZW5hYmxlZCkKKyAg ICAgICAgcmV0dXJuOworCiAgICAgLy8gRG9uJ3QgbW92ZSB0aGUgd2luZG93IHVubGVzcyB0aGUg Y3Vyc29yIGFjdHVhbGx5IG1vdmVzIG1vcmUgdGhhbiAxMAogICAgIC8vIHBpeGVscy4gVGhpcyBw cmV2ZW50cyB1cyBmcm9tIG1ha2luZyB0aGUgd2luZG93IGZsYXNoIGR1cmluZyBtaW5vcgogICAg IC8vIGN1cnNvciBhZGp1c3RtZW50cy4KQEAgLTI2Myw3ICsyNjgsOSBAQCB2b2lkIElucHV0TWV0 aG9kRmlsdGVyOjpub3RpZnlGb2N1c2VkSW4oKQogI2Vsc2UKICAgICBBU1NFUlQobV9wYWdlKTsK ICNlbmRpZgotICAgIG1fZW5hYmxlZCA9IHRydWU7CisgICAgaWYgKCFtX2VuYWJsZWQpCisgICAg ICAgIHJldHVybjsKKwogICAgIGd0a19pbV9jb250ZXh0X2ZvY3VzX2luKG1fY29udGV4dC5nZXQo KSk7CiB9CiAKQEAgLTI4MCw3ICsyODcsNiBAQCB2b2lkIElucHV0TWV0aG9kRmlsdGVyOjpub3Rp ZnlGb2N1c2VkT3V0KCkKICAgICBjb25maXJtQ3VycmVudENvbXBvc2l0aW9uKCk7CiAgICAgY2Fu Y2VsQ29udGV4dENvbXBvc2l0aW9uKCk7CiAgICAgZ3RrX2ltX2NvbnRleHRfZm9jdXNfb3V0KG1f Y29udGV4dC5nZXQoKSk7Ci0gICAgbV9lbmFibGVkID0gZmFsc2U7CiB9CiAKIHZvaWQgSW5wdXRN ZXRob2RGaWx0ZXI6Om5vdGlmeU1vdXNlQnV0dG9uUHJlc3MoKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQuY3BwIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQu Y3BwCmluZGV4IDgwZjA5MjAuLmQ3YjJmZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5jcHAKQEAg LTUyMiw5ICs1MjIsMTQgQEAgdm9pZCBXZWJFZGl0b3JDbGllbnQ6OndpbGxTZXRJbnB1dE1ldGhv ZFN0YXRlKCkKIHsKIH0KIAotdm9pZCBXZWJFZGl0b3JDbGllbnQ6OnNldElucHV0TWV0aG9kU3Rh dGUoYm9vbCkKK3ZvaWQgV2ViRWRpdG9yQ2xpZW50OjpzZXRJbnB1dE1ldGhvZFN0YXRlKGJvb2wg ZW5hYmxlZCkKIHsKKyNpZiBQTEFURk9STShHVEspCisgICAgbV9wYWdlLT5zZXRJbnB1dE1ldGhv ZFN0YXRlKGVuYWJsZWQpOworI2Vsc2UKICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIFVOVVNF RF9QQVJBTShlbmFibGVkKTsKKyNlbmRpZgogfQogCiBib29sIFdlYkVkaXRvckNsaWVudDo6c3Vw cG9ydHNHbG9iYWxTZWxlY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmgKaW5kZXggZDY4NmM3ZS4uMjYyMjZkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC04OTYsNiArODk2LDEwIEBAIHB1YmxpYzoK ICAgICB2b2lkIHBvc3RNZXNzYWdlKGNvbnN0IFN0cmluZyYgbWVzc2FnZU5hbWUsIEFQSTo6T2Jq ZWN0KiBtZXNzYWdlQm9keSk7CiAgICAgdm9pZCBwb3N0U3luY2hyb25vdXNNZXNzYWdlKGNvbnN0 IFN0cmluZyYgbWVzc2FnZU5hbWUsIEFQSTo6T2JqZWN0KiBtZXNzYWdlQm9keSwgUmVmUHRyPEFQ STo6T2JqZWN0PiYgcmV0dXJuRGF0YSk7CiAKKyNpZiBQTEFURk9STShHVEspCisgICAgdm9pZCBz ZXRJbnB1dE1ldGhvZFN0YXRlKGJvb2wpOworI2VuZGlmCisKIHByaXZhdGU6CiAgICAgV2ViUGFn ZSh1aW50NjRfdCBwYWdlSUQsIGNvbnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmKTsKIApA QCAtMTM4NSw2ICsxMzg5LDEwIEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX21haW5GcmFtZVByb2dy ZXNzQ29tcGxldGVkOwogICAgIGJvb2wgbV9zaG91bGREaXNwYXRjaEZha2VNb3VzZU1vdmVFdmVu dHM7CiAgICAgYm9vbCBtX2lzRWRpdG9yU3RhdGVNaXNzaW5nUG9zdExheW91dERhdGEgeyBmYWxz ZSB9OworCisjaWYgUExBVEZPUk0oR1RLKQorICAgIGJvb2wgbV9pbnB1dE1ldGhvZEVuYWJsZWQg eyBmYWxzZSB9OworI2VuZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUGFnZUd0ay5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlBhZ2VHdGsuY3BwCmlu ZGV4IGI3ZTdkMWIuLjliMGFiNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9ndGsvV2ViUGFnZUd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL2d0ay9XZWJQYWdlR3RrLmNwcApAQCAtMTc2LDQgKzE3NiwxMyBAQCB2b2lk IFdlYlBhZ2U6OmdldENlbnRlckZvclpvb21HZXN0dXJlKGNvbnN0IEludFBvaW50JiBjZW50ZXJJ blZpZXdDb29yZGluYXRlcywgSQogfQogI2VuZGlmCiAKK3ZvaWQgV2ViUGFnZTo6c2V0SW5wdXRN ZXRob2RTdGF0ZShib29sIGVuYWJsZWQpCit7CisgICAgaWYgKG1faW5wdXRNZXRob2RFbmFibGVk ID09IGVuYWJsZWQpCisgICAgICAgIHJldHVybjsKKworICAgIG1faW5wdXRNZXRob2RFbmFibGVk ID0gZW5hYmxlZDsKKyAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNldElucHV0TWV0 aG9kU3RhdGUoZW5hYmxlZCkpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdp dCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhYTUwNzkxLi4zZjdh NTY4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTUtMDctMTUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp YUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIElucHV0IG1ldGhvZCBmaWx0ZXIgaXMgYWx3 YXlzIGVuYWJsZWQgd2hlbiB0aGUgdmlldyBpcyBmb2N1c2VkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDY5NjUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2Ugc2V0RW5hYmxlZCgpIGluc3RlYWQgb2Yg bm90aWZ5Rm9jdXNlZEluKCkgdG8gZW5hYmxlIGlucHV0IG1ldGhvZHMuCisKKyAgICAgICAgKiBU ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvZ3RrL0lucHV0TWV0aG9kRmlsdGVyLmNwcDoKKyAg ICAgICAgKFRlc3RXZWJLaXRBUEk6OlRlc3RJbnB1dE1ldGhvZEZpbHRlcjo6VGVzdElucHV0TWV0 aG9kRmlsdGVyKToKKwogMjAxNS0wNy0xNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBw bGUuY29tPgogCiAgICAgICAgIEFzc2VydGlvbnMuaCBzaG91bGQgaW5jbHVkZSBFeHBvcnRNYWNy b3MuaApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL2d0ay9J bnB1dE1ldGhvZEZpbHRlci5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIv Z3RrL0lucHV0TWV0aG9kRmlsdGVyLmNwcAppbmRleCA3MmNhOWUyLi40YTBlNjg0IDEwMDY0NAot LS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvZ3RrL0lucHV0TWV0aG9kRmls dGVyLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvZ3RrL0lucHV0 TWV0aG9kRmlsdGVyLmNwcApAQCAtNDcsOCArNDcsNyBAQCBwdWJsaWM6CiAgICAgICAgIGd0a193 aWRnZXRfc2hvdyhtX3Rlc3RXaW5kb3cpOwogICAgICAgICBndGtfaW1fY29udGV4dF9zZXRfY2xp ZW50X3dpbmRvdyhjb250ZXh0KCksIGd0a193aWRnZXRfZ2V0X3dpbmRvdyhtX3Rlc3RXaW5kb3cp KTsKIAotICAgICAgICAvLyBGb2N1cyBpbiBpcyBuZWNlc3NhcnkgdG8gYWN0aXZhdGUgdGhlIGRl ZmF1bHQgaW5wdXQgbWV0aG9kIGluIHRoZSBtdWx0aWNvbnRleHQuCi0gICAgICAgIG5vdGlmeUZv Y3VzZWRJbigpOworICAgICAgICBzZXRFbmFibGVkKHRydWUpOwogICAgIH0KIAogICAgIH5UZXN0 SW5wdXRNZXRob2RGaWx0ZXIoKQo=