59640 2011-04-27 15:12:41 -0700 Fix five strict PassOwnPtr violations in WebCore 2011-04-27 23:08:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth commit-queue darin levin oldest_to_newest 393868 0 abarth 2011-04-27 15:12:41 -0700 Fix five strict PassOwnPtr violations in WebCore 393869 1 91357 abarth 2011-04-27 15:14:06 -0700 Created attachment 91357 Patch 394237 2 91357 commit-queue 2011-04-27 23:08:28 -0700 Comment on attachment 91357 Patch Clearing flags on attachment: 91357 Committed r85162: <http://trac.webkit.org/changeset/85162> 394238 3 commit-queue 2011-04-27 23:08:33 -0700 All reviewed patches have been landed. Closing bug. 91357 2011-04-27 15:14:06 -0700 2011-04-27 23:08:28 -0700 Patch bug-59640-20110427151405.patch text/plain 11148 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1MTA0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTEtMDQtMjcgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBGaXggZml2ZSBzdHJpY3QgUGFzc093blB0ciB2aW9sYXRpb25zIGlu IFdlYkNvcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU5NjQwCisKKyAgICAgICAgKiBjc3MvTWVkaWFMaXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhTGlzdDo6ZGVsZXRlTWVkaXVtKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhTGlzdDo6 c2V0TWVkaWFUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhTGlzdDo6YXBwZW5kTWVkaXVt KToKKyAgICAgICAgKiBjc3MvTWVkaWFRdWVyeS5oOgorICAgICAgICAqIGRvbS9NZXNzYWdlUG9y dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZXNzYWdlUG9ydDo6ZGlzZW50YW5nbGVQb3J0cyk6 CisgICAgICAgIChXZWJDb3JlOjpNZXNzYWdlUG9ydDo6ZW50YW5nbGVQb3J0cyk6CisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwOgorICAgICAgICAoUGFyc2VkU3R5 bGVTaGVldDo6c2V0VGV4dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjphZGp1c3RTdHlsZSk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJUaGVtZTo6YWRqdXN0TWV0ZXJTdHlsZSk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlclRoZW1lTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVNYWM6 OmFkanVzdE1lbnVMaXN0U3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVNYWM6 OmFkanVzdFNsaWRlclRyYWNrU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVN YWM6OmFkanVzdFNsaWRlclRodW1iU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhl bWVNYWM6OmFkanVzdFNlYXJjaEZpZWxkU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGhlbWVNYWM6OmFkanVzdFNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uU3R5bGUpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGhlbWVNYWM6OmFkanVzdFNlYXJjaEZpZWxkRGVjb3JhdGlvblN0eWxl KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lTWFjOjphZGp1c3RTZWFyY2hGaWVsZFJl c3VsdHNEZWNvcmF0aW9uU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVNYWM6 OmFkanVzdFNlYXJjaEZpZWxkUmVzdWx0c0J1dHRvblN0eWxlKToKKwogMjAxMS0wNC0yNyAgSWx5 YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgQnJpYW4gV2VpbnN0ZWluLgpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL01lZGlhTGlzdC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL01lZGlhTGlzdC5jcHAJKHJldmlz aW9uIDg1MDkzKQorKysgU291cmNlL1dlYkNvcmUvY3NzL01lZGlhTGlzdC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTEzMSw3ICsxMzEsNyBAQCB2b2lkIE1lZGlhTGlzdDo6ZGVsZXRlTWVkaXVtKGNv bnN0IFN0cmluCiAgICAgfSBlbHNlIGlmIChtX2ZhbGxiYWNrKSB7CiAgICAgICAgIFN0cmluZyBt ZWRpdW0gPSBwYXJzZU1lZGlhRGVzY3JpcHRvcihvbGRNZWRpdW0pOwogICAgICAgICBpZiAoIW1l ZGl1bS5pc051bGwoKSkgewotICAgICAgICAgICAgY3JlYXRlZFF1ZXJ5ID0gYWRvcHRQdHIobmV3 IE1lZGlhUXVlcnkoTWVkaWFRdWVyeTo6Tm9uZSwgbWVkaXVtLCAwKSk7CisgICAgICAgICAgICBj cmVhdGVkUXVlcnkgPSBhZG9wdFB0cihuZXcgTWVkaWFRdWVyeShNZWRpYVF1ZXJ5OjpOb25lLCBt ZWRpdW0sIFBhc3NPd25QdHI8TWVkaWFRdWVyeTo6RXhwcmVzc2lvblZlY3Rvcj4oKSkpOwogICAg ICAgICAgICAgb2xkUXVlcnkgPSBjcmVhdGVkUXVlcnkuZ2V0KCk7CiAgICAgICAgIH0KICAgICB9 CkBAIC0xODYsNyArMTg2LDcgQEAgdm9pZCBNZWRpYUxpc3Q6OnNldE1lZGlhVGV4dChjb25zdCBT dHJpbgogICAgICAgICAgICAgICAgIGlmIChtX2ZhbGxiYWNrKSB7CiAgICAgICAgICAgICAgICAg ICAgIFN0cmluZyBtZWRpYURlc2NyaXB0b3IgPSBwYXJzZU1lZGlhRGVzY3JpcHRvcihtZWRpdW0p OwogICAgICAgICAgICAgICAgICAgICBpZiAoIW1lZGlhRGVzY3JpcHRvci5pc051bGwoKSkKLSAg ICAgICAgICAgICAgICAgICAgICAgIHRlbXBNZWRpYUxpc3QtPm1fcXVlcmllcy5hcHBlbmQobmV3 IE1lZGlhUXVlcnkoTWVkaWFRdWVyeTo6Tm9uZSwgbWVkaWFEZXNjcmlwdG9yLCAwKSk7CisgICAg ICAgICAgICAgICAgICAgICAgICB0ZW1wTWVkaWFMaXN0LT5tX3F1ZXJpZXMuYXBwZW5kKG5ldyBN ZWRpYVF1ZXJ5KE1lZGlhUXVlcnk6Ok5vbmUsIG1lZGlhRGVzY3JpcHRvciwgUGFzc093blB0cjxN ZWRpYVF1ZXJ5OjpFeHByZXNzaW9uVmVjdG9yPigpKSk7CiAgICAgICAgICAgICAgICAgfSBlbHNl IHsKICAgICAgICAgICAgICAgICAgICAgZWMgPSBTWU5UQVhfRVJSOwogICAgICAgICAgICAgICAg ICAgICByZXR1cm47CkBAIC0yMzIsNyArMjMyLDcgQEAgdm9pZCBNZWRpYUxpc3Q6OmFwcGVuZE1l ZGl1bShjb25zdCBTdHJpbgogICAgIH0gZWxzZSBpZiAobV9mYWxsYmFjaykgewogICAgICAgICBT dHJpbmcgbWVkaXVtID0gcGFyc2VNZWRpYURlc2NyaXB0b3IobmV3TWVkaXVtKTsKICAgICAgICAg aWYgKCFtZWRpdW0uaXNOdWxsKCkpIHsKLSAgICAgICAgICAgIG1fcXVlcmllcy5hcHBlbmQobmV3 IE1lZGlhUXVlcnkoTWVkaWFRdWVyeTo6Tm9uZSwgbWVkaXVtLCAwKSk7CisgICAgICAgICAgICBt X3F1ZXJpZXMuYXBwZW5kKG5ldyBNZWRpYVF1ZXJ5KE1lZGlhUXVlcnk6Ok5vbmUsIG1lZGl1bSwg UGFzc093blB0cjxNZWRpYVF1ZXJ5OjpFeHByZXNzaW9uVmVjdG9yPigpKSk7CiAgICAgICAgICAg ICBlYyA9IDA7CiAgICAgICAgIH0KICAgICB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvTWVk aWFRdWVyeS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9NZWRpYVF1ZXJ5LmgJ KHJldmlzaW9uIDg1MDkzKQorKysgU291cmNlL1dlYkNvcmUvY3NzL01lZGlhUXVlcnkuaAkod29y a2luZyBjb3B5KQpAQCAtNDQsNyArNDQsOSBAQCBwdWJsaWM6CiAgICAgICAgIE9ubHksIE5vdCwg Tm9uZQogICAgIH07CiAKLSAgICBNZWRpYVF1ZXJ5KFJlc3RyaWN0b3IsIGNvbnN0IFN0cmluZyYg bWVkaWFUeXBlLCBQYXNzT3duUHRyPFZlY3RvcjxPd25QdHI8TWVkaWFRdWVyeUV4cD4gPiA+IGV4 cHJzKTsKKyAgICB0eXBlZGVmIFZlY3RvcjxPd25QdHI8TWVkaWFRdWVyeUV4cD4gPiBFeHByZXNz aW9uVmVjdG9yOworCisgICAgTWVkaWFRdWVyeShSZXN0cmljdG9yLCBjb25zdCBTdHJpbmcmIG1l ZGlhVHlwZSwgUGFzc093blB0cjxFeHByZXNzaW9uVmVjdG9yPiBleHBycyk7CiAgICAgfk1lZGlh UXVlcnkoKTsKIAogICAgIFJlc3RyaWN0b3IgcmVzdHJpY3RvcigpIGNvbnN0IHsgcmV0dXJuIG1f cmVzdHJpY3RvcjsgfQpAQCAtNTcsNyArNTksNyBAQCBwdWJsaWM6CiAgcHJpdmF0ZToKICAgICBS ZXN0cmljdG9yIG1fcmVzdHJpY3RvcjsKICAgICBTdHJpbmcgbV9tZWRpYVR5cGU7Ci0gICAgT3du UHRyPFZlY3RvcjxPd25QdHI8TWVkaWFRdWVyeUV4cD4gPiA+IG1fZXhwcmVzc2lvbnM7CisgICAg T3duUHRyPEV4cHJlc3Npb25WZWN0b3I+IG1fZXhwcmVzc2lvbnM7CiAgICAgYm9vbCBtX2lnbm9y ZWQ7CiAgICAgU3RyaW5nIG1fc2VyaWFsaXphdGlvbkNhY2hlOwogCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9kb20vTWVzc2FnZVBvcnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Rv bS9NZXNzYWdlUG9ydC5jcHAJKHJldmlzaW9uIDg1MDkzKQorKysgU291cmNlL1dlYkNvcmUvZG9t L01lc3NhZ2VQb3J0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjA2LDcgKzIwNiw3IEBAIE1lc3Nh Z2VQb3J0KiBNZXNzYWdlUG9ydDo6bG9jYWxseUVudGFuZ2wKIFBhc3NPd25QdHI8TWVzc2FnZVBv cnRDaGFubmVsQXJyYXk+IE1lc3NhZ2VQb3J0OjpkaXNlbnRhbmdsZVBvcnRzKGNvbnN0IE1lc3Nh Z2VQb3J0QXJyYXkqIHBvcnRzLCBFeGNlcHRpb25Db2RlJiBlYykKIHsKICAgICBpZiAoIXBvcnRz IHx8ICFwb3J0cy0+c2l6ZSgpKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIFBh c3NPd25QdHI8TWVzc2FnZVBvcnRDaGFubmVsQXJyYXk+KCk7CiAKICAgICAvLyBIYXNoU2V0IHVz ZWQgdG8gZWZmaWNpZW50bHkgY2hlY2sgZm9yIGR1cGxpY2F0ZXMgaW4gdGhlIHBhc3NlZC1pbiBh cnJheS4KICAgICBIYXNoU2V0PE1lc3NhZ2VQb3J0Kj4gcG9ydFNldDsKQEAgLTIxNiwzMyArMjE2 LDMzIEBAIFBhc3NPd25QdHI8TWVzc2FnZVBvcnRDaGFubmVsQXJyYXk+IE1lc3MKICAgICAgICAg TWVzc2FnZVBvcnQqIHBvcnQgPSAoKnBvcnRzKVtpXS5nZXQoKTsKICAgICAgICAgaWYgKCFwb3J0 IHx8IHBvcnQtPmlzQ2xvbmVkKCkgfHwgcG9ydFNldC5jb250YWlucyhwb3J0KSkgewogICAgICAg ICAgICAgZWMgPSBJTlZBTElEX1NUQVRFX0VSUjsKLSAgICAgICAgICAgIHJldHVybiAwOworICAg ICAgICAgICAgcmV0dXJuIFBhc3NPd25QdHI8TWVzc2FnZVBvcnRDaGFubmVsQXJyYXk+KCk7CiAg ICAgICAgIH0KICAgICAgICAgcG9ydFNldC5hZGQocG9ydCk7CiAgICAgfQogCiAgICAgLy8gUGFz c2VkLWluIHBvcnRzIHBhc3NlZCB2YWxpZGl0eSBjaGVja3MsIHNvIHdlIGNhbiBkaXNlbnRhbmds ZSB0aGVtLgotICAgIE1lc3NhZ2VQb3J0Q2hhbm5lbEFycmF5KiBwb3J0QXJyYXkgPSBuZXcgTWVz c2FnZVBvcnRDaGFubmVsQXJyYXkocG9ydHMtPnNpemUoKSk7CisgICAgT3duUHRyPE1lc3NhZ2VQ b3J0Q2hhbm5lbEFycmF5PiBwb3J0QXJyYXkgPSBhZG9wdFB0cihuZXcgTWVzc2FnZVBvcnRDaGFu bmVsQXJyYXkocG9ydHMtPnNpemUoKSkpOwogICAgIGZvciAodW5zaWduZWQgaW50IGkgPSAwIDsg aSA8IHBvcnRzLT5zaXplKCkgOyArK2kpIHsKICAgICAgICAgT3duUHRyPE1lc3NhZ2VQb3J0Q2hh bm5lbD4gY2hhbm5lbCA9ICgqcG9ydHMpW2ldLT5kaXNlbnRhbmdsZShlYyk7CiAgICAgICAgIEFT U0VSVCghZWMpOyAvLyBDYW4ndCBnZW5lcmF0ZSBleGNlcHRpb24gaGVyZSBpZiBwYXNzZWQgYWJv dmUgY2hlY2tzLgogICAgICAgICAoKnBvcnRBcnJheSlbaV0gPSBjaGFubmVsLnJlbGVhc2UoKTsK ICAgICB9Ci0gICAgcmV0dXJuIHBvcnRBcnJheTsKKyAgICByZXR1cm4gcG9ydEFycmF5LnJlbGVh c2UoKTsKIH0KIAogUGFzc093blB0cjxNZXNzYWdlUG9ydEFycmF5PiBNZXNzYWdlUG9ydDo6ZW50 YW5nbGVQb3J0cyhTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBQYXNzT3duUHRyPE1l c3NhZ2VQb3J0Q2hhbm5lbEFycmF5PiBjaGFubmVscykKIHsKICAgICBpZiAoIWNoYW5uZWxzIHx8 ICFjaGFubmVscy0+c2l6ZSgpKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIFBh c3NPd25QdHI8TWVzc2FnZVBvcnRBcnJheT4oKTsKIAotICAgIE1lc3NhZ2VQb3J0QXJyYXkqIHBv cnRBcnJheSA9IG5ldyBNZXNzYWdlUG9ydEFycmF5KGNoYW5uZWxzLT5zaXplKCkpOworICAgIE93 blB0cjxNZXNzYWdlUG9ydEFycmF5PiBwb3J0QXJyYXkgPSBhZG9wdFB0cihuZXcgTWVzc2FnZVBv cnRBcnJheShjaGFubmVscy0+c2l6ZSgpKSk7CiAgICAgZm9yICh1bnNpZ25lZCBpbnQgaSA9IDA7 IGkgPCBjaGFubmVscy0+c2l6ZSgpOyArK2kpIHsKICAgICAgICAgUmVmUHRyPE1lc3NhZ2VQb3J0 PiBwb3J0ID0gTWVzc2FnZVBvcnQ6OmNyZWF0ZShjb250ZXh0KTsKICAgICAgICAgcG9ydC0+ZW50 YW5nbGUoKCpjaGFubmVscylbaV0ucmVsZWFzZSgpKTsKICAgICAgICAgKCpwb3J0QXJyYXkpW2ld ID0gcG9ydC5yZWxlYXNlKCk7CiAgICAgfQotICAgIHJldHVybiBwb3J0QXJyYXk7CisgICAgcmV0 dXJuIHBvcnRBcnJheS5yZWxlYXNlKCk7CiB9CiAKIEV2ZW50VGFyZ2V0RGF0YSogTWVzc2FnZVBv cnQ6OmV2ZW50VGFyZ2V0RGF0YSgpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yU3R5bGVTaGVldC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwCShyZXZpc2lvbiA4NTA5MykKKysrIFNvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcAkod29ya2luZyBjb3B5KQpA QCAtODUsNyArODUsNyBAQCB2b2lkIFBhcnNlZFN0eWxlU2hlZXQ6OnNldFRleHQoY29uc3QgU3Ry CiB7CiAgICAgbV9oYXNUZXh0ID0gdHJ1ZTsKICAgICBtX3RleHQgPSB0ZXh0OwotICAgIHNldFNv dXJjZURhdGEoMCk7CisgICAgc2V0U291cmNlRGF0YShQYXNzT3duUHRyPFNvdXJjZURhdGE+KCkp OwogfQogCiB2b2lkIFBhcnNlZFN0eWxlU2hlZXQ6OnNldFNvdXJjZURhdGEoUGFzc093blB0cjxT b3VyY2VEYXRhPiBzb3VyY2VEYXRhKQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRoZW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWUuY3BwCShyZXZpc2lvbiA4NTA5MykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkzLDcgKzkzLDcgQEAgdm9pZCBS ZW5kZXJUaGVtZTo6YWRqdXN0U3R5bGUoQ1NTU3R5bGVTZQogICAgICAgICByZXR1cm47CiAKICAg ICAvLyBOZXZlciBzdXBwb3J0IGJveC1zaGFkb3cgb24gbmF0aXZlIGNvbnRyb2xzLgotICAgIHN0 eWxlLT5zZXRCb3hTaGFkb3coMCk7CisgICAgc3R5bGUtPnNldEJveFNoYWRvdyhQYXNzT3duUHRy PFNoYWRvd0RhdGE+KCkpOwogICAgIAogI2lmIFVTRShORVdfVEhFTUUpCiAgICAgc3dpdGNoIChw YXJ0KSB7CkBAIC05MjksNyArOTI5LDcgQEAgYm9vbCBSZW5kZXJUaGVtZTo6cGFpbnRJbnB1dEZp ZWxkU3BlZWNoQgogI2lmIEVOQUJMRShNRVRFUl9UQUcpCiB2b2lkIFJlbmRlclRoZW1lOjphZGp1 c3RNZXRlclN0eWxlKENTU1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHlsZSogc3R5bGUsIEVsZW1l bnQqKSBjb25zdAogewotICAgIHN0eWxlLT5zZXRCb3hTaGFkb3coMCk7CisgICAgc3R5bGUtPnNl dEJveFNoYWRvdyhQYXNzT3duUHRyPFNoYWRvd0RhdGE+KCkpOwogfQogCiBJbnRTaXplIFJlbmRl clRoZW1lOjptZXRlclNpemVGb3JCb3VuZHMoY29uc3QgUmVuZGVyTWV0ZXIqLCBjb25zdCBJbnRS ZWN0JiBib3VuZHMpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRoZW1lTWFjLm1tCShyZXZpc2lvbiA4NTA5MykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTE2NCw3ICsxMTY0LDcgQEAg dm9pZCBSZW5kZXJUaGVtZU1hYzo6YWRqdXN0TWVudUxpc3RTdHlsZQogICAgIC8vIHN5c3RlbSBm b250IGZvciB0aGUgY29udHJvbCBzaXplIGluc3RlYWQuCiAgICAgc2V0Rm9udEZyb21Db250cm9s U2l6ZShzZWxlY3Rvciwgc3R5bGUsIGNvbnRyb2xTaXplKTsKIAotICAgIHN0eWxlLT5zZXRCb3hT aGFkb3coMCk7CisgICAgc3R5bGUtPnNldEJveFNoYWRvdyhQYXNzT3duUHRyPFNoYWRvd0RhdGE+ KCkpOwogfQogCiBpbnQgUmVuZGVyVGhlbWVNYWM6OnBvcHVwSW50ZXJuYWxQYWRkaW5nTGVmdChS ZW5kZXJTdHlsZSogc3R5bGUpIGNvbnN0CkBAIC0xMjUwLDcgKzEyNTAsNyBAQCBjb25zdCBpbnQg dHJhY2tSYWRpdXMgPSAyOwogCiB2b2lkIFJlbmRlclRoZW1lTWFjOjphZGp1c3RTbGlkZXJUcmFj a1N0eWxlKENTU1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHlsZSogc3R5bGUsIEVsZW1lbnQqKSBj b25zdAogewotICAgIHN0eWxlLT5zZXRCb3hTaGFkb3coMCk7CisgICAgc3R5bGUtPnNldEJveFNo YWRvdyhQYXNzT3duUHRyPFNoYWRvd0RhdGE+KCkpOwogfQogCiBib29sIFJlbmRlclRoZW1lTWFj OjpwYWludFNsaWRlclRyYWNrKFJlbmRlck9iamVjdCogbywgY29uc3QgUGFpbnRJbmZvJiBwYWlu dEluZm8sIGNvbnN0IEludFJlY3QmIHIpCkBAIC0xMjkxLDcgKzEyOTEsNyBAQCBib29sIFJlbmRl clRoZW1lTWFjOjpwYWludFNsaWRlclRyYWNrKFJlCiAKIHZvaWQgUmVuZGVyVGhlbWVNYWM6OmFk anVzdFNsaWRlclRodW1iU3R5bGUoQ1NTU3R5bGVTZWxlY3RvciosIFJlbmRlclN0eWxlKiBzdHls ZSwgRWxlbWVudCopIGNvbnN0CiB7Ci0gICAgc3R5bGUtPnNldEJveFNoYWRvdygwKTsKKyAgICBz dHlsZS0+c2V0Qm94U2hhZG93KFBhc3NPd25QdHI8U2hhZG93RGF0YT4oKSk7CiB9CiAKIGNvbnN0 IGZsb2F0IHZlcnRpY2FsU2xpZGVySGVpZ2h0UGFkZGluZyA9IDAuMWY7CkBAIC0xNDQzLDcgKzE0 NDMsNyBAQCB2b2lkIFJlbmRlclRoZW1lTWFjOjphZGp1c3RTZWFyY2hGaWVsZFN0CiAgICAgTlND b250cm9sU2l6ZSBjb250cm9sU2l6ZSA9IGNvbnRyb2xTaXplRm9yRm9udChzdHlsZSk7CiAgICAg c2V0Rm9udEZyb21Db250cm9sU2l6ZShzZWxlY3Rvciwgc3R5bGUsIGNvbnRyb2xTaXplKTsKIAot ICAgIHN0eWxlLT5zZXRCb3hTaGFkb3coMCk7CisgICAgc3R5bGUtPnNldEJveFNoYWRvdyhQYXNz T3duUHRyPFNoYWRvd0RhdGE+KCkpOwogfQogCiBib29sIFJlbmRlclRoZW1lTWFjOjpwYWludFNl YXJjaEZpZWxkQ2FuY2VsQnV0dG9uKFJlbmRlck9iamVjdCogbywgY29uc3QgUGFpbnRJbmZvJiBw YWludEluZm8sIGNvbnN0IEludFJlY3QmIHIpCkBAIC0xNTAyLDcgKzE1MDIsNyBAQCB2b2lkIFJl bmRlclRoZW1lTWFjOjphZGp1c3RTZWFyY2hGaWVsZENhCiAgICAgSW50U2l6ZSBzaXplID0gc2l6 ZUZvclN5c3RlbUZvbnQoc3R5bGUsIGNhbmNlbEJ1dHRvblNpemVzKCkpOwogICAgIHN0eWxlLT5z ZXRXaWR0aChMZW5ndGgoc2l6ZS53aWR0aCgpLCBGaXhlZCkpOwogICAgIHN0eWxlLT5zZXRIZWln aHQoTGVuZ3RoKHNpemUuaGVpZ2h0KCksIEZpeGVkKSk7Ci0gICAgc3R5bGUtPnNldEJveFNoYWRv dygwKTsKKyAgICBzdHlsZS0+c2V0Qm94U2hhZG93KFBhc3NPd25QdHI8U2hhZG93RGF0YT4oKSk7 CiB9CiAKIGNvbnN0IEludFNpemUqIFJlbmRlclRoZW1lTWFjOjpyZXN1bHRzQnV0dG9uU2l6ZXMo KSBjb25zdApAQCAtMTUxNyw3ICsxNTE3LDcgQEAgdm9pZCBSZW5kZXJUaGVtZU1hYzo6YWRqdXN0 U2VhcmNoRmllbGREZQogICAgIEludFNpemUgc2l6ZSA9IHNpemVGb3JTeXN0ZW1Gb250KHN0eWxl LCByZXN1bHRzQnV0dG9uU2l6ZXMoKSk7CiAgICAgc3R5bGUtPnNldFdpZHRoKExlbmd0aChzaXpl LndpZHRoKCkgLSBlbXB0eVJlc3VsdHNPZmZzZXQsIEZpeGVkKSk7CiAgICAgc3R5bGUtPnNldEhl aWdodChMZW5ndGgoc2l6ZS5oZWlnaHQoKSwgRml4ZWQpKTsKLSAgICBzdHlsZS0+c2V0Qm94U2hh ZG93KDApOworICAgIHN0eWxlLT5zZXRCb3hTaGFkb3coUGFzc093blB0cjxTaGFkb3dEYXRhPigp KTsKIH0KIAogYm9vbCBSZW5kZXJUaGVtZU1hYzo6cGFpbnRTZWFyY2hGaWVsZERlY29yYXRpb24o UmVuZGVyT2JqZWN0KiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpCkBAIC0xNTMw LDcgKzE1MzAsNyBAQCB2b2lkIFJlbmRlclRoZW1lTWFjOjphZGp1c3RTZWFyY2hGaWVsZFJlCiAg ICAgSW50U2l6ZSBzaXplID0gc2l6ZUZvclN5c3RlbUZvbnQoc3R5bGUsIHJlc3VsdHNCdXR0b25T aXplcygpKTsKICAgICBzdHlsZS0+c2V0V2lkdGgoTGVuZ3RoKHNpemUud2lkdGgoKSwgRml4ZWQp KTsKICAgICBzdHlsZS0+c2V0SGVpZ2h0KExlbmd0aChzaXplLmhlaWdodCgpLCBGaXhlZCkpOwot ICAgIHN0eWxlLT5zZXRCb3hTaGFkb3coMCk7CisgICAgc3R5bGUtPnNldEJveFNoYWRvdyhQYXNz T3duUHRyPFNoYWRvd0RhdGE+KCkpOwogfQogCiBib29sIFJlbmRlclRoZW1lTWFjOjpwYWludFNl YXJjaEZpZWxkUmVzdWx0c0RlY29yYXRpb24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludElu Zm8mIHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcikKQEAgLTE1NjMsNyArMTU2Myw3IEBAIHZv aWQgUmVuZGVyVGhlbWVNYWM6OmFkanVzdFNlYXJjaEZpZWxkUmUKICAgICBJbnRTaXplIHNpemUg PSBzaXplRm9yU3lzdGVtRm9udChzdHlsZSwgcmVzdWx0c0J1dHRvblNpemVzKCkpOwogICAgIHN0 eWxlLT5zZXRXaWR0aChMZW5ndGgoc2l6ZS53aWR0aCgpICsgcmVzdWx0c0Fycm93V2lkdGgsIEZp eGVkKSk7CiAgICAgc3R5bGUtPnNldEhlaWdodChMZW5ndGgoc2l6ZS5oZWlnaHQoKSwgRml4ZWQp KTsKLSAgICBzdHlsZS0+c2V0Qm94U2hhZG93KDApOworICAgIHN0eWxlLT5zZXRCb3hTaGFkb3co UGFzc093blB0cjxTaGFkb3dEYXRhPigpKTsKIH0KIAogYm9vbCBSZW5kZXJUaGVtZU1hYzo6cGFp bnRTZWFyY2hGaWVsZFJlc3VsdHNCdXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludElu Zm8mIHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcikK