20994 2008-09-22 09:21:21 -0700 HTMLVideoElement width and height attributes are now unsigned 2008-09-27 22:46:19 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 0 eric.carlson webkit-unassigned oldest_to_newest 92136 0 eric.carlson 2008-09-22 09:21:21 -0700 HTMLVideoElement width and height attributes were originally signed, now they are unsigned. http://www.whatwg.org/specs/web-apps/current-work/multipage/video.html#htmlvideoelement 92137 1 23653 eric.carlson 2008-09-22 09:25:08 -0700 Created attachment 23653 proposed patch 92148 2 23653 sam 2008-09-22 10:30:31 -0700 Comment on attachment 23653 proposed patch You need to change the c++ files to return unsigned as well. r- 92153 3 23656 eric.carlson 2008-09-22 10:59:47 -0700 Created attachment 23656 Revised patch Update c++ files to take and return unsigned, make videoWidth and videoHeight return unsigned to match idl. 92199 4 23656 sam 2008-09-22 14:17:31 -0700 Comment on attachment 23656 Revised patch + unsigned w = getAttribute(widthAttr).toInt(&ok); + unsigned h = getAttribute(heightAttr).toInt(&ok); These need to use toUInt(). 92743 5 23801 eric.carlson 2008-09-25 09:56:56 -0700 Created attachment 23801 Revised patch Convert all unsigned attributes with toUInt(). 93062 6 23801 sam 2008-09-27 13:11:12 -0700 Comment on attachment 23801 Revised patch Woot! r=me 93120 7 eric.carlson 2008-09-27 22:46:19 -0700 Third time was a charm. Committed as revision 37030. 23653 2008-09-22 09:25:08 -0700 2008-09-22 10:59:47 -0700 proposed patch unsigned_width_height.txt text/plain 1377 eric.carlson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNjc2NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDgtMDktMjIgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAg IAorICAgICAgICAtIGZpeCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjA5OTQKKyAgICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjE3MTAyMz4gSFRNTFZpZGVvRWxlbWVu dCB3aWR0aCBhbmQgaGVpZ2h0IGF0dHJpYnV0ZXMgYXJlIG5vdyB1bnNpZ25lZAorICAgICAgICAK KyAgICAgICAgSFRNTDUgc3BlYyBzYXlzIEhUTUxWaWRlb0VsZW1lbnQgd2lkdGggYW5kIGhlaWdo dCBhdHRyaWJ1dGVzIHNob3VsZCBiZSB1bnNpZ25lZAorCisgICAgICAgICogaHRtbC9IVE1MVmlk ZW9FbGVtZW50LmlkbDogbWFrZSB3aWR0aCBhbmQgaGVpZ2h0IHVuc2lnbmVkCisKIDIwMDgtMDkt MjIgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBDYW1lcm9uIFp3YXJpY2guCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVu dC5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuaWRsCShy ZXZpc2lvbiAzNjc2NikKKysrIFdlYkNvcmUvaHRtbC9IVE1MVmlkZW9FbGVtZW50LmlkbAkod29y a2luZyBjb3B5KQpAQCAtMjUsOCArMjUsOCBAQAogCiBtb2R1bGUgaHRtbCB7CiAgICAgaW50ZXJm YWNlIFtHZW5lcmF0ZUNvbnN0cnVjdG9yLCBDb25kaXRpb25hbD1WSURFT10gSFRNTFZpZGVvRWxl bWVudCA6IEhUTUxNZWRpYUVsZW1lbnQgewotICAgICAgICBhdHRyaWJ1dGUgbG9uZyB3aWR0aDsK LSAgICAgICAgYXR0cmlidXRlIGxvbmcgaGVpZ2h0OworICAgICAgICBhdHRyaWJ1dGUgdW5zaWdu ZWQgbG9uZyB3aWR0aDsKKyAgICAgICAgYXR0cmlidXRlIHVuc2lnbmVkIGxvbmcgaGVpZ2h0Owog ICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgbG9uZyB2aWRlb1dpZHRoOwogICAg ICAgICByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgbG9uZyB2aWRlb0hlaWdodDsKICAgICAg ICAgICAgICAgICAgYXR0cmlidXRlIFtDb252ZXJ0TnVsbFRvTnVsbFN0cmluZ10gRE9NU3RyaW5n IHBvc3RlcjsK 23656 2008-09-22 10:59:47 -0700 2008-09-25 09:56:56 -0700 Revised patch unsigned_width_height.txt text/plain 4040 eric.carlson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNjc2OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDgtMDktMjIgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgZml4IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk5NAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNjE3MTAyMz4gSFRNTFZpZGVvRWxlbWVudCB3aWR0aCBhbmQg aGVpZ2h0IGF0dHJpYnV0ZXMgYXJlIG5vdyB1bnNpZ25lZAorICAgICAgICAKKyAgICAgICAgSFRN TDUgc3BlYyBzYXlzIEhUTUxWaWRlb0VsZW1lbnQgd2lkdGggYW5kIGhlaWdodCBhdHRyaWJ1dGVz IHNob3VsZCBiZSB1bnNpZ25lZC4gTWFrZQorICAgICAgICB2aWRlb1dpZHRoIGFuZCB2aWRlb0hl aWdodCBpbiBjKysgZmlsZXMgdW5zaWduZWQgdG8gbWF0Y2ggaWRsLgorCisgICAgICAgICogaHRt bC9IVE1MVmlkZW9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxWaWRlb0VsZW1l bnQ6OnZpZGVvV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFZpZGVvRWxlbWVudDo6dmlk ZW9IZWlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFZpZGVvRWxlbWVudDo6d2lkdGgpOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTFZpZGVvRWxlbWVudDo6c2V0V2lkdGgpOgorICAgICAgICAo V2ViQ29yZTo6SFRNTFZpZGVvRWxlbWVudDo6aGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxWaWRlb0VsZW1lbnQ6OnNldEhlaWdodCk6CisgICAgICAgICogaHRtbC9IVE1MVmlkZW9FbGVt ZW50Lmg6CisgICAgICAgICogaHRtbC9IVE1MVmlkZW9FbGVtZW50LmlkbDoKKwogMjAwOC0wOS0y MiAgTWFjaWVqIFN0YWNob3dpYWsgIDxtanNAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IENhbWVyb24gWndhcmljaC4KSW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MVmlkZW9FbGVtZW50 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVudC5jcHAJKHJl dmlzaW9uIDM2NzY2KQorKysgV2ViQ29yZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMDIsNDAgKzEwMiw0MCBAQCB2b2lkIEhUTUxWaWRlb0VsZW1lbnQ6OnBh cnNlTWFwcGVkQXR0cmliCiAgICAgICAgIEhUTUxNZWRpYUVsZW1lbnQ6OnBhcnNlTWFwcGVkQXR0 cmlidXRlKGF0dHIpOwogfQogCi1pbnQgSFRNTFZpZGVvRWxlbWVudDo6dmlkZW9XaWR0aCgpIGNv bnN0Cit1bnNpZ25lZCBIVE1MVmlkZW9FbGVtZW50Ojp2aWRlb1dpZHRoKCkgY29uc3QKIHsKICAg ICBpZiAoIW1fcGxheWVyKQogICAgICAgICByZXR1cm4gMDsKICAgICByZXR1cm4gbV9wbGF5ZXIt Pm5hdHVyYWxTaXplKCkud2lkdGgoKTsKIH0KIAotaW50IEhUTUxWaWRlb0VsZW1lbnQ6OnZpZGVv SGVpZ2h0KCkgY29uc3QKK3Vuc2lnbmVkIEhUTUxWaWRlb0VsZW1lbnQ6OnZpZGVvSGVpZ2h0KCkg Y29uc3QKIHsKICAgICBpZiAoIW1fcGxheWVyKQogICAgICAgICByZXR1cm4gMDsKICAgICByZXR1 cm4gbV9wbGF5ZXItPm5hdHVyYWxTaXplKCkuaGVpZ2h0KCk7CiB9CiAKLWludCBIVE1MVmlkZW9F bGVtZW50Ojp3aWR0aCgpIGNvbnN0Cit1bnNpZ25lZCBIVE1MVmlkZW9FbGVtZW50Ojp3aWR0aCgp IGNvbnN0CiB7CiAgICAgYm9vbCBvazsKLSAgICBpbnQgdyA9IGdldEF0dHJpYnV0ZSh3aWR0aEF0 dHIpLnRvSW50KCZvayk7CisgICAgdW5zaWduZWQgdyA9IGdldEF0dHJpYnV0ZSh3aWR0aEF0dHIp LnRvSW50KCZvayk7CiAgICAgcmV0dXJuIG9rID8gdyA6IDA7CiB9CiAKLXZvaWQgSFRNTFZpZGVv RWxlbWVudDo6c2V0V2lkdGgoaW50IHZhbHVlKQordm9pZCBIVE1MVmlkZW9FbGVtZW50OjpzZXRX aWR0aCh1bnNpZ25lZCB2YWx1ZSkKIHsKICAgICBzZXRBdHRyaWJ1dGUod2lkdGhBdHRyLCBTdHJp bmc6Om51bWJlcih2YWx1ZSkpOwogfQogICAgIAotaW50IEhUTUxWaWRlb0VsZW1lbnQ6OmhlaWdo dCgpIGNvbnN0Cit1bnNpZ25lZCBIVE1MVmlkZW9FbGVtZW50OjpoZWlnaHQoKSBjb25zdAogewog ICAgIGJvb2wgb2s7Ci0gICAgaW50IGggPSBnZXRBdHRyaWJ1dGUoaGVpZ2h0QXR0cikudG9JbnQo Jm9rKTsKKyAgICB1bnNpZ25lZCBoID0gZ2V0QXR0cmlidXRlKGhlaWdodEF0dHIpLnRvSW50KCZv ayk7CiAgICAgcmV0dXJuIG9rID8gaCA6IDA7CiB9CiAgICAgCi12b2lkIEhUTUxWaWRlb0VsZW1l bnQ6OnNldEhlaWdodChpbnQgdmFsdWUpCit2b2lkIEhUTUxWaWRlb0VsZW1lbnQ6OnNldEhlaWdo dCh1bnNpZ25lZCB2YWx1ZSkKIHsKICAgICBzZXRBdHRyaWJ1dGUoaGVpZ2h0QXR0ciwgU3RyaW5n OjpudW1iZXIodmFsdWUpKTsKIH0KSW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MVmlkZW9FbGVtZW50 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuaAkocmV2aXNp b24gMzY3NjYpCisrKyBXZWJDb3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVudC5oCSh3b3JraW5nIGNv cHkpCkBAIC01MCwxMyArNTAsMTMgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBpc1VSTEF0 dHJpYnV0ZShBdHRyaWJ1dGUqKSBjb25zdDsKICAgICB2aXJ0dWFsIGNvbnN0IFF1YWxpZmllZE5h bWUmIGltYWdlU291cmNlQXR0cmlidXRlTmFtZSgpIGNvbnN0OwogCi0gICAgaW50IHdpZHRoKCkg Y29uc3Q7Ci0gICAgdm9pZCBzZXRXaWR0aChpbnQpOwotICAgIGludCBoZWlnaHQoKSBjb25zdDsK LSAgICB2b2lkIHNldEhlaWdodChpbnQpOworICAgIHVuc2lnbmVkIHdpZHRoKCkgY29uc3Q7Cisg ICAgdm9pZCBzZXRXaWR0aCh1bnNpZ25lZCk7CisgICAgdW5zaWduZWQgaGVpZ2h0KCkgY29uc3Q7 CisgICAgdm9pZCBzZXRIZWlnaHQodW5zaWduZWQpOwogICAgIAotICAgIGludCB2aWRlb1dpZHRo KCkgY29uc3Q7Ci0gICAgaW50IHZpZGVvSGVpZ2h0KCkgY29uc3Q7CisgICAgdW5zaWduZWQgdmlk ZW9XaWR0aCgpIGNvbnN0OworICAgIHVuc2lnbmVkIHZpZGVvSGVpZ2h0KCkgY29uc3Q7CiAgICAg CiAgICAgS1VSTCBwb3N0ZXIoKSBjb25zdDsKICAgICB2b2lkIHNldFBvc3Rlcihjb25zdCBTdHJp bmcmKTsKSW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MVmlkZW9FbGVtZW50LmlkbAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVudC5pZGwJKHJldmlzaW9uIDM2NzY2KQor KysgV2ViQ29yZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuaWRsCSh3b3JraW5nIGNvcHkpCkBAIC0y NSw4ICsyNSw4IEBACiAKIG1vZHVsZSBodG1sIHsKICAgICBpbnRlcmZhY2UgW0dlbmVyYXRlQ29u c3RydWN0b3IsIENvbmRpdGlvbmFsPVZJREVPXSBIVE1MVmlkZW9FbGVtZW50IDogSFRNTE1lZGlh RWxlbWVudCB7Ci0gICAgICAgIGF0dHJpYnV0ZSBsb25nIHdpZHRoOwotICAgICAgICBhdHRyaWJ1 dGUgbG9uZyBoZWlnaHQ7CisgICAgICAgIGF0dHJpYnV0ZSB1bnNpZ25lZCBsb25nIHdpZHRoOwor ICAgICAgICBhdHRyaWJ1dGUgdW5zaWduZWQgbG9uZyBoZWlnaHQ7CiAgICAgICAgIHJlYWRvbmx5 IGF0dHJpYnV0ZSB1bnNpZ25lZCBsb25nIHZpZGVvV2lkdGg7CiAgICAgICAgIHJlYWRvbmx5IGF0 dHJpYnV0ZSB1bnNpZ25lZCBsb25nIHZpZGVvSGVpZ2h0OwogICAgICAgICAgICAgICAgICBhdHRy aWJ1dGUgW0NvbnZlcnROdWxsVG9OdWxsU3RyaW5nXSBET01TdHJpbmcgcG9zdGVyOwo= 23801 2008-09-25 09:56:56 -0700 2008-09-27 13:11:12 -0700 Revised patch unsigned_width_height.txt text/plain 5107 eric.carlson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNjg5NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjkgQEAKKzIwMDgtMDktMjUgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgZml4IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk5NAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNjE3MTAyMz4gSFRNTFZpZGVvRWxlbWVudCB3aWR0aCBhbmQg aGVpZ2h0IGF0dHJpYnV0ZXMgYXJlIG5vdyB1bnNpZ25lZAorICAgICAgICAKKyAgICAgICAgSFRN TDUgc3BlYyBzYXlzIEhUTUxWaWRlb0VsZW1lbnQgd2lkdGggYW5kIGhlaWdodCBhdHRyaWJ1dGVz IHNob3VsZCBiZSB1bnNpZ25lZC4gQ29udmVydAorICAgICAgICBhbGwgdW5zaWduZWQgbWVkaWEg YXR0cmlidXRlcyBmcm9tIHN0cmluZyB3aXRoIHRvVUludCgpIGluc3RlYWQgb2YgdG9JbnQoKS4K KyAgICAgICAgCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnBsYXlDb3VudCk6IGNvbnZlcnQgZnJvbSBhdHRy aWJ1dGUgd2l0aCB0b1VJbnQoKS4KKworICAgICAgICAqIGh0bWwvSFRNTFZpZGVvRWxlbWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlkZW9FbGVtZW50Ojp2aWRlb1dpZHRoKToKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxWaWRlb0VsZW1lbnQ6OnZpZGVvSGVpZ2h0KTogcmV0dXJuIHVu c2lnbmVkIHRvIG1hdGNoIGlkbC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxWaWRlb0VsZW1lbnQ6 OndpZHRoKTogY29udmVydCBmcm9tIGF0dHJpYnV0ZSB3aXRoIHRvVUludCgpIGFuZCByZXR1cm4K KyAgICAgICAgICB1bnNpZ25lZCB2YWx1ZS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxWaWRlb0Vs ZW1lbnQ6OmhlaWdodCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6SFRNTFZpZGVvRWxlbWVu dDo6c2V0V2lkdGgpOiB0YWtlIHVuc2lnbmVkIHZhbHVlLgorICAgICAgICAoV2ViQ29yZTo6SFRN TFZpZGVvRWxlbWVudDo6c2V0SGVpZ2h0KTogRGl0dG8uCisKKyAgICAgICAgKiBodG1sL0hUTUxW aWRlb0VsZW1lbnQuaDogd2lkdGgsIGhlaWdodCwgdmlkZW9XaWR0aCwgYW5kIHZpZGVvSGVpZ2h0 IGFyZSB1bnNpZ25lZC4KKworICAgICAgICAqIGh0bWwvSFRNTFZpZGVvRWxlbWVudC5pZGw6IG1h a2Ugd2lkdGgsIGhlaWdodCB1bnNpZ25lZCB0byBtYXRjaCBIVE1MNSBzcGVjLgorCiAyMDA4LTA5 LTI1ICBLZXZpbiBNY0N1bGxvdWdoICA8a21jY3VsbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEdlb2ZmIGFuZCBUaW0uCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTE1lZGlh RWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQu Y3BwCShyZXZpc2lvbiAzNjg5MykKKysrIFdlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNw cAkod29ya2luZyBjb3B5KQpAQCAtNjg1LDkgKzY4NSw5IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVu dDo6cGF1c2UoRXhjZXB0aW9uQ28KIAogdW5zaWduZWQgSFRNTE1lZGlhRWxlbWVudDo6cGxheUNv dW50KCkgY29uc3QKIHsKLSAgICBTdHJpbmcgdmFsID0gZ2V0QXR0cmlidXRlKHBsYXljb3VudEF0 dHIpOwotICAgIGludCBjb3VudCA9IHZhbC50b0ludCgpOwotICAgIHJldHVybiBtYXgoY291bnQs IDEpOyAKKyAgICBib29sIG9rOworICAgIHVuc2lnbmVkIGNvdW50ID0gZ2V0QXR0cmlidXRlKHBs YXljb3VudEF0dHIpLnN0cmluZygpLnRvVUludCgmb2spOworICAgIHJldHVybiAoY291bnQgPiAw ICYmIG9rKSA/IGNvdW50IDogMTsgCiB9CiAKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2V0UGxh eUNvdW50KHVuc2lnbmVkIGNvdW50LCBFeGNlcHRpb25Db2RlJiBlYykKSW5kZXg6IFdlYkNvcmUv aHRtbC9IVE1MVmlkZW9FbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRN TFZpZGVvRWxlbWVudC5jcHAJKHJldmlzaW9uIDM2ODkyKQorKysgV2ViQ29yZS9odG1sL0hUTUxW aWRlb0VsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDIsNDAgKzEwMiw0MCBAQCB2b2lk IEhUTUxWaWRlb0VsZW1lbnQ6OnBhcnNlTWFwcGVkQXR0cmliCiAgICAgICAgIEhUTUxNZWRpYUVs ZW1lbnQ6OnBhcnNlTWFwcGVkQXR0cmlidXRlKGF0dHIpOwogfQogCi1pbnQgSFRNTFZpZGVvRWxl bWVudDo6dmlkZW9XaWR0aCgpIGNvbnN0Cit1bnNpZ25lZCBIVE1MVmlkZW9FbGVtZW50Ojp2aWRl b1dpZHRoKCkgY29uc3QKIHsKICAgICBpZiAoIW1fcGxheWVyKQogICAgICAgICByZXR1cm4gMDsK ICAgICByZXR1cm4gbV9wbGF5ZXItPm5hdHVyYWxTaXplKCkud2lkdGgoKTsKIH0KIAotaW50IEhU TUxWaWRlb0VsZW1lbnQ6OnZpZGVvSGVpZ2h0KCkgY29uc3QKK3Vuc2lnbmVkIEhUTUxWaWRlb0Vs ZW1lbnQ6OnZpZGVvSGVpZ2h0KCkgY29uc3QKIHsKICAgICBpZiAoIW1fcGxheWVyKQogICAgICAg ICByZXR1cm4gMDsKICAgICByZXR1cm4gbV9wbGF5ZXItPm5hdHVyYWxTaXplKCkuaGVpZ2h0KCk7 CiB9CiAKLWludCBIVE1MVmlkZW9FbGVtZW50Ojp3aWR0aCgpIGNvbnN0Cit1bnNpZ25lZCBIVE1M VmlkZW9FbGVtZW50Ojp3aWR0aCgpIGNvbnN0CiB7CiAgICAgYm9vbCBvazsKLSAgICBpbnQgdyA9 IGdldEF0dHJpYnV0ZSh3aWR0aEF0dHIpLnRvSW50KCZvayk7CisgICAgdW5zaWduZWQgdyA9IGdl dEF0dHJpYnV0ZSh3aWR0aEF0dHIpLnN0cmluZygpLnRvVUludCgmb2spOwogICAgIHJldHVybiBv ayA/IHcgOiAwOwogfQogCi12b2lkIEhUTUxWaWRlb0VsZW1lbnQ6OnNldFdpZHRoKGludCB2YWx1 ZSkKK3ZvaWQgSFRNTFZpZGVvRWxlbWVudDo6c2V0V2lkdGgodW5zaWduZWQgdmFsdWUpCiB7CiAg ICAgc2V0QXR0cmlidXRlKHdpZHRoQXR0ciwgU3RyaW5nOjpudW1iZXIodmFsdWUpKTsKIH0KICAg ICAKLWludCBIVE1MVmlkZW9FbGVtZW50OjpoZWlnaHQoKSBjb25zdAordW5zaWduZWQgSFRNTFZp ZGVvRWxlbWVudDo6aGVpZ2h0KCkgY29uc3QKIHsKICAgICBib29sIG9rOwotICAgIGludCBoID0g Z2V0QXR0cmlidXRlKGhlaWdodEF0dHIpLnRvSW50KCZvayk7CisgICAgdW5zaWduZWQgaCA9IGdl dEF0dHJpYnV0ZShoZWlnaHRBdHRyKS5zdHJpbmcoKS50b1VJbnQoJm9rKTsKICAgICByZXR1cm4g b2sgPyBoIDogMDsKIH0KICAgICAKLXZvaWQgSFRNTFZpZGVvRWxlbWVudDo6c2V0SGVpZ2h0KGlu dCB2YWx1ZSkKK3ZvaWQgSFRNTFZpZGVvRWxlbWVudDo6c2V0SGVpZ2h0KHVuc2lnbmVkIHZhbHVl KQogewogICAgIHNldEF0dHJpYnV0ZShoZWlnaHRBdHRyLCBTdHJpbmc6Om51bWJlcih2YWx1ZSkp OwogfQpJbmRleDogV2ViQ29yZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVudC5oCShyZXZpc2lvbiAzNjg5MikKKysrIFdl YkNvcmUvaHRtbC9IVE1MVmlkZW9FbGVtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTUwLDEzICs1 MCwxMyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGlzVVJMQXR0cmlidXRlKEF0dHJpYnV0 ZSopIGNvbnN0OwogICAgIHZpcnR1YWwgY29uc3QgUXVhbGlmaWVkTmFtZSYgaW1hZ2VTb3VyY2VB dHRyaWJ1dGVOYW1lKCkgY29uc3Q7CiAKLSAgICBpbnQgd2lkdGgoKSBjb25zdDsKLSAgICB2b2lk IHNldFdpZHRoKGludCk7Ci0gICAgaW50IGhlaWdodCgpIGNvbnN0OwotICAgIHZvaWQgc2V0SGVp Z2h0KGludCk7CisgICAgdW5zaWduZWQgd2lkdGgoKSBjb25zdDsKKyAgICB2b2lkIHNldFdpZHRo KHVuc2lnbmVkKTsKKyAgICB1bnNpZ25lZCBoZWlnaHQoKSBjb25zdDsKKyAgICB2b2lkIHNldEhl aWdodCh1bnNpZ25lZCk7CiAgICAgCi0gICAgaW50IHZpZGVvV2lkdGgoKSBjb25zdDsKLSAgICBp bnQgdmlkZW9IZWlnaHQoKSBjb25zdDsKKyAgICB1bnNpZ25lZCB2aWRlb1dpZHRoKCkgY29uc3Q7 CisgICAgdW5zaWduZWQgdmlkZW9IZWlnaHQoKSBjb25zdDsKICAgICAKICAgICBLVVJMIHBvc3Rl cigpIGNvbnN0OwogICAgIHZvaWQgc2V0UG9zdGVyKGNvbnN0IFN0cmluZyYpOwpJbmRleDogV2Vi Q29yZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuaWRsCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRt bC9IVE1MVmlkZW9FbGVtZW50LmlkbAkocmV2aXNpb24gMzY4OTIpCisrKyBXZWJDb3JlL2h0bWwv SFRNTFZpZGVvRWxlbWVudC5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTI1LDggKzI1LDggQEAKIAog bW9kdWxlIGh0bWwgewogICAgIGludGVyZmFjZSBbR2VuZXJhdGVDb25zdHJ1Y3RvciwgQ29uZGl0 aW9uYWw9VklERU9dIEhUTUxWaWRlb0VsZW1lbnQgOiBIVE1MTWVkaWFFbGVtZW50IHsKLSAgICAg ICAgYXR0cmlidXRlIGxvbmcgd2lkdGg7Ci0gICAgICAgIGF0dHJpYnV0ZSBsb25nIGhlaWdodDsK KyAgICAgICAgYXR0cmlidXRlIHVuc2lnbmVkIGxvbmcgd2lkdGg7CisgICAgICAgIGF0dHJpYnV0 ZSB1bnNpZ25lZCBsb25nIGhlaWdodDsKICAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIHVuc2ln bmVkIGxvbmcgdmlkZW9XaWR0aDsKICAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIHVuc2lnbmVk IGxvbmcgdmlkZW9IZWlnaHQ7CiAgICAgICAgICAgICAgICAgIGF0dHJpYnV0ZSBbQ29udmVydE51 bGxUb051bGxTdHJpbmddIERPTVN0cmluZyBwb3N0ZXI7Cg==