67360 2011-08-31 22:57:22 -0700 updateInnerTextValue should be moved into InputType 2011-11-07 18:58:49 -0800 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 66241 67697 67742 1 rniwa rniwa ap darin dglazkov tkent oldest_to_newest 460236 0 rniwa 2011-08-31 22:57:22 -0700 HTMLInputElement::updateInnerTextValue added in the patch for the bug 66241 should be pushed into InputType. 462958 1 106507 rniwa 2011-09-06 15:50:41 -0700 Created attachment 106507 work in progress There is a subtle bug that inner text value isn't updated when input.value is set. 463058 2 106507 tkent 2011-09-06 18:51:09 -0700 Comment on attachment 106507 work in progress View in context: https://bugs.webkit.org/attachment.cgi?id=106507&action=review > Source/WebCore/html/TextInputType.cpp:53 > + // FIXME: should this be moved to TextFieldInputType? I think so. It looks a bug of the current code. 463067 3 106507 rniwa 2011-09-06 18:58:57 -0700 Comment on attachment 106507 work in progress View in context: https://bugs.webkit.org/attachment.cgi?id=106507&action=review >> Source/WebCore/html/TextInputType.cpp:53 >> + // FIXME: should this be moved to TextFieldInputType? > > I think so. It looks a bug of the current code. Okay. Let me see if I can come up with a test. 497674 4 rniwa 2011-11-07 18:58:49 -0800 This has already been done elsewhere. 106507 2011-09-06 15:50:41 -0700 2011-09-06 18:58:57 -0700 work in progress wip67360 text/plain 12699 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcAkocmV2aXNpb24g OTQ1OTEpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC01ODksNyArNTg5LDcgQEAKICAgICAgICAgdXBkYXRlVmFsdWVJZk5lZWRl ZCgpOwogCiAgICAgc2V0Rm9ybUNvbnRyb2xWYWx1ZU1hdGNoZXNSZW5kZXJlcihmYWxzZSk7Ci0g ICAgdXBkYXRlSW5uZXJUZXh0VmFsdWUoKTsKKyAgICBtX2lucHV0VHlwZS0+dXBkYXRlSW5uZXJU ZXh0VmFsdWUoKTsKIAogICAgIG1fd2FzTW9kaWZpZWRCeVVzZXIgPSBmYWxzZTsKIApAQCAtNjIz LDIwICs2MjMsNiBAQAogICAgIG5vdGlmeUZvcm1TdGF0ZUNoYW5nZWQoKTsKIH0KIAotdm9pZCBI VE1MSW5wdXRFbGVtZW50Ojp1cGRhdGVJbm5lclRleHRWYWx1ZSgpCi17Ci0gICAgaWYgKCFpc1Rl eHRGaWVsZCgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAoIXN1Z2dlc3RlZFZhbHVlKCku aXNOdWxsKCkpCi0gICAgICAgIHNldElubmVyVGV4dFZhbHVlKHN1Z2dlc3RlZFZhbHVlKCkpOwot ICAgIGVsc2UgaWYgKCFmb3JtQ29udHJvbFZhbHVlTWF0Y2hlc1JlbmRlcmVyKCkpIHsKLSAgICAg ICAgLy8gVXBkYXRlIHRoZSByZW5kZXJlciB2YWx1ZSBpZiB0aGUgZm9ybUNvbnRyb2xWYWx1ZU1h dGNoZXNSZW5kZXJlcigpIGZsYWcgaXMgZmFsc2UuCi0gICAgICAgIC8vIEl0IHByb3RlY3RzIGFu IHVuYWNjZXB0YWJsZSByZW5kZXJlciB2YWx1ZSBmcm9tIGJlaW5nIG92ZXJ3cml0dGVuIHdpdGgg dGhlIERPTSB2YWx1ZS4KLSAgICAgICAgc2V0SW5uZXJUZXh0VmFsdWUodmlzaWJsZVZhbHVlKCkp OwotICAgIH0KLX0KLQogdm9pZCBIVE1MSW5wdXRFbGVtZW50OjpzdWJ0cmVlSGFzQ2hhbmdlZCgp CiB7CiAgICAgQVNTRVJUKGlzVGV4dEZpZWxkKCkpOwpAQCAtODUzLDcgKzgzOSw3IEBACiAjZW5k aWYKICAgICBlbHNlCiAgICAgICAgIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50OjpwYXJzZU1h cHBlZEF0dHJpYnV0ZShhdHRyKTsKLSAgICB1cGRhdGVJbm5lclRleHRWYWx1ZSgpOworICAgIG1f aW5wdXRUeXBlLT51cGRhdGVJbm5lclRleHRWYWx1ZSgpOwogfQogCiB2b2lkIEhUTUxJbnB1dEVs ZW1lbnQ6OmZpbmlzaFBhcnNpbmdDaGlsZHJlbigpCkBAIC0xMDc0LDcgKzEwNjAsNyBAQAogICAg IG1fc3VnZ2VzdGVkVmFsdWUgPSBzYW5pdGl6ZVZhbHVlKHZhbHVlKTsKICAgICB1cGRhdGVQbGFj ZWhvbGRlclZpc2liaWxpdHkoZmFsc2UpOwogICAgIHNldE5lZWRzU3R5bGVSZWNhbGMoKTsKLSAg ICB1cGRhdGVJbm5lclRleHRWYWx1ZSgpOworICAgIG1faW5wdXRUeXBlLT51cGRhdGVJbm5lclRl eHRWYWx1ZSgpOwogfQogCiB2b2lkIEhUTUxJbnB1dEVsZW1lbnQ6OnNldFZhbHVlKGNvbnN0IFN0 cmluZyYgdmFsdWUsIGJvb2wgc2VuZENoYW5nZUV2ZW50KQpAQCAtMTEwMiwzNSArMTA4OCwxNyBA QAogCiAgICAgc2V0TmVlZHNWYWxpZGl0eUNoZWNrKCk7CiAKKyAgICBtX3N1Z2dlc3RlZFZhbHVl ID0gU3RyaW5nKCk7CiAgICAgaWYgKHZhbHVlQ2hhbmdlZCkKLSAgICAgICAgdXBkYXRlSW5uZXJU ZXh0VmFsdWUoKTsKKyAgICAgICAgbV9pbnB1dFR5cGUtPnVwZGF0ZUlubmVyVGV4dFZhbHVlKCk7 CiAKLSAgICBpZiAoaXNUZXh0RmllbGQoKSkgewotICAgICAgICB1bnNpZ25lZCBtYXggPSB2aXNp YmxlVmFsdWUoKS5sZW5ndGgoKTsKLSAgICAgICAgaWYgKGRvY3VtZW50KCktPmZvY3VzZWROb2Rl KCkgPT0gdGhpcykKLSAgICAgICAgICAgIHNldFNlbGVjdGlvblJhbmdlKG1heCwgbWF4KTsKLSAg ICAgICAgZWxzZQotICAgICAgICAgICAgY2FjaGVTZWxlY3Rpb24obWF4LCBtYXgsIFNlbGVjdGlv bkhhc05vRGlyZWN0aW9uKTsKLSAgICAgICAgbV9zdWdnZXN0ZWRWYWx1ZSA9IFN0cmluZygpOwot ICAgIH0KKyAgICBtX2lucHV0VHlwZS0+cmVzcG9uZFRvU2V0VmFsdWUodmFsdWVDaGFuZ2VkLCBz ZW5kQ2hhbmdlRXZlbnQpOwogCiAgICAgaWYgKCF2YWx1ZUNoYW5nZWQpCiAgICAgICAgIHJldHVy bjsKLSAgICAKLSAgICBtX2lucHV0VHlwZS0+dmFsdWVDaGFuZ2VkKCk7CiAKLSAgICBpZiAoc2Vu ZENoYW5nZUV2ZW50KSB7Ci0gICAgICAgIC8vIElmIHRoZSB1c2VyIGlzIHN0aWxsIGVkaXRpbmcg dGhpcyBmaWVsZCwgZGlzcGF0Y2ggYW4gaW5wdXQgZXZlbnQgcmF0aGVyIHRoYW4gYSBjaGFuZ2Ug ZXZlbnQuCi0gICAgICAgIC8vIFRoZSBjaGFuZ2UgZXZlbnQgd2lsbCBiZSBkaXNwYXRjaGVkIHdo ZW4gZWRpdGluZyBmaW5pc2hlcy4KLSAgICAgICAgaWYgKGlzVGV4dEZpZWxkKCkgJiYgZm9jdXNl ZCgpKQotICAgICAgICAgICAgZGlzcGF0Y2hGb3JtQ29udHJvbElucHV0RXZlbnQoKTsKLSAgICAg ICAgZWxzZQotICAgICAgICAgICAgZGlzcGF0Y2hGb3JtQ29udHJvbENoYW5nZUV2ZW50KCk7Ci0g ICAgfQotCi0gICAgaWYgKGlzVGV4dCgpICYmICghZm9jdXNlZCgpIHx8ICFzZW5kQ2hhbmdlRXZl bnQpKQotICAgICAgICBzZXRUZXh0QXNPZkxhc3RGb3JtQ29udHJvbENoYW5nZUV2ZW50KHZhbHVl KTsKLQorICAgIGlmIChzZW5kQ2hhbmdlRXZlbnQpCisgICAgICAgIGRpc3BhdGNoRm9ybUNvbnRy b2xDaGFuZ2VFdmVudCgpOwogICAgIG5vdGlmeUZvcm1TdGF0ZUNoYW5nZWQoKTsKIH0KIApJbmRl eDogU291cmNlL1dlYkNvcmUvaHRtbC9SYW5nZUlucHV0VHlwZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2h0bWwvUmFuZ2VJbnB1dFR5cGUuaAkocmV2aXNpb24gOTQ1OTEpCisrKyBT b3VyY2UvV2ViQ29yZS9odG1sL1JhbmdlSW5wdXRUeXBlLmgJKHdvcmtpbmcgY29weSkKQEAgLTY2 LDcgKzY2LDcgQEAKICAgICB2aXJ0dWFsIFN0cmluZyBzZXJpYWxpemUoZG91YmxlKSBjb25zdDsK ICAgICB2aXJ0dWFsIHZvaWQgYWNjZXNzS2V5QWN0aW9uKGJvb2wgc2VuZFRvQW55RWxlbWVudCk7 CiAgICAgdmlydHVhbCB2b2lkIG1pbk9yTWF4QXR0cmlidXRlQ2hhbmdlZCgpOwotICAgIHZpcnR1 YWwgdm9pZCB2YWx1ZUNoYW5nZWQoKTsKKyAgICB2aXJ0dWFsIHZvaWQgcmVzcG9uZFRvU2V0VmFs dWUoYm9vbCB2YWx1ZUNoYW5nZWQsIGJvb2wmIHNlbmRDaGFuZ2VFdmVudCk7CiAgICAgdmlydHVh bCBTdHJpbmcgZmFsbGJhY2tWYWx1ZSgpOwogICAgIHZpcnR1YWwgU3RyaW5nIHNhbml0aXplVmFs dWUoY29uc3QgU3RyaW5nJiBwcm9wb3NlZFZhbHVlKTsKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxk UmVzcGVjdExpc3RBdHRyaWJ1dGUoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSW5wdXRU eXBlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0lucHV0VHlwZS5jcHAJ KHJldmlzaW9uIDk0NTkxKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00NDksNyArNDQ5LDcgQEAKIHsKIH0KIAotdm9pZCBJbnB1dFR5cGU6 OnZhbHVlQ2hhbmdlZCgpCit2b2lkIElucHV0VHlwZTo6cmVzcG9uZFRvU2V0VmFsdWUoYm9vbCwg Ym9vbCYpCiB7CiB9CiAKQEAgLTY5MSw2ICs2OTEsMTAgQEAKIHsKIH0KIAordm9pZCBJbnB1dFR5 cGU6OnVwZGF0ZUlubmVyVGV4dFZhbHVlKCkKK3sKK30KKwogdm9pZCBJbnB1dFR5cGU6Om11bHRp cGxlQXR0cmlidXRlQ2hhbmdlZCgpCiB7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL1Rl eHRGaWVsZElucHV0VHlwZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9U ZXh0RmllbGRJbnB1dFR5cGUuY3BwCShyZXZpc2lvbiA5NDU5MSkKKysrIFNvdXJjZS9XZWJDb3Jl L2h0bWwvVGV4dEZpZWxkSW5wdXRUeXBlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjgsNiArNjgs MjcgQEAKICAgICByZXR1cm4gdmFsdWUuaXNFbXB0eSgpOwogfQogCit2b2lkIFRleHRGaWVsZElu cHV0VHlwZTo6cmVzcG9uZFRvU2V0VmFsdWUoYm9vbCB2YWx1ZUNoYW5nZWQsIGJvb2wmIHNlbmRD aGFuZ2VFdmVudCkKK3sKKyAgICBJbnB1dFR5cGU6OnJlc3BvbmRUb1NldFZhbHVlKHZhbHVlQ2hh bmdlZCwgc2VuZENoYW5nZUV2ZW50KTsKKworICAgIC8vIFdlIGRvbid0IGNhbGwgSW5wdXRUeXBl IGJlY2F1c2UgaXQnbGwgYWx3YXlzIGZpcmUgZGlzcGF0Y2hGb3JtQ29udHJvbENoYW5nZUV2ZW50 KCkuCisgICAgdW5zaWduZWQgbWF4ID0gdmlzaWJsZVZhbHVlKCkubGVuZ3RoKCk7CisKKyAgICAv LyBGSVhNRTogc2hvdWxkIHdlIGp1c3QgY2FsbCBmb2N1c2VkKCkgaW5zdGVhZD8KKyAgICBpZiAo ZWxlbWVudCgpLT5kb2N1bWVudCgpLT5mb2N1c2VkTm9kZSgpID09IGVsZW1lbnQoKSkKKyAgICAg ICAgZWxlbWVudCgpLT5zZXRTZWxlY3Rpb25SYW5nZShtYXgsIG1heCk7CisgICAgZWxzZQorICAg ICAgICBlbGVtZW50KCktPmNhY2hlU2VsZWN0aW9uKG1heCwgbWF4LCBTZWxlY3Rpb25IYXNOb0Rp cmVjdGlvbik7CisKKyAgICBpZiAodmFsdWVDaGFuZ2VkICYmIHNlbmRDaGFuZ2VFdmVudCAmJiBl bGVtZW50KCktPmZvY3VzZWQoKSkgeworICAgICAgICAvLyBJZiB0aGUgdXNlciBpcyBzdGlsbCBl ZGl0aW5nIHRoaXMgZmllbGQsIGRpc3BhdGNoIGFuIGlucHV0IGV2ZW50IHJhdGhlciB0aGFuIGEg Y2hhbmdlIGV2ZW50LgorICAgICAgICAvLyBUaGUgY2hhbmdlIGV2ZW50IHdpbGwgYmUgZGlzcGF0 Y2hlZCB3aGVuIGVkaXRpbmcgZmluaXNoZXMuCisgICAgICAgIGVsZW1lbnQoKS0+ZGlzcGF0Y2hG b3JtQ29udHJvbElucHV0RXZlbnQoKTsKKyAgICAgICAgc2VuZENoYW5nZUV2ZW50ID0gZmFsc2U7 CisgICAgfQorfQorCiBib29sIFRleHRGaWVsZElucHV0VHlwZTo6Y2FuU2V0U3VnZ2VzdGVkVmFs dWUoKQogewogICAgIHJldHVybiB0cnVlOwpAQCAtMzU4LDQgKzM3OSwxNiBAQAogICAgIEFTU0VS VCghZWMpOwogfQogCit2b2lkIFRleHRGaWVsZElucHV0VHlwZTo6dXBkYXRlSW5uZXJUZXh0VmFs dWUoKQoreworICAgIGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkVmFsdWUgPSBlbGVtZW50KCktPnN1 Z2dlc3RlZFZhbHVlKCk7CisgICAgaWYgKCFzdWdnZXN0ZWRWYWx1ZS5pc051bGwoKSkKKyAgICAg ICAgZWxlbWVudCgpLT5zZXRJbm5lclRleHRWYWx1ZShzdWdnZXN0ZWRWYWx1ZSk7CisgICAgZWxz ZSBpZiAoIWVsZW1lbnQoKS0+Zm9ybUNvbnRyb2xWYWx1ZU1hdGNoZXNSZW5kZXJlcigpKSB7Cisg ICAgICAgIC8vIFVwZGF0ZSB0aGUgcmVuZGVyZXIgdmFsdWUgaWYgdGhlIGZvcm1Db250cm9sVmFs dWVNYXRjaGVzUmVuZGVyZXIoKSBmbGFnIGlzIGZhbHNlLgorICAgICAgICAvLyBJdCBwcm90ZWN0 cyBhbiB1bmFjY2VwdGFibGUgcmVuZGVyZXIgdmFsdWUgZnJvbSBiZWluZyBvdmVyd3JpdHRlbiB3 aXRoIHRoZSBET00gdmFsdWUuCisgICAgICAgIGVsZW1lbnQoKS0+c2V0SW5uZXJUZXh0VmFsdWUo ZWxlbWVudCgpLT52aXNpYmxlVmFsdWUoKSk7CisgICAgfQorfQorCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL051bWJlcklucHV0VHlwZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9OdW1iZXJJbnB1dFR5cGUuY3BwCShyZXZp c2lvbiA5NDU5MSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvTnVtYmVySW5wdXRUeXBlLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjgwLDcgKzI4MCw3IEBACiAKICAgICAvLyBXZSBuZWVkIHRvIHJl c2V0IHRoZSByZW5kZXJlciB2YWx1ZSBleHBsaWNpdGx5IGJlY2F1c2UgYW4gdW5hY2NlcHRhYmxl CiAgICAgLy8gcmVuZGVyZXIgdmFsdWUgc2hvdWxkIGJlIHB1cmdlZCBiZWZvcmUgc3R5bGUgY2Fs Y3VsYXRpb24uCi0gICAgZWxlbWVudCgpLT51cGRhdGVJbm5lclRleHRWYWx1ZSgpOworICAgIHVw ZGF0ZUlubmVyVGV4dFZhbHVlKCk7CiB9CiAKIFN0cmluZyBOdW1iZXJJbnB1dFR5cGU6OnZpc2li bGVWYWx1ZSgpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL1RleHRGaWVsZElucHV0 VHlwZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvVGV4dEZpZWxkSW5wdXRU eXBlLmgJKHJldmlzaW9uIDk0NTkxKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9UZXh0RmllbGRJ bnB1dFR5cGUuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsNiArNDMsNyBAQAogcHJvdGVjdGVkOgog ICAgIFRleHRGaWVsZElucHV0VHlwZShIVE1MSW5wdXRFbGVtZW50Kik7CiAgICAgdmlydHVhbCB+ VGV4dEZpZWxkSW5wdXRUeXBlKCk7CisgICAgdmlydHVhbCB2b2lkIHJlc3BvbmRUb1NldFZhbHVl KGJvb2wgdmFsdWVDaGFuZ2VkLCBib29sJiBzZW5kQ2hhbmdlRXZlbnQpOwogICAgIHZpcnR1YWwg Ym9vbCBjYW5TZXRTdWdnZXN0ZWRWYWx1ZSgpOwogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVLZXlk b3duRXZlbnQoS2V5Ym9hcmRFdmVudCopOwogICAgIHZvaWQgaGFuZGxlS2V5ZG93bkV2ZW50Rm9y U3BpbkJ1dHRvbihLZXlib2FyZEV2ZW50Kik7CkBAIC02Miw2ICs2Myw3IEBACiAgICAgdmlydHVh bCB2b2lkIGRlc3Ryb3lTaGFkb3dTdWJ0cmVlKCk7CiAgICAgdmlydHVhbCB2b2lkIGRpc2FibGVk QXR0cmlidXRlQ2hhbmdlZCgpOwogICAgIHZpcnR1YWwgdm9pZCByZWFkb25seUF0dHJpYnV0ZUNo YW5nZWQoKTsKKyAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlSW5uZXJUZXh0VmFsdWUoKTsKIAogcHJp dmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgaXNUZXh0RmllbGQoKSBjb25zdDsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2h0bWwvQ29sb3JJbnB1dFR5cGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2h0bWwvQ29sb3JJbnB1dFR5cGUuY3BwCShyZXZpc2lvbiA5NDU5MSkKKysrIFNvdXJj ZS9XZWJDb3JlL2h0bWwvQ29sb3JJbnB1dFR5cGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjEs OCArMTIxLDEwIEBACiAgICAgdXBkYXRlQ29sb3JTd2F0Y2goKTsKIH0KIAotdm9pZCBDb2xvcklu cHV0VHlwZTo6dmFsdWVDaGFuZ2VkKCkKK3ZvaWQgQ29sb3JJbnB1dFR5cGU6OnJlc3BvbmRUb1Nl dFZhbHVlKGJvb2wgdmFsdWVDaGFuZ2VkLCBib29sJiBzZW5kQ2hhbmdlRXZlbnQpCiB7CisgICAg SW5wdXRUeXBlOjpyZXNwb25kVG9TZXRWYWx1ZSh2YWx1ZUNoYW5nZWQsIHNlbmRDaGFuZ2VFdmVu dCk7CisKICAgICB1cGRhdGVDb2xvclN3YXRjaCgpOwogICAgIGlmIChDb2xvckNob29zZXI6OmNo b29zZXIoKS0+Y2xpZW50KCkgPT0gdGhpcykgewogICAgICAgICBpZiAoQ2hyb21lKiBjaHJvbWUg PSB0aGlzLT5jaHJvbWUoKSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSW5wdXRUeXBlLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9JbnB1dFR5cGUuaAkocmV2aXNpb24g OTQ1OTEpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0lucHV0VHlwZS5oCSh3b3JraW5nIGNvcHkp CkBAIC0yMTMsNyArMjEzLDcgQEAKICAgICB2aXJ0dWFsIHZvaWQgc3RlcEF0dHJpYnV0ZUNoYW5n ZWQoKTsKICAgICB2aXJ0dWFsIHZvaWQgYWx0QXR0cmlidXRlQ2hhbmdlZCgpOwogICAgIHZpcnR1 YWwgdm9pZCBzcmNBdHRyaWJ1dGVDaGFuZ2VkKCk7Ci0gICAgdmlydHVhbCB2b2lkIHZhbHVlQ2hh bmdlZCgpOworICAgIHZpcnR1YWwgdm9pZCByZXNwb25kVG9TZXRWYWx1ZShib29sIHZhbHVlQ2hh bmdlZCwgYm9vbCYgc2VuZENoYW5nZUV2ZW50KTsKICAgICB2aXJ0dWFsIHZvaWQgd2lsbE1vdmVU b05ld093bmVyRG9jdW1lbnQoKTsKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkUmVzcGVjdEFsaWdu QXR0cmlidXRlKCk7CiAgICAgdmlydHVhbCBGaWxlTGlzdCogZmlsZXMoKTsKQEAgLTIzMyw2ICsy MzMsNyBAQAogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRSZXNwZWN0SGVpZ2h0QW5kV2lkdGhBdHRy aWJ1dGVzKCk7CiAgICAgdmlydHVhbCBib29sIHN1cHBvcnRzUGxhY2Vob2xkZXIoKSBjb25zdDsK ICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlUGxhY2Vob2xkZXJUZXh0KCk7CisgICAgdmlydHVhbCB2 b2lkIHVwZGF0ZUlubmVyVGV4dFZhbHVlKCk7CiAgICAgdmlydHVhbCB2b2lkIG11bHRpcGxlQXR0 cmlidXRlQ2hhbmdlZCgpOwogICAgIHZpcnR1YWwgdm9pZCBkaXNhYmxlZEF0dHJpYnV0ZUNoYW5n ZWQoKTsKICAgICB2aXJ0dWFsIHZvaWQgcmVhZG9ubHlBdHRyaWJ1dGVDaGFuZ2VkKCk7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9odG1sL1RleHRJbnB1dFR5cGUuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9odG1sL1RleHRJbnB1dFR5cGUuaAkocmV2aXNpb24gOTQ1OTEpCisrKyBTb3Vy Y2UvV2ViQ29yZS9odG1sL1RleHRJbnB1dFR5cGUuaAkod29ya2luZyBjb3B5KQpAQCAtNDIsNiAr NDIsNyBAQAogcHJpdmF0ZToKICAgICBUZXh0SW5wdXRUeXBlKEhUTUxJbnB1dEVsZW1lbnQqIGVs ZW1lbnQpIDogQmFzZVRleHRJbnB1dFR5cGUoZWxlbWVudCkgeyB9CiAgICAgdmlydHVhbCBjb25z dCBBdG9taWNTdHJpbmcmIGZvcm1Db250cm9sVHlwZSgpIGNvbnN0OworICAgIHZpcnR1YWwgdm9p ZCByZXNwb25kVG9TZXRWYWx1ZShib29sIHZhbHVlQ2hhbmdlZCwgYm9vbCYgc2VuZENoYW5nZUV2 ZW50KTsKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkUmVzcGVjdFNwZWVjaEF0dHJpYnV0ZSgpOwog fTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9SYW5nZUlucHV0VHlwZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9SYW5nZUlucHV0VHlwZS5jcHAJKHJldmlzaW9u IDk0NTkxKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9SYW5nZUlucHV0VHlwZS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTI4NCw5ICsyODQsMTEgQEAKICAgICBlbGVtZW50KCktPnNldE5lZWRzU3R5 bGVSZWNhbGMoKTsKIH0KIAotdm9pZCBSYW5nZUlucHV0VHlwZTo6dmFsdWVDaGFuZ2VkKCkKK3Zv aWQgUmFuZ2VJbnB1dFR5cGU6OnJlc3BvbmRUb1NldFZhbHVlKGJvb2wgdmFsdWVDaGFuZ2VkLCBi b29sJiBzZW5kQ2hhbmdlRXZlbnQpCiB7Ci0gICAgc2xpZGVyVGh1bWJFbGVtZW50T2YoZWxlbWVu dCgpKS0+c2V0UG9zaXRpb25Gcm9tVmFsdWUoKTsKKyAgICBJbnB1dFR5cGU6OnJlc3BvbmRUb1Nl dFZhbHVlKHZhbHVlQ2hhbmdlZCwgc2VuZENoYW5nZUV2ZW50KTsKKyAgICBpZiAodmFsdWVDaGFu Z2VkKQorICAgICAgICBzbGlkZXJUaHVtYkVsZW1lbnRPZihlbGVtZW50KCkpLT5zZXRQb3NpdGlv bkZyb21WYWx1ZSgpOwogfQogCiBTdHJpbmcgUmFuZ2VJbnB1dFR5cGU6OmZhbGxiYWNrVmFsdWUo KQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgJKHJldmlzaW9uIDk0 NTkxKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgJKHdvcmtpbmcg Y29weSkKQEAgLTE0NSw4ICsxNDUsNiBAQAogCiAgICAgU3RyaW5nIHNhbml0aXplVmFsdWUoY29u c3QgU3RyaW5nJikgY29uc3Q7CiAKLSAgICB2b2lkIHVwZGF0ZUlubmVyVGV4dFZhbHVlKCk7Ci0K ICAgICAvLyBUaGUgdmFsdWUgd2hpY2ggaXMgZHJhd24gYnkgYSByZW5kZXJlci4KICAgICBTdHJp bmcgdmlzaWJsZVZhbHVlKCkgY29uc3Q7CiAgICAgU3RyaW5nIGNvbnZlcnRGcm9tVmlzaWJsZVZh bHVlKGNvbnN0IFN0cmluZyYpIGNvbnN0OwpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9Db2xv cklucHV0VHlwZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvQ29sb3JJbnB1 dFR5cGUuaAkocmV2aXNpb24gOTQ1OTEpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0NvbG9ySW5w dXRUeXBlLmgJKHdvcmtpbmcgY29weSkKQEAgLTUyLDcgKzUyLDcgQEAKICAgICB2aXJ0dWFsIFN0 cmluZyBzYW5pdGl6ZVZhbHVlKGNvbnN0IFN0cmluZyYpOwogICAgIHZpcnR1YWwgQ29sb3IgdmFs dWVBc0NvbG9yKCkgY29uc3Q7CiAgICAgdmlydHVhbCB2b2lkIGNyZWF0ZVNoYWRvd1N1YnRyZWUo KTsKLSAgICB2aXJ0dWFsIHZvaWQgdmFsdWVDaGFuZ2VkKCk7CisgICAgdmlydHVhbCB2b2lkIHJl c3BvbmRUb1NldFZhbHVlKGJvb2wgdmFsdWVDaGFuZ2VkLCBib29sJiBzZW5kQ2hhbmdlRXZlbnQp OwogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVDbGlja0V2ZW50KE1vdXNlRXZlbnQqKTsKICAgICB2 aXJ0dWFsIHZvaWQgaGFuZGxlRE9NQWN0aXZhdGVFdmVudChFdmVudCopOwogICAgIHZpcnR1YWwg dm9pZCBkZXRhY2goKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRGb3JtQ29u dHJvbEVsZW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUZXh0 Rm9ybUNvbnRyb2xFbGVtZW50LmgJKHJldmlzaW9uIDk0NTkxKQorKysgU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC04Niwx MyArODYsMTUgQEAKICAgICB2aXJ0dWFsIHZvaWQgcGFyc2VNYXBwZWRBdHRyaWJ1dGUoQXR0cmli dXRlKik7CiAKICAgICB2b2lkIHNldFRleHRBc09mTGFzdEZvcm1Db250cm9sQ2hhbmdlRXZlbnQo Y29uc3QgU3RyaW5nJiB0ZXh0KSB7IG1fdGV4dEFzT2ZMYXN0Rm9ybUNvbnRyb2xDaGFuZ2VFdmVu dCA9IHRleHQ7IH0KLSAgICAKKyAgICBmcmllbmQgY2xhc3MgVGV4dElucHV0VHlwZTsKKwogICAg IHZvaWQgY2FjaGVTZWxlY3Rpb24oaW50IHN0YXJ0LCBpbnQgZW5kLCBUZXh0RmllbGRTZWxlY3Rp b25EaXJlY3Rpb24gZGlyZWN0aW9uKQogICAgIHsKICAgICAgICAgbV9jYWNoZWRTZWxlY3Rpb25T dGFydCA9IHN0YXJ0OwogICAgICAgICBtX2NhY2hlZFNlbGVjdGlvbkVuZCA9IGVuZDsKICAgICAg ICAgbV9jYWNoZWRTZWxlY3Rpb25EaXJlY3Rpb24gPSBkaXJlY3Rpb247CiAgICAgfQorICAgIGZy aWVuZCBjbGFzcyBUZXh0RmllbGRJbnB1dFR5cGU7CiAKICAgICB2b2lkIHJlc3RvcmVDYWNoZWRT ZWxlY3Rpb24oKTsKICAgICBib29sIGhhc0NhY2hlZFNlbGVjdGlvbigpIGNvbnN0IHsgcmV0dXJu IG1fY2FjaGVkU2VsZWN0aW9uU3RhcnQgPj0gMDsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRt bC9UZXh0SW5wdXRUeXBlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL1Rl eHRJbnB1dFR5cGUuY3BwCShyZXZpc2lvbiA5NDU5MSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwv VGV4dElucHV0VHlwZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDcgQEAKIAogI2lu Y2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlRleHRJbnB1dFR5cGUuaCIKKyNpbmNsdWRlICJI VE1MSW5wdXRFbGVtZW50LmgiCiAKICNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgogCkBAIC00 NSw2ICs0NiwxNSBAQAogICAgIHJldHVybiBJbnB1dFR5cGVOYW1lczo6dGV4dCgpOwogfQogCit2 b2lkIFRleHRJbnB1dFR5cGU6OnJlc3BvbmRUb1NldFZhbHVlKGJvb2wgdmFsdWVDaGFuZ2VkLCBi b29sJiBzZW5kQ2hhbmdlRXZlbnQpCit7CisgICAgQmFzZVRleHRJbnB1dFR5cGU6OnJlc3BvbmRU b1NldFZhbHVlKHZhbHVlQ2hhbmdlZCwgc2VuZENoYW5nZUV2ZW50KTsKKworICAgIC8vIEZJWE1F OiBzaG91bGQgdGhpcyBiZSBtb3ZlZCB0byBUZXh0RmllbGRJbnB1dFR5cGU/CisgICAgaWYgKHZh bHVlQ2hhbmdlZCAmJiAoIWVsZW1lbnQoKS0+Zm9jdXNlZCgpIHx8ICFzZW5kQ2hhbmdlRXZlbnQp KQorICAgICAgICBlbGVtZW50KCktPnNldFRleHRBc09mTGFzdEZvcm1Db250cm9sQ2hhbmdlRXZl bnQoZWxlbWVudCgpLT52YWx1ZSgpKTsKK30KKwogYm9vbCBUZXh0SW5wdXRUeXBlOjpzaG91bGRS ZXNwZWN0U3BlZWNoQXR0cmlidXRlKCkKIHsKICAgICByZXR1cm4gdHJ1ZTsK