96365 2012-09-11 02:10:37 -0700 Refactor ValidationMessage class 2012-09-11 18:42:01 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 96238 1 tkent tkent mifenton morrita webkit.review.bot oldest_to_newest 716961 0 tkent 2012-09-11 02:10:37 -0700 Refactor ValidationMessage class 716989 1 163314 tkent 2012-09-11 02:41:23 -0700 Created attachment 163314 Patch 717790 2 163314 morrita 2012-09-11 18:22:03 -0700 Comment on attachment 163314 Patch Looks good. 717802 3 163314 webkit.review.bot 2012-09-11 18:41:58 -0700 Comment on attachment 163314 Patch Clearing flags on attachment: 163314 Committed r128254: <http://trac.webkit.org/changeset/128254> 717803 4 webkit.review.bot 2012-09-11 18:42:01 -0700 All reviewed patches have been landed. Closing bug. 163314 2012-09-11 02:41:23 -0700 2012-09-11 18:41:58 -0700 Patch bug-96365-20120911184039.patch text/plain 10889 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWNmOTViMzJmODE0MTRh NGU1Yjg4OWUyNWViZDU2Y2IyOWNkMmI3YS4uYzIzYzdkZWU1NzhkZDBlNjk5YzE1YTgzYjQ2ZjQ5 ZjlmZjI5YjNmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDEyLTA5LTExICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZWZhY3RvciBWYWxpZGF0 aW9uTWVzc2FnZSBjbGFzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTYzNjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAtIE1vdmUgc29tZSBjb2RlIGZyb20gSFRNTEZvcm1Db250cm9sRWxlbWVudCB0byBW YWxpZGF0aW9uTWVzc2FnZQorICAgICAgICAtIFZhbGlkYXRpb25NZXNzYWdlIGNsYXNzIGhvbGRz IGFuIGVsZW1lbnQgcG9pbnRlciBhcworICAgICAgICBIVE1MRm9ybUNvbnRyb2xFbGVtZW50LCBu b3QgRm9ybUFzc29jaWF0ZWRFbGVtZW50LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNl IG9mIG5vIGJlaGF2aW9yIGNoYW5nZXMuCisKKyAgICAgICAgKiBodG1sL0hUTUxGb3JtQ29udHJv bEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEZvcm1Db250cm9sRWxlbWVudDo6 dXBkYXRlVmlzaWJsZVZhbGlkYXRpb25NZXNzYWdlKToKKyAgICAgICAgTW92ZWQgc29tZSBjb2Rl IHRvIFZhbGlkYXRpb25NZXNzYWdlOjp1cGRhdGVWYWxpZGF0aW9uTWVzc2FnZSgpLgorICAgICAg ICAoV2ViQ29yZTo6SFRNTEZvcm1Db250cm9sRWxlbWVudDo6c2V0TmVlZHNWYWxpZGl0eUNoZWNr KToKKyAgICAgICAgQXNrIFZhbGlkYXRpb25NZXNzYWdlIHdoZXRoZXIgaXQgaXMgdmlzaWJsZSBv ciBub3QuCisgICAgICAgICogaHRtbC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50Lmg6CisgICAgICAg IChIVE1MRm9ybUNvbnRyb2xFbGVtZW50KTogUmVtb3ZlZCB2aXNpYmxlVmFsaWRhdGlvbk1lc3Nh Z2UoKS4KKworICAgICAgICAqIGh0bWwvVmFsaWRhdGlvbk1lc3NhZ2UuY3BwOgorICAgICAgICAo V2ViQ29yZTo6VmFsaWRhdGlvbk1lc3NhZ2U6OlZhbGlkYXRpb25NZXNzYWdlKToKKyAgICAgICAg Q2hhbmdlIHRoZSBhcmd1bWVudCB0eXBlOiBGb3JtQXNzb2NpYXRlZEVsZW1lbnQgLT4gSFRNTEZv cm1Db250cm9sRWxlbWVudAorICAgICAgICAoV2ViQ29yZTo6VmFsaWRhdGlvbk1lc3NhZ2U6OmNy ZWF0ZSk6IGRpdHRvLgorICAgICAgICAoV2ViQ29yZTo6VmFsaWRhdGlvbk1lc3NhZ2U6OnVwZGF0 ZVZhbGlkYXRpb25NZXNzYWdlKToKKyAgICAgICAgQWRkZWQuIE1vdmVkIHNvbWUgY29kZSBmcm9t CisgICAgICAgIEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ6OnVwZGF0ZVZpc2libGVWYWxpZGF0aW9u TWVzc2FnZSgpLgorICAgICAgICAoV2ViQ29yZTo6VmFsaWRhdGlvbk1lc3NhZ2U6OmJ1aWxkQnVi YmxlVHJlZSk6IHRvSFRNTEVsZW1lbnQoKSBpcyBub3QgbmVlZGVkLgorICAgICAgICAoV2ViQ29y ZTo6VmFsaWRhdGlvbk1lc3NhZ2U6OmRlbGV0ZUJ1YmJsZVRyZWUpOiBkaXR0by4KKyAgICAgICAg KFdlYkNvcmU6OlZhbGlkYXRpb25NZXNzYWdlOjppc1Zpc2libGUpOiBBZGRlZC4KKyAgICAgICAg KiBodG1sL1ZhbGlkYXRpb25NZXNzYWdlLmg6CisgICAgICAgIChWYWxpZGF0aW9uTWVzc2FnZSk6 CisgICAgICAgICAtIENoYW5nZSBzb21lIGluc3RhbmNlIG9mIEZvcm1Bc3NvY2lhdGVkRWxlbWVu dCB0byBIVE1MRm9ybUNvbnRyb2xFbGVtZW50CisgICAgICAgICAtIFJlbW92ZSBtZXNzYWdlKCku CisgICAgICAgICAtIEFkZGVkIHVwZGF0ZVZhbGlkYXRpb25NZXNzYWdlKCkgYW5kIGlzVmlzaWJs ZSgpCisgICAgICAgICAtIE1hZGUgc2V0TWVzc2FnZSgpIHByaXZhdGUuCisKIDIwMTItMDktMTAg IERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgYW4gQVBJIHN5 bWJvbCBpbnN0ZWFkIG9mIGEgaGFyZGNvZGVkIHN0cmluZyBmb3IgdGhlIFRJRkYgdW5pZm9ybSB0 eXBlIGlkZW50aWZpZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGb3Jt Q29udHJvbEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRm9ybUNvbnRyb2xF bGVtZW50LmNwcAppbmRleCAyZDQ3YWM4YzQ1NjY3NDhjYmU4MzcwZDBiZWYxZWI4ZTA3ZDFkMTJh Li5kYjM2OGM0ODU1MmZmMjM5MjA2ZjU2MjFkYWZjZmMzMTU2ZWM0MThkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtQ29udHJvbEVsZW1lbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTEZvcm1Db250cm9sRWxlbWVudC5jcHAKQEAgLTQwMiwyOSArNDAy LDExIEBAIHZvaWQgSFRNTEZvcm1Db250cm9sRWxlbWVudDo6dXBkYXRlVmlzaWJsZVZhbGlkYXRp b25NZXNzYWdlKCkKICAgICBpZiAoIXBhZ2UpCiAgICAgICAgIHJldHVybjsKICAgICBTdHJpbmcg bWVzc2FnZTsKLSAgICBpZiAocmVuZGVyZXIoKSAmJiB3aWxsVmFsaWRhdGUoKSkgeworICAgIGlm IChyZW5kZXJlcigpICYmIHdpbGxWYWxpZGF0ZSgpKQogICAgICAgICBtZXNzYWdlID0gdmFsaWRh dGlvbk1lc3NhZ2UoKS5zdHJpcFdoaXRlU3BhY2UoKTsKLSAgICAgICAgLy8gSFRNTDUgc3BlY2lm aWNhdGlvbiBkb2Vzbid0IGFzayBVQSB0byBzaG93IHRoZSB0aXRsZSBhdHRyaWJ1dGUgdmFsdWUK LSAgICAgICAgLy8gd2l0aCB0aGUgdmFsaWRhdGlvbk1lc3NhZ2UuICBIb3dldmVyLCB0aGlzIGJl aGF2aW9yIGlzIHNhbWUgYXMgT3BlcmEKLSAgICAgICAgLy8gYW5kIHRoZSBzcGVjaWZpY2F0aW9u IGRlc2NyaWJlcyBzdWNoIGJlaGF2aW9yIGFzIGFuIGV4YW1wbGUuCi0gICAgICAgIGNvbnN0IEF0 b21pY1N0cmluZyYgdGl0bGUgPSBnZXRBdHRyaWJ1dGUodGl0bGVBdHRyKTsKLSAgICAgICAgaWYg KCFtZXNzYWdlLmlzRW1wdHkoKSAmJiAhdGl0bGUuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICBt ZXNzYWdlLmFwcGVuZCgnXG4nKTsKLSAgICAgICAgICAgIG1lc3NhZ2UuYXBwZW5kKHRpdGxlKTsK LSAgICAgICAgfQotICAgIH0KLSAgICBpZiAobWVzc2FnZS5pc0VtcHR5KCkpIHsKLSAgICAgICAg aGlkZVZpc2libGVWYWxpZGF0aW9uTWVzc2FnZSgpOwotICAgICAgICByZXR1cm47Ci0gICAgfQot ICAgIGlmICghbV92YWxpZGF0aW9uTWVzc2FnZSkgeworICAgIGlmICghbV92YWxpZGF0aW9uTWVz c2FnZSkKICAgICAgICAgbV92YWxpZGF0aW9uTWVzc2FnZSA9IFZhbGlkYXRpb25NZXNzYWdlOjpj cmVhdGUodGhpcyk7Ci0gICAgICAgIG1fdmFsaWRhdGlvbk1lc3NhZ2UtPnNldE1lc3NhZ2UobWVz c2FnZSk7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgLy8gQ2FsbCBzZXRNZXNzYWdlKCkgZXZlbiBp ZiBtX3ZhbGlkYXRpb25NZXNhZ2UtPm1lc3NhZ2UoKSA9PSBtZXNzYWdlCi0gICAgICAgIC8vIGJl Y2F1c2UgdGhlIGV4aXN0aW5nIG1lc3NhZ2UgbWlnaHQgYmUgdG8gYmUgaGlkZGVuLgotICAgICAg ICBtX3ZhbGlkYXRpb25NZXNzYWdlLT5zZXRNZXNzYWdlKG1lc3NhZ2UpOwotICAgIH0KKyAgICBt X3ZhbGlkYXRpb25NZXNzYWdlLT51cGRhdGVWYWxpZGF0aW9uTWVzc2FnZShtZXNzYWdlKTsKIH0K IAogdm9pZCBIVE1MRm9ybUNvbnRyb2xFbGVtZW50OjpoaWRlVmlzaWJsZVZhbGlkYXRpb25NZXNz YWdlKCkKQEAgLTQzMywxMSArNDE1LDYgQEAgdm9pZCBIVE1MRm9ybUNvbnRyb2xFbGVtZW50Ojpo aWRlVmlzaWJsZVZhbGlkYXRpb25NZXNzYWdlKCkKICAgICAgICAgbV92YWxpZGF0aW9uTWVzc2Fn ZS0+cmVxdWVzdFRvSGlkZU1lc3NhZ2UoKTsKIH0KIAotU3RyaW5nIEhUTUxGb3JtQ29udHJvbEVs ZW1lbnQ6OnZpc2libGVWYWxpZGF0aW9uTWVzc2FnZSgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1f dmFsaWRhdGlvbk1lc3NhZ2UgPyBtX3ZhbGlkYXRpb25NZXNzYWdlLT5tZXNzYWdlKCkgOiBTdHJp bmcoKTsKLX0KLQogYm9vbCBIVE1MRm9ybUNvbnRyb2xFbGVtZW50OjpjaGVja1ZhbGlkaXR5KFZl Y3RvcjxSZWZQdHI8Rm9ybUFzc29jaWF0ZWRFbGVtZW50PiA+KiB1bmhhbmRsZWRJbnZhbGlkQ29u dHJvbHMpCiB7CiAgICAgaWYgKCF3aWxsVmFsaWRhdGUoKSB8fCBpc1ZhbGlkRm9ybUNvbnRyb2xF bGVtZW50KCkpCkBAIC00NjksNyArNDQ2LDcgQEAgdm9pZCBIVE1MRm9ybUNvbnRyb2xFbGVtZW50 OjpzZXROZWVkc1ZhbGlkaXR5Q2hlY2soKQogICAgIG1faXNWYWxpZCA9IG5ld0lzVmFsaWQ7CiAK ICAgICAvLyBVcGRhdGVzIG9ubHkgaWYgdGhpcyBjb250cm9sIGFscmVhZHkgaGFzIGEgdmFsaWR0 aW9uIG1lc3NhZ2UuCi0gICAgaWYgKCF2aXNpYmxlVmFsaWRhdGlvbk1lc3NhZ2UoKS5pc0VtcHR5 KCkpIHsKKyAgICBpZiAobV92YWxpZGF0aW9uTWVzc2FnZSAmJiBtX3ZhbGlkYXRpb25NZXNzYWdl LT5pc1Zpc2libGUoKSkgewogICAgICAgICAvLyBDYWxscyB1cGRhdGVWaXNpYmxlVmFsaWRhdGlv bk1lc3NhZ2UoKSBldmVuIGlmIG1faXNWYWxpZCBpcyBub3QKICAgICAgICAgLy8gY2hhbmdlZCBi ZWNhdXNlIGEgdmFsaWRhdGlvbiBtZXNzYWdlIGNhbiBiZSBjaGFnbmVkLgogICAgICAgICB1cGRh dGVWaXNpYmxlVmFsaWRhdGlvbk1lc3NhZ2UoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTEZvcm1Db250cm9sRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M Rm9ybUNvbnRyb2xFbGVtZW50LmgKaW5kZXggZDEyOWJjMmMyYTM2ZDA1MjMzMjRhY2NlZDI3NmYx NDc1ODViMTMzMS4uMjRkZTk3NjY5YzMzOTNkMTM1ZTQ3NGQyMTVhNzUyNzE3ZDRiNmU0ZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50LmgKKysr IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50LmgKQEAgLTE0OCw3 ICsxNDgsNiBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgSFRNTEZvcm1FbGVtZW50KiB2aXJ0dWFs Rm9ybSgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBpc0RlZmF1bHRCdXR0b25Gb3JGb3JtKCkg Y29uc3Q7CiAgICAgdmlydHVhbCBib29sIGlzVmFsaWRGb3JtQ29udHJvbEVsZW1lbnQoKTsKLSAg ICBTdHJpbmcgdmlzaWJsZVZhbGlkYXRpb25NZXNzYWdlKCkgY29uc3Q7CiAgICAgdm9pZCB1cGRh dGVBbmNlc3RvckRpc2FibGVkU3RhdGUoKSBjb25zdDsKIAogICAgIE93blB0cjxWYWxpZGF0aW9u TWVzc2FnZT4gbV92YWxpZGF0aW9uTWVzc2FnZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvVmFsaWRhdGlvbk1lc3NhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9WYWxpZGF0 aW9uTWVzc2FnZS5jcHAKaW5kZXggNjdkMzJkYzgxYTIwMjFhZTJiMDcwYmQ1ZDMxMDQzMTljZjJm MmYwMi4uZjI2NTVlNjM1NzM0Y2FmMjI2MjIwMTAzZDRjMmNmMmRmMDg1YWI5OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaHRtbC9WYWxpZGF0aW9uTWVzc2FnZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvaHRtbC9WYWxpZGF0aW9uTWVzc2FnZS5jcHAKQEAgLTEsNSArMSw1IEBACiAvKgot ICogQ29weXJpZ2h0IChDKSAyMDEwIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg KiBDb3B5cmlnaHQgKEMpIDIwMTAsIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZv cm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92 aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKQEAgLTM1LDkgKzM1LDkgQEAK ICNpbmNsdWRlICJDU1NWYWx1ZUtleXdvcmRzLmgiCiAjaW5jbHVkZSAiRWxlbWVudFNoYWRvdy5o IgogI2luY2x1ZGUgIkV4Y2VwdGlvbkNvZGVQbGFjZWhvbGRlci5oIgotI2luY2x1ZGUgIkZvcm1B c3NvY2lhdGVkRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxCUkVsZW1lbnQuaCIKICNpbmNsdWRl ICJIVE1MRGl2RWxlbWVudC5oIgorI2luY2x1ZGUgIkhUTUxGb3JtQ29udHJvbEVsZW1lbnQuaCIK ICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiUmVu ZGVyQmxvY2suaCIKQEAgLTUyLDkgKzUyLDEwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdXNp bmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKIAotQUxXQVlTX0lOTElORSBWYWxpZGF0aW9uTWVzc2Fn ZTo6VmFsaWRhdGlvbk1lc3NhZ2UoRm9ybUFzc29jaWF0ZWRFbGVtZW50KiBlbGVtZW50KQorQUxX QVlTX0lOTElORSBWYWxpZGF0aW9uTWVzc2FnZTo6VmFsaWRhdGlvbk1lc3NhZ2UoSFRNTEZvcm1D b250cm9sRWxlbWVudCogZWxlbWVudCkKICAgICA6IG1fZWxlbWVudChlbGVtZW50KQogeworICAg IEFTU0VSVChtX2VsZW1lbnQpOwogfQogCiBWYWxpZGF0aW9uTWVzc2FnZTo6flZhbGlkYXRpb25N ZXNzYWdlKCkKQEAgLTYyLDExICs2MywzMCBAQCBWYWxpZGF0aW9uTWVzc2FnZTo6flZhbGlkYXRp b25NZXNzYWdlKCkKICAgICBkZWxldGVCdWJibGVUcmVlKCk7CiB9CiAKLVBhc3NPd25QdHI8VmFs aWRhdGlvbk1lc3NhZ2U+IFZhbGlkYXRpb25NZXNzYWdlOjpjcmVhdGUoRm9ybUFzc29jaWF0ZWRF bGVtZW50KiBlbGVtZW50KQorUGFzc093blB0cjxWYWxpZGF0aW9uTWVzc2FnZT4gVmFsaWRhdGlv bk1lc3NhZ2U6OmNyZWF0ZShIVE1MRm9ybUNvbnRyb2xFbGVtZW50KiBlbGVtZW50KQogewogICAg IHJldHVybiBhZG9wdFB0cihuZXcgVmFsaWRhdGlvbk1lc3NhZ2UoZWxlbWVudCkpOwogfQogCit2 b2lkIFZhbGlkYXRpb25NZXNzYWdlOjp1cGRhdGVWYWxpZGF0aW9uTWVzc2FnZShjb25zdCBTdHJp bmcmIG1lc3NhZ2UpCit7CisgICAgU3RyaW5nIHVwZGF0ZWRNZXNzYWdlID0gbWVzc2FnZTsKKyAg ICAvLyBIVE1MNSBzcGVjaWZpY2F0aW9uIGRvZXNuJ3QgYXNrIFVBIHRvIHNob3cgdGhlIHRpdGxl IGF0dHJpYnV0ZSB2YWx1ZQorICAgIC8vIHdpdGggdGhlIHZhbGlkYXRpb25NZXNzYWdlLiBIb3dl dmVyLCB0aGlzIGJlaGF2aW9yIGlzIHNhbWUgYXMgT3BlcmEKKyAgICAvLyBhbmQgdGhlIHNwZWNp ZmljYXRpb24gZGVzY3JpYmVzIHN1Y2ggYmVoYXZpb3IgYXMgYW4gZXhhbXBsZS4KKyAgICBjb25z dCBBdG9taWNTdHJpbmcmIHRpdGxlID0gbV9lbGVtZW50LT5mYXN0R2V0QXR0cmlidXRlKHRpdGxl QXR0cik7CisgICAgaWYgKCF1cGRhdGVkTWVzc2FnZS5pc0VtcHR5KCkgJiYgIXRpdGxlLmlzRW1w dHkoKSkgeworICAgICAgICB1cGRhdGVkTWVzc2FnZS5hcHBlbmQoJ1xuJyk7CisgICAgICAgIHVw ZGF0ZWRNZXNzYWdlLmFwcGVuZCh0aXRsZSk7CisgICAgfQorCisgICAgaWYgKHVwZGF0ZWRNZXNz YWdlLmlzRW1wdHkoKSkgeworICAgICAgICByZXF1ZXN0VG9IaWRlTWVzc2FnZSgpOworICAgICAg ICByZXR1cm47CisgICAgfQorICAgIHNldE1lc3NhZ2UodXBkYXRlZE1lc3NhZ2UpOworfQorCiB2 b2lkIFZhbGlkYXRpb25NZXNzYWdlOjpzZXRNZXNzYWdlKGNvbnN0IFN0cmluZyYgbWVzc2FnZSkK IHsKICAgICAvLyBEb24ndCBtb2RpZnkgdGhlIERPTSB0cmVlIGluIHRoaXMgY29udGV4dC4KQEAg LTEzMywxMCArMTUzLDkgQEAgc3RhdGljIHZvaWQgYWRqdXN0QnViYmxlUG9zaXRpb24oY29uc3Qg TGF5b3V0UmVjdCYgaG9zdFJlY3QsIEhUTUxFbGVtZW50KiBidWJibGUKIAogdm9pZCBWYWxpZGF0 aW9uTWVzc2FnZTo6YnVpbGRCdWJibGVUcmVlKFRpbWVyPFZhbGlkYXRpb25NZXNzYWdlPiopCiB7 Ci0gICAgSFRNTEVsZW1lbnQqIGhvc3QgPSB0b0hUTUxFbGVtZW50KG1fZWxlbWVudCk7CiAgICAg U2hhZG93Um9vdCogc2hhZG93Um9vdCA9IG1fZWxlbWVudC0+ZW5zdXJlVXNlckFnZW50U2hhZG93 Um9vdCgpOwogCi0gICAgRG9jdW1lbnQqIGRvYyA9IGhvc3QtPmRvY3VtZW50KCk7CisgICAgRG9j dW1lbnQqIGRvYyA9IG1fZWxlbWVudC0+ZG9jdW1lbnQoKTsKICAgICBtX2J1YmJsZSA9IEhUTUxE aXZFbGVtZW50OjpjcmVhdGUoZG9jKTsKICAgICBtX2J1YmJsZS0+c2V0U2hhZG93UHNldWRvSWQo Ii13ZWJraXQtdmFsaWRhdGlvbi1idWJibGUiKTsKICAgICAvLyBOZWVkIHRvIGZvcmNlIHBvc2l0 aW9uOmFic29sdXRlIGJlY2F1c2UgUmVuZGVyTWVudUxpc3QgZG9lc24ndCBhc3N1bWUgaXQKQEAg LTE0NSw4ICsxNjQsOCBAQCB2b2lkIFZhbGlkYXRpb25NZXNzYWdlOjpidWlsZEJ1YmJsZVRyZWUo VGltZXI8VmFsaWRhdGlvbk1lc3NhZ2U+KikKICAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKICAg ICBzaGFkb3dSb290LT5hcHBlbmRDaGlsZChtX2J1YmJsZS5nZXQoKSwgZWMpOwogICAgIEFTU0VS VCghZWMpOwotICAgIGhvc3QtPmRvY3VtZW50KCktPnVwZGF0ZUxheW91dCgpOwotICAgIGFkanVz dEJ1YmJsZVBvc2l0aW9uKGhvc3QtPmJvdW5kaW5nQm94KCksIG1fYnViYmxlLmdldCgpKTsKKyAg ICBtX2VsZW1lbnQtPmRvY3VtZW50KCktPnVwZGF0ZUxheW91dCgpOworICAgIGFkanVzdEJ1YmJs ZVBvc2l0aW9uKG1fZWxlbWVudC0+Ym91bmRpbmdCb3goKSwgbV9idWJibGUuZ2V0KCkpOwogCiAg ICAgUmVmUHRyPEhUTUxEaXZFbGVtZW50PiBjbGlwcGVyID0gSFRNTERpdkVsZW1lbnQ6OmNyZWF0 ZShkb2MpOwogICAgIGNsaXBwZXItPnNldFNoYWRvd1BzZXVkb0lkKCItd2Via2l0LXZhbGlkYXRp b24tYnViYmxlLWFycm93LWNsaXBwZXIiKTsKQEAgLTE5NywxMiArMjE2LDE1IEBAIHZvaWQgVmFs aWRhdGlvbk1lc3NhZ2U6OmRlbGV0ZUJ1YmJsZVRyZWUoVGltZXI8VmFsaWRhdGlvbk1lc3NhZ2U+ KikKICAgICBpZiAobV9idWJibGUpIHsKICAgICAgICAgbV9tZXNzYWdlSGVhZGluZyA9IDA7CiAg ICAgICAgIG1fbWVzc2FnZUJvZHkgPSAwOwotICAgICAgICBIVE1MRWxlbWVudCogaG9zdCA9IHRv SFRNTEVsZW1lbnQobV9lbGVtZW50KTsKLSAgICAgICAgRXhjZXB0aW9uQ29kZSBlYzsKLSAgICAg ICAgaG9zdC0+dXNlckFnZW50U2hhZG93Um9vdCgpLT5yZW1vdmVDaGlsZChtX2J1YmJsZS5nZXQo KSwgZWMpOworICAgICAgICBtX2VsZW1lbnQtPnVzZXJBZ2VudFNoYWRvd1Jvb3QoKS0+cmVtb3Zl Q2hpbGQobV9idWJibGUuZ2V0KCksIEFTU0VSVF9OT19FWENFUFRJT04pOwogICAgICAgICBtX2J1 YmJsZSA9IDA7CiAgICAgfQogICAgIG1fbWVzc2FnZSA9IFN0cmluZygpOwogfQogCitib29sIFZh bGlkYXRpb25NZXNzYWdlOjppc1Zpc2libGUoKSBjb25zdAoreworICAgIHJldHVybiAhbV9tZXNz YWdlLmlzRW1wdHkoKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaHRtbC9WYWxpZGF0aW9uTWVzc2FnZS5oIGIvU291cmNlL1dlYkNvcmUv aHRtbC9WYWxpZGF0aW9uTWVzc2FnZS5oCmluZGV4IDQyOTgyZTUwN2ZiMDA3MjQ2YTExNzg3ZGI4 YjdmMzRkMWMyZDI3MDguLmI1YmI4ZGJiODc5NmI1NTY1ZWQxYjMyZTM1NjJjMTQ5M2MyNDVjYjIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvVmFsaWRhdGlvbk1lc3NhZ2UuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL1ZhbGlkYXRpb25NZXNzYWdlLmgKQEAgLTM5LDI3ICszOSwy OCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIEZvcm1Bc3NvY2lhdGVkRWxlbWVu dDsKIGNsYXNzIEhUTUxFbGVtZW50OworY2xhc3MgSFRNTEZvcm1Db250cm9sRWxlbWVudDsKIGNs YXNzIE5vZGU7CiAKIGNsYXNzIFZhbGlkYXRpb25NZXNzYWdlIHsKICAgICBXVEZfTUFLRV9OT05D T1BZQUJMRShWYWxpZGF0aW9uTWVzc2FnZSk7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25Q dHI8VmFsaWRhdGlvbk1lc3NhZ2U+IGNyZWF0ZShGb3JtQXNzb2NpYXRlZEVsZW1lbnQqKTsKKyAg ICBzdGF0aWMgUGFzc093blB0cjxWYWxpZGF0aW9uTWVzc2FnZT4gY3JlYXRlKEhUTUxGb3JtQ29u dHJvbEVsZW1lbnQqKTsKICAgICB+VmFsaWRhdGlvbk1lc3NhZ2UoKTsKLSAgICBTdHJpbmcgbWVz c2FnZSgpIGNvbnN0IHsgcmV0dXJuIG1fbWVzc2FnZTsgfQotICAgIHZvaWQgc2V0TWVzc2FnZShj b25zdCBTdHJpbmcmKTsKKyAgICB2b2lkIHVwZGF0ZVZhbGlkYXRpb25NZXNzYWdlKGNvbnN0IFN0 cmluZyYpOwogICAgIHZvaWQgcmVxdWVzdFRvSGlkZU1lc3NhZ2UoKTsKKyAgICBib29sIGlzVmlz aWJsZSgpIGNvbnN0OwogICAgIGJvb2wgc2hhZG93VHJlZUNvbnRhaW5zKE5vZGUqKSBjb25zdDsK IAogcHJpdmF0ZToKLSAgICBWYWxpZGF0aW9uTWVzc2FnZShGb3JtQXNzb2NpYXRlZEVsZW1lbnQq KTsKKyAgICBWYWxpZGF0aW9uTWVzc2FnZShIVE1MRm9ybUNvbnRyb2xFbGVtZW50Kik7CisgICAg dm9pZCBzZXRNZXNzYWdlKGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgc2V0TWVzc2FnZURPTUFu ZFN0YXJ0VGltZXIoVGltZXI8VmFsaWRhdGlvbk1lc3NhZ2U+KiA9IDApOwogICAgIHZvaWQgYnVp bGRCdWJibGVUcmVlKFRpbWVyPFZhbGlkYXRpb25NZXNzYWdlPiopOwogICAgIHZvaWQgZGVsZXRl QnViYmxlVHJlZShUaW1lcjxWYWxpZGF0aW9uTWVzc2FnZT4qID0gMCk7CiAKLSAgICBGb3JtQXNz b2NpYXRlZEVsZW1lbnQqIG1fZWxlbWVudDsKKyAgICBIVE1MRm9ybUNvbnRyb2xFbGVtZW50KiBt X2VsZW1lbnQ7CiAgICAgU3RyaW5nIG1fbWVzc2FnZTsKICAgICBPd25QdHI8VGltZXI8VmFsaWRh dGlvbk1lc3NhZ2U+ID4gbV90aW1lcjsKICAgICBSZWZQdHI8SFRNTEVsZW1lbnQ+IG1fYnViYmxl Owo=