139504 2014-12-10 12:49:32 -0800 REGRESSION (Async Text Input): Text input method state is not reset when reloading a page 2014-12-11 10:43:35 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar, Regression P2 Normal --- 1 ap ap commit-queue oldest_to_newest 1054279 0 ap 2014-12-10 12:49:32 -0800 * STEPS TO REPRODUCE > SETUP 1. Launch System Preferences 2. Select "Keyboard" pref pane 3. Select "Input Sources" tab 4. Click "+" button to add an input source 5. Select Japanese and click "Add" button > REPRODUCE 1. Launch Safari 2. Navigate to a webpage with fields (IE: https://accounts.google.com/Signup) 3. Set input method to Hiragana 4. Type in a field (IE: jaaka which produces じゃあか) and do not select a prediction 5. Refresh (⌘R) or click the refresh button 6. Click in any field and type a single character * EXPECTED RESULTS - Typed character should be entered in field * ACTUAL RESULTS - Typed character is appended to the end of the previously typed string We lost the code to call -discardMarkedText in async text input code path (and before that, some of it got lost in <http://trac.webkit.org/changeset/150291>). That was intentional, but of course we do need to call it in this case, and also on navigation. rdar://problem/19034674 1054284 1 243060 ap 2014-12-10 12:59:56 -0800 Created attachment 243060 proposed fix 1054516 2 ap 2014-12-11 09:23:10 -0800 Committed <http://trac.webkit.org/r177152>. 243060 2014-12-10 12:59:56 -0800 2014-12-11 09:19:45 -0800 proposed fix DiscardComposition.txt text/plain 14522 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NzA4OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE0LTEyLTEwICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKEFzeW5j IFRleHQgSW5wdXQpOiBUZXh0IGlucHV0IG1ldGhvZCBzdGF0ZSBpcyBub3QgcmVzZXQgd2hlbiBy ZWxvYWRpbmcgYSBwYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzk1MDQKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMTkwMzQ2NzQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFeHBsaWNpdGx5IG5vdGlm eSBFZGl0b3JDbGllbnQgd2hlbiBhIGNvbXBvc2l0aW9uIGlzIHZvbHVudGFyaWx5IGNhbmNlbGVk IGJ5IFdlYkNvcmUuCisgICAgICAgIFRoZXNlIGFyZSBhbG1vc3QgY2VydGFpbmx5IG5vdCBhbGwg dGhlIHBsYWNlcyB3aGVyZSB0aGlzIGhhcHBlbnMsIGJ1dCB0aGlzIGZpeGVzIHRoZSBidWcsCisg ICAgICAgIGFuZCBsYXlzIHRoZSBncm91bmR3b3JrIGZvciB1c2luZyB0aGlzIG5ldyBjbGllbnQg Y2FsbCBpbnN0ZWFkIG9mIGRpZENoYW5nZVNlbGVjdGlvbgorICAgICAgICBoYWNrcy4KKworICAg ICAgICAqIGVkaXRpbmcvRWRpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6Y2xl YXIpOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpjYW5jZWxDb21wb3NpdGlvbik6CisgICAg ICAgICogbG9hZGVyL0VtcHR5Q2xpZW50cy5oOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6d2lsbFRyYW5zaXRpb25Ub0Nv bW1pdHRlZCk6CisgICAgICAgICogcGFnZS9FZGl0b3JDbGllbnQuaDoKKwogMjAxNC0xMi0xMCAg QW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jhc2ggd2hlbiBj cmVhdGluZyBDU1NDYWxjQmluYXJ5T3BlcmF0aW9uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0VkaXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0 b3IuY3BwCShyZXZpc2lvbiAxNzcwNDApCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRv ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwOTEsNyArMTA5MSwxMSBAQCBFZGl0b3I6On5FZGl0 b3IoKQogCiB2b2lkIEVkaXRvcjo6Y2xlYXIoKQogewotICAgIG1fY29tcG9zaXRpb25Ob2RlID0g MDsKKyAgICBpZiAobV9jb21wb3NpdGlvbk5vZGUpIHsKKyAgICAgICAgbV9jb21wb3NpdGlvbk5v ZGUgPSBudWxscHRyOworICAgICAgICBpZiAoRWRpdG9yQ2xpZW50KiBjbGllbnQgPSB0aGlzLT5j bGllbnQoKSkKKyAgICAgICAgICAgIGNsaWVudC0+ZGlzY2FyZGVkQ29tcG9zaXRpb24oJm1fZnJh bWUpOworICAgIH0KICAgICBtX2N1c3RvbUNvbXBvc2l0aW9uVW5kZXJsaW5lcy5jbGVhcigpOwog ICAgIG1fc2hvdWxkU3R5bGVXaXRoQ1NTID0gZmFsc2U7CiAgICAgbV9kZWZhdWx0UGFyYWdyYXBo U2VwYXJhdG9yID0gRWRpdG9yUGFyYWdyYXBoU2VwYXJhdG9ySXNEaXY7CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oCShyZXZpc2lvbiAxNzcwNDApCisrKyBTb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1Miw2ICs0NTIs NyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGRpZEJlZ2luRWRpdGluZygpIG92ZXJyaWRl IHsgfQogICAgIHZpcnR1YWwgdm9pZCByZXNwb25kVG9DaGFuZ2VkQ29udGVudHMoKSBvdmVycmlk ZSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgcmVzcG9uZFRvQ2hhbmdlZFNlbGVjdGlvbihGcmFtZSop IG92ZXJyaWRlIHsgfQorICAgIHZpcnR1YWwgdm9pZCBkaXNjYXJkZWRDb21wb3NpdGlvbihGcmFt ZSopIG92ZXJyaWRlIHsgfQogICAgIHZpcnR1YWwgdm9pZCBkaWRFbmRFZGl0aW5nKCkgb3ZlcnJp ZGUgeyB9CiAgICAgdmlydHVhbCB2b2lkIHdpbGxXcml0ZVNlbGVjdGlvblRvUGFzdGVib2FyZChS YW5nZSopIG92ZXJyaWRlIHsgfQogICAgIHZpcnR1YWwgdm9pZCBkaWRXcml0ZVNlbGVjdGlvblRv UGFzdGVib2FyZCgpIG92ZXJyaWRlIHsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXIuY3BwCShyZXZpc2lvbiAxNzcwNDApCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MjksOCArNTI5LDEwIEBAIHZvaWQgRnJh bWVMb2FkZXI6OndpbGxUcmFuc2l0aW9uVG9Db21taXQKICAgICBpZiAobV9mcmFtZS5lZGl0b3Io KS5oYXNDb21wb3NpdGlvbigpKSB7CiAgICAgICAgIC8vIFRoZSB0ZXh0IHdhcyBhbHJlYWR5IHBy ZXNlbnQgaW4gRE9NLCBzbyBpdCdzIGJldHRlciB0byBjb25maXJtIHRoYW4gdG8gY2FuY2VsIHRo ZSBjb21wb3NpdGlvbi4KICAgICAgICAgbV9mcmFtZS5lZGl0b3IoKS5jb25maXJtQ29tcG9zaXRp b24oKTsKLSAgICAgICAgaWYgKEVkaXRvckNsaWVudCogZWRpdG9yQ2xpZW50ID0gbV9mcmFtZS5l ZGl0b3IoKS5jbGllbnQoKSkKKyAgICAgICAgaWYgKEVkaXRvckNsaWVudCogZWRpdG9yQ2xpZW50 ID0gbV9mcmFtZS5lZGl0b3IoKS5jbGllbnQoKSkgewogICAgICAgICAgICAgZWRpdG9yQ2xpZW50 LT5yZXNwb25kVG9DaGFuZ2VkU2VsZWN0aW9uKCZtX2ZyYW1lKTsKKyAgICAgICAgICAgIGVkaXRv ckNsaWVudC0+ZGlzY2FyZGVkQ29tcG9zaXRpb24oJm1fZnJhbWUpOworICAgICAgICB9CiAgICAg fQogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0VkaXRvckNsaWVudC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRWRpdG9yQ2xpZW50LmgJKHJldmlzaW9uIDE3NzA0 MCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRWRpdG9yQ2xpZW50LmgJKHdvcmtpbmcgY29weSkK QEAgLTk3LDcgKzk3LDExIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgd2lsbFdyaXRlU2Vs ZWN0aW9uVG9QYXN0ZWJvYXJkKFJhbmdlKikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRXcml0 ZVNlbGVjdGlvblRvUGFzdGVib2FyZCgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZ2V0Q2xpZW50 UGFzdGVib2FyZERhdGFGb3JSYW5nZShSYW5nZSosIFZlY3RvcjxTdHJpbmc+JiBwYXN0ZWJvYXJk VHlwZXMsIFZlY3RvcjxSZWZQdHI8U2hhcmVkQnVmZmVyPj4mIHBhc3RlYm9hcmREYXRhKSA9IDA7 Ci0gICAgCisKKyAgICAvLyBOb3RpZnkgYW4gaW5wdXQgbWV0aG9kIHRoYXQgYSBjb21wb3NpdGlv biB3YXMgdm9sdW50YXJpbHkgZGlzY2FyZGVkIGJ5IFdlYkNvcmUsIHNvIHRoYXQgaXQgY291bGQg Y2xlYW4gdXAgdG9vLgorICAgIC8vIFRoaXMgZnVuY3Rpb24gaXMgbm90IGNhbGxlZCB3aGVuIGEg Y29tcG9zaXRpb24gaXMgY2xvc2VkIHBlciBhIHJlcXVlc3QgZnJvbSBhbiBpbnB1dCBtZXRob2Qu CisgICAgdmlydHVhbCB2b2lkIGRpc2NhcmRlZENvbXBvc2l0aW9uKEZyYW1lKikgPSAwOworCiAg ICAgdmlydHVhbCB2b2lkIHJlZ2lzdGVyVW5kb1N0ZXAoUGFzc1JlZlB0cjxVbmRvU3RlcD4pID0g MDsKICAgICB2aXJ0dWFsIHZvaWQgcmVnaXN0ZXJSZWRvU3RlcChQYXNzUmVmUHRyPFVuZG9TdGVw PikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBjbGVhclVuZG9SZWRvT3BlcmF0aW9ucygpID0gMDsK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NzA4OSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE0LTEyLTEwICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKEFzeW5j IFRleHQgSW5wdXQpOiBUZXh0IGlucHV0IG1ldGhvZCBzdGF0ZSBpcyBub3QgcmVzZXQgd2hlbiBy ZWxvYWRpbmcgYSBwYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzk1MDQKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMTkwMzQ2NzQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJLaXQyIHVzZWQgdG8g bG9vayBhdCBFZGl0b3JTdGF0ZSBjaGFuZ2VzIGFuZCBndWVzcyB3aGVuIHRvIGNhbmNlbCBhIGNv bXBvc2l0aW9uLgorICAgICAgICBUaGlzIHdhcyBxdWl0ZSB1bnJlbGlhYmxlLCBhbmQgbmVlZGxl c3NseSBjb21wbGljYXRlZCAtIFdlYkNvcmUga25vd3Mgd2hlbiBpdCBkZWNpZGVzCisgICAgICAg IHRvIGRlc3Ryb3kgYSBjb21wb3NpdGlvbiwgc28gaXQgbm93IGV4cGxpY2l0bHkgbm90aWZpZXMg dGhlIGNsaWVudHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW06ICgt W1dLVmlldyBfcHJvY2Vzc0RpZEV4aXRdKTogQWRkcmVzcyBjcmFzaGluZyBjYXNlIHRvby4KKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpyZXNldFN0YXRlQWZ0ZXJQcm9jZXNzRXhpdGVkKToKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkVkaXRvckNsaWVudDo6ZGlzY2FyZGVkQ29tcG9zaXRpb24pOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50Lmg6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpk aWRDaGFuZ2VTZWxlY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpkaXNjYXJkZWRD b21wb3NpdGlvbik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKwog MjAxNC0xMi0xMCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAg ICAgIEltcGxlbWVudCBXZWJTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXI6OmNyZWF0ZUxvY2FsU3Rv cmFnZU5hbWVzcGFjZQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAJKHJldmlzaW9uIDE3NzA0MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NTU1LDYgKzQ1NTUsMTEgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OnJlc2V0U3RhdGVBZnRlclByb2NlcwogICAgIG1faXNWYWxpZCA9IGZhbHNl OwogICAgIG1faXNQYWdlU3VzcGVuZGVkID0gZmFsc2U7CiAKKyAgICBtX2VkaXRvclN0YXRlID0g RWRpdG9yU3RhdGUoKTsKKyNpZiBQTEFURk9STShNQUMpICYmICFVU0UoQVNZTkNfTlNURVhUSU5Q VVRDTElFTlQpCisgICAgbV90ZW1wb3JhcmlseUNsb3NlZENvbXBvc2l0aW9uID0gZmFsc2U7Cisj ZW5kaWYKKwogICAgIG1fcGFnZUNsaWVudC5wcm9jZXNzRGlkRXhpdCgpOwogCiAgICAgcmVzZXRT dGF0ZShSZXNldFN0YXRlUmVhc29uOjpXZWJQcm9jZXNzRXhpdGVkKTsKQEAgLTQ1NzYsMTIgKzQ1 ODEsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVzZXRTdGF0ZUFmdGVyUHJvY2VzCiAgICAgbV90 b3VjaEV2ZW50UXVldWUuY2xlYXIoKTsKICNlbmRpZgogCi0gICAgLy8gRklYTUU6IFJlc2V0IG1f ZWRpdG9yU3RhdGUuCi0gICAgLy8gRklYTUU6IE5vdGlmeSBpbnB1dCBtZXRob2RzIGFib3V0IGFi YW5kb25lZCBjb21wb3NpdGlvbi4KLSNpZiBQTEFURk9STShNQUMpICYmICFVU0UoQVNZTkNfTlNU RVhUSU5QVVRDTElFTlQpCi0gICAgbV90ZW1wb3JhcmlseUNsb3NlZENvbXBvc2l0aW9uID0gZmFs c2U7Ci0jZW5kaWYKLQogI2lmIFBMQVRGT1JNKE1BQykKICAgICBkaXNtaXNzQ29ycmVjdGlvblBh bmVsKFJlYXNvbkZvckRpc21pc3NpbmdBbHRlcm5hdGl2ZVRleHRJZ25vcmVkKTsKICAgICBtX3Bh Z2VDbGllbnQuZGlzbWlzc0RpY3Rpb25hcnlMb29rdXBQYW5lbCgpOwpJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkocmV2aXNpb24gMTc3MDQwKQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCSh3b3JraW5nIGNvcHkp CkBAIC0yODc3LDYgKzI4NzcsOCBAQCAtIChXZWJLaXQ6OkNvbG9yU3BhY2VEYXRhKV9jb2xvclNw YWNlCiAKIC0gKHZvaWQpX3Byb2Nlc3NEaWRFeGl0CiB7CisgICAgW3NlbGYgX25vdGlmeUlucHV0 Q29udGV4dEFib3V0RGlzY2FyZGVkQ29tcG9zaXRpb25dOworCiAgICAgaWYgKF9kYXRhLT5fbGF5 ZXJIb3N0aW5nVmlldykKICAgICAgICAgW3NlbGYgX3NldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdN b2RlUm9vdExheWVyOm5pbF07CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5jcHAJKHJldmlz aW9uIDE3NzA0MCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv V2ViRWRpdG9yQ2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTkwLDYgKzE5MCwxMSBAQCB2 b2lkIFdlYkVkaXRvckNsaWVudDo6cmVzcG9uZFRvQ2hhbmdlZFNlCiAjZW5kaWYKIH0KIAordm9p ZCBXZWJFZGl0b3JDbGllbnQ6OmRpc2NhcmRlZENvbXBvc2l0aW9uKEZyYW1lKikKK3sKKyAgICBt X3BhZ2UtPmRpc2NhcmRlZENvbXBvc2l0aW9uKCk7Cit9CisKIHZvaWQgV2ViRWRpdG9yQ2xpZW50 OjpkaWRFbmRFZGl0aW5nKCkKIHsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8U3RyaW5nPiBX ZWJWaWV3RGlkRW5kRWRpdGluZ05vdGlmaWNhdGlvbihBU0NJSUxpdGVyYWwoIldlYlZpZXdEaWRF bmRFZGl0aW5nTm90aWZpY2F0aW9uIikpOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5oCShyZXZp c2lvbiAxNzcwNDApCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkVkaXRvckNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC02NCw2ICs2NCw3IEBAIHByaXZh dGU6CiAgICAgdmlydHVhbCB2b2lkIGRpZEJlZ2luRWRpdGluZygpIG92ZXJyaWRlOwogICAgIHZp cnR1YWwgdm9pZCByZXNwb25kVG9DaGFuZ2VkQ29udGVudHMoKSBvdmVycmlkZTsKICAgICB2aXJ0 dWFsIHZvaWQgcmVzcG9uZFRvQ2hhbmdlZFNlbGVjdGlvbihXZWJDb3JlOjpGcmFtZSopIG92ZXJy aWRlOworICAgIHZpcnR1YWwgdm9pZCBkaXNjYXJkZWRDb21wb3NpdGlvbihXZWJDb3JlOjpGcmFt ZSopIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBkaWRFbmRFZGl0aW5nKCkgb3ZlcnJpZGU7 CiAgICAgdmlydHVhbCB2b2lkIHdpbGxXcml0ZVNlbGVjdGlvblRvUGFzdGVib2FyZChXZWJDb3Jl OjpSYW5nZSopIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBkaWRXcml0ZVNlbGVjdGlvblRv UGFzdGVib2FyZCgpIG92ZXJyaWRlOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gMTc3MDQwKQorKysgU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Mzcz LDYgKzQzNzMsNyBAQCB2b2lkIFdlYlBhZ2U6OmRpZENoYW5nZVNlbGVjdGlvbigpCiAjaWYgUExB VEZPUk0oTUFDKSAmJiBVU0UoQVNZTkNfTlNURVhUSU5QVVRDTElFTlQpCiAgICAgRnJhbWUmIGZy YW1lID0gbV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1c2VkT3JNYWluRnJhbWUoKTsKICAg ICAvLyBBYmFuZG9uIHRoZSBjdXJyZW50IGlubGluZSBpbnB1dCBzZXNzaW9uIGlmIHNlbGVjdGlv biBjaGFuZ2VkIGZvciBhbnkgb3RoZXIgcmVhc29uIGJ1dCBhbiBpbnB1dCBtZXRob2QgZGlyZWN0 IGFjdGlvbi4KKyAgICAvLyBGSVhNRTogVGhpcyBsb2dpYyBzaG91bGQgYmUgaW4gV2ViQ29yZS4K ICAgICAvLyBGSVhNRTogTWFueSBjaGFuZ2VzIHRoYXQgYWZmZWN0IGNvbXBvc2l0aW9uIG5vZGUg ZG8gbm90IGdvIHRocm91Z2ggZGlkQ2hhbmdlU2VsZWN0aW9uKCkuIFdlIG5lZWQgdG8gZG8gc29t ZXRoaW5nIHdoZW4gRE9NIG1hbmlwdWxhdGlvbiBhZmZlY3RzIHRoZSBjb21wb3NpdGlvbiwgYmVj YXVzZSBvdGhlcndpc2UgaW5wdXQgbWV0aG9kJ3MgaWRlYSBhYm91dCBpdCB3aWxsIGJlIGRpZmZl cmVudCBmcm9tIEVkaXRvcidzLgogICAgIC8vIEZJWE1FOiBXZSBjYW4ndCBjYW5jZWwgY29tcG9z aXRpb24gd2hlbiBzZWxlY3Rpb24gY2hhbmdlcyB0byBOb1NlbGVjdGlvbiwgYnV0IHdlIHByb2Jh Ymx5IHNob3VsZC4KICAgICBpZiAoZnJhbWUuZWRpdG9yKCkuaGFzQ29tcG9zaXRpb24oKSAmJiAh ZnJhbWUuZWRpdG9yKCkuaWdub3JlQ29tcG9zaXRpb25TZWxlY3Rpb25DaGFuZ2UoKSAmJiAhZnJh bWUuc2VsZWN0aW9uKCkuaXNOb25lKCkpIHsKQEAgLTQzODksNiArNDM5MCwxMSBAQCB2b2lkIFdl YlBhZ2U6OmRpZENoYW5nZVNlbGVjdGlvbigpCiAjZW5kaWYKIH0KIAordm9pZCBXZWJQYWdlOjpk aXNjYXJkZWRDb21wb3NpdGlvbigpCit7CisgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjpDb21wb3NpdGlvbldhc0NhbmNlbGVkKGVkaXRvclN0YXRlKCkpKTsKK30KKwogdm9pZCBXZWJQ YWdlOjpzZXRNaW5pbXVtTGF5b3V0U2l6ZShjb25zdCBJbnRTaXplJiBtaW5pbXVtTGF5b3V0U2l6 ZSkKIHsKICAgICBpZiAobV9taW5pbXVtTGF5b3V0U2l6ZSA9PSBtaW5pbXVtTGF5b3V0U2l6ZSkK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkocmV2 aXNpb24gMTc3MDQwKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuaAkod29ya2luZyBjb3B5KQpAQCAtNjAwLDYgKzYwMCw3IEBAIHB1YmxpYzoKICNlbmRpZgog CiAgICAgdm9pZCBkaWRDaGFuZ2VTZWxlY3Rpb24oKTsKKyAgICB2b2lkIGRpc2NhcmRlZENvbXBv c2l0aW9uKCk7CiAKICNpZiBQTEFURk9STShDT0NPQSkKICAgICB2b2lkIHJlZ2lzdGVyVUlQcm9j ZXNzQWNjZXNzaWJpbGl0eVRva2Vucyhjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGVsZW1lblRv a2VuLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIHdpbmRvd1Rva2VuKTsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE3NzA4OSkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE0LTEyLTEwICBBbGV4ZXkgUHJv c2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKEFzeW5jIFRl eHQgSW5wdXQpOiBUZXh0IGlucHV0IG1ldGhvZCBzdGF0ZSBpcyBub3QgcmVzZXQgd2hlbiByZWxv YWRpbmcgYSBwYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzk1MDQKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMTkwMzQ2NzQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdHViIG91dCBuZXcgY2xpZW50 IGNhbGxzLCB0aGlzIHBhdGNoIGRvZXMgbm90IGF0dGVtcHQgdG8gbWFrZSBhbnkgY2hhbmdlcyBv biBXZWJLaXQxLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50Lmg6 CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50Lm1tOgorICAgICAgICAo V2ViRWRpdG9yQ2xpZW50OjpkaXNjYXJkZWRDb21wb3NpdGlvbik6CisKIDIwMTQtMTItMTAgIEFu ZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgV2ViU3Rv cmFnZU5hbWVzcGFjZVByb3ZpZGVyOjpjbG9zZUxvY2FsU3RvcmFnZQpJbmRleDogU291cmNlL1dl YktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50LmgJKHJldmlz aW9uIDE3NzA0MCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRv ckNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTAsNiArMTEwLDcgQEAgcHJpdmF0ZToKIAog ICAgIHZpcnR1YWwgdm9pZCByZXNwb25kVG9DaGFuZ2VkQ29udGVudHMoKSBvdmVycmlkZTsKICAg ICB2aXJ0dWFsIHZvaWQgcmVzcG9uZFRvQ2hhbmdlZFNlbGVjdGlvbihXZWJDb3JlOjpGcmFtZSop IG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCBkaXNjYXJkZWRDb21wb3NpdGlvbihXZWJDb3Jl OjpGcmFtZSopIG92ZXJyaWRlOwogCiAgICAgdmlydHVhbCB2b2lkIHJlZ2lzdGVyVW5kb1N0ZXAo UGFzc1JlZlB0cjxXZWJDb3JlOjpVbmRvU3RlcD4pIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9p ZCByZWdpc3RlclJlZG9TdGVwKFBhc3NSZWZQdHI8V2ViQ29yZTo6VW5kb1N0ZXA+KSBvdmVycmlk ZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVu dC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJF ZGl0b3JDbGllbnQubW0JKHJldmlzaW9uIDE3NzA0MCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dl YkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5tbQkod29ya2luZyBjb3B5KQpAQCAtMzUzLDYg KzM1MywxMSBAQCB2b2lkIFdlYkVkaXRvckNsaWVudDo6cmVzcG9uZFRvQ2hhbmdlZFNlCiAjZW5k aWYKIH0KIAordm9pZCBXZWJFZGl0b3JDbGllbnQ6OmRpc2NhcmRlZENvbXBvc2l0aW9uKEZyYW1l KikKK3sKKyAgICAvLyBUaGUgZWZmZWN0cyBvZiB0aGlzIGZ1bmN0aW9uIGFyZSBjdXJyZW50bHkg YWNoaWV2ZWQgdmlhIC1bV2ViSFRNTFZpZXcgX3VwZGF0ZVNlbGVjdGlvbkZvcklucHV0TWFuYWdl cl0uCit9CisKIHZvaWQgV2ViRWRpdG9yQ2xpZW50OjpkaWRFbmRFZGl0aW5nKCkKIHsKICNpZiAh UExBVEZPUk0oSU9TKQpJbmRleDogU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwkocmV2aXNpb24gMTc3MDg5KQorKysg U291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTQtMTItMTAgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAg ICAgICAgUkVHUkVTU0lPTiAoQXN5bmMgVGV4dCBJbnB1dCk6IFRleHQgaW5wdXQgbWV0aG9kIHN0 YXRlIGlzIG5vdCByZXNldCB3aGVuIHJlbG9hZGluZyBhIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTUwNAorICAgICAgICByZGFyOi8vcHJv YmxlbS8xOTAzNDY3NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFN0dWIgb3V0IG5ldyBjbGllbnQgY2FsbHMsIHRoaXMgcGF0Y2ggZG9lc24ndCBhdHRl bXB0IHRvIG1ha2UgYW55IGNoYW5nZXMgb24gV2luZG93cy4KKworICAgICAgICAqIFdlYkNvcmVT dXBwb3J0L1dlYkVkaXRvckNsaWVudC5jcHA6CisgICAgICAgIChXZWJFZGl0b3JDbGllbnQ6OmRp c2NhcmRlZENvbXBvc2l0aW9uKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JD bGllbnQuaDoKKwogMjAxNC0xMi0wOSAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtp dC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE3NzAzNy4KSW5kZXg6 IFNvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xp ZW50LmNwcAkocmV2aXNpb24gMTc3MDQwKQorKysgU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1 cHBvcnQvV2ViRWRpdG9yQ2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjE5LDYgKzIxOSwx MSBAQCB2b2lkIFdlYkVkaXRvckNsaWVudDo6cmVzcG9uZFRvQ2hhbmdlZFNlCiAgICAgbm90aWZ5 Q2VudGVyLT5wb3N0Tm90aWZpY2F0aW9uTmFtZSh3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90 aWZpY2F0aW9uTmFtZSwgc3RhdGljX2Nhc3Q8SVdlYlZpZXcqPihtX3dlYlZpZXcpLCAwKTsKIH0K IAordm9pZCBXZWJFZGl0b3JDbGllbnQ6OmRpc2NhcmRlZENvbXBvc2l0aW9uKEZyYW1lKikKK3sK KyAgICBub3RJbXBsZW1lbnRlZCgpOworfQorCiB2b2lkIFdlYkVkaXRvckNsaWVudDo6ZGlkRW5k RWRpdGluZygpCiB7CiAgICAgbm90SW1wbGVtZW50ZWQoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQv d2luL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5oCShyZXZpc2lvbiAx NzcwNDApCisrKyBTb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGll bnQuaAkod29ya2luZyBjb3B5KQpAQCAtNjAsNiArNjAsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0 dWFsIHZvaWQgcmVzcG9uZFRvQ2hhbmdlZENvbnRlbnRzKCk7CiAgICAgdmlydHVhbCB2b2lkIHJl c3BvbmRUb0NoYW5nZWRTZWxlY3Rpb24oV2ViQ29yZTo6RnJhbWUqKTsKKyAgICB2aXJ0dWFsIHZv aWQgZGlzY2FyZGVkQ29tcG9zaXRpb24oV2ViQ29yZTo6RnJhbWUqKSBvdmVycmlkZTsKIAogICAg IGJvb2wgc2hvdWxkRGVsZXRlUmFuZ2UoV2ViQ29yZTo6UmFuZ2UqKTsKIAo=