74512 2011-12-14 09:54:04 -0800 Add back the callOnMainThread overload that takes a WTF::Function 2011-12-14 10:36:53 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 521011 0 andersca 2011-12-14 09:54:04 -0800 Add back the callOnMainThread overload that takes a WTF::Function 521016 1 119238 andersca 2011-12-14 10:00:31 -0800 Created attachment 119238 Patch 521017 2 webkit.review.bot 2011-12-14 10:03:21 -0800 Attachment 119238 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/ChangeLog', u'Source..." exit_code: 1 Source/JavaScriptCore/wtf/MainThread.h:50: Extra space before ( in function call [whitespace/parens] [4] Source/JavaScriptCore/wtf/MainThread.cpp:222: Extra space before ( in function call [whitespace/parens] [4] Source/JavaScriptCore/wtf/MainThread.cpp:227: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 3 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 521054 3 andersca 2011-12-14 10:36:53 -0800 Committed r102797: <http://trac.webkit.org/changeset/102797> 119238 2011-12-14 10:00:31 -0800 2011-12-14 10:29:08 -0800 Patch bug-74512-20111214100031.patch text/plain 9900 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNzkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 ZThkMWE0MGY1NzVhZjdjMGUzZDg2OWQ5ODMxM2QzYzFlYTBhMjQ1Li5jNDU0MGJhMWQwODRkYjZi OWNmNDk1ZGM5YmFhMzI2OTgzZGM0Mjc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxMS0xMi0xNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgorCisgICAgICAgIEFkZCBiYWNrIHRoZSBjYWxsT25NYWluVGhyZWFkIG92ZXJsb2FkIHRo YXQgdGFrZXMgYSBXVEY6OkZ1bmN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD03NDUxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBiYWNrIHRoZSBvdmVybG9hZDsgdGhlIGNoYW5nZXMgdG8gV2Vi Q29yZSBzaG91bGQgaG9wZWZ1bGx5IGtlZXAgV2luZG93cyBidWlsZGluZy4KKworICAgICAgICAq IHd0Zi9NYWluVGhyZWFkLmNwcDoKKyAgICAgICAgKFdURjo6Y2FsbEZ1bmN0aW9uT2JqZWN0KToK KyAgICAgICAgKFdURjo6Y2FsbE9uTWFpblRocmVhZCk6CisgICAgICAgICogd3RmL01haW5UaHJl YWQuaDoKKwogMjAxMS0xMi0xMyAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAg ICAgICAgIERGRyBzaG91bGQgaW5mZXIgd2hlbiBsb2NhbCB2YXJpYWJsZXMgYXJlIGRvdWJsZXMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzOWNiZjkzY2Q5Y2VlNmQwODFiMWJkODhmZDY0YTliMjU0NDYzNjJkLi45 OWU3MDcxMmM1ZDdiMGJiM2RlMGYzYzNiNzNhMGJmNGM5ZjU3MTZkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjMgQEAKKzIwMTEtMTItMTQgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxl LmNvbT4KKworICAgICAgICBBZGQgYmFjayB0aGUgY2FsbE9uTWFpblRocmVhZCBvdmVybG9hZCB0 aGF0IHRha2VzIGEgV1RGOjpGdW5jdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NzQ1MTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBFeHBsaWNpdGx5IHF1YWxpZnkgdGhlIEZ1bmN0aW9uIGVudW0gZmxh Zywgc2luY2UgTVNWQzIwMDUgaXMgdG9vIHN0dXBpZCB0byBkaXNhbWJpZ3VhdGUKKyAgICAgICAg dGhlIEZ1bmN0aW9uIGNsYXNzIHRlbXBsYXRlIGFuZCB0aGUgZW51bSBmbGFnLgorCisgICAgICAg ICogYmluZGluZ3MvanMvSlNET01XaW5kb3dDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SlNET01XaW5kb3c6OmdldE93blByb3BlcnR5U2xvdCk6CisgICAgICAgIChXZWJDb3JlOjpKU0RP TVdpbmRvdzo6Z2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKToKKyAgICAgICAgKiBiaW5kaW5ncy9q cy9KU0hpc3RvcnlDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNIaXN0b3J5OjpnZXRP d25Qcm9wZXJ0eVNsb3REZWxlZ2F0ZSk6CisgICAgICAgIChXZWJDb3JlOjpKU0hpc3Rvcnk6Omdl dE93blByb3BlcnR5RGVzY3JpcHRvckRlbGVnYXRlKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9K U0xvY2F0aW9uQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTTG9jYXRpb246OmdldE93 blByb3BlcnR5U2xvdERlbGVnYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkpTTG9jYXRpb246Omdl dE93blByb3BlcnR5RGVzY3JpcHRvckRlbGVnYXRlKToKKwogMjAxMS0xMi0xNCAgUGhpbGlwcGUg Tm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gcGFk VGVtcGxhdGUgbGVhayBpbiB3ZWJraXR3ZWJhdWRpb3NyYwpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL3d0Zi9NYWluVGhyZWFkLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93 dGYvTWFpblRocmVhZC5jcHAKaW5kZXggOTMyY2FkODI2ZjgzNjdjZTBhNGVlZjM1ZmRiODJhODJh NzM3OTA5Zi4uOTE1MTI2NTg5ZjYwMmNhYzdhZjQ3ZDk2ZTBjMDk5YTZhNjNjNWI0ZiAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9NYWluVGhyZWFkLmNwcAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvd3RmL01haW5UaHJlYWQuY3BwCkBAIC0yMTcsNiArMjE3LDE4IEBA IHZvaWQgY2FuY2VsQ2FsbE9uTWFpblRocmVhZChNYWluVGhyZWFkRnVuY3Rpb24qIGZ1bmN0aW9u LCB2b2lkKiBjb250ZXh0KQogICAgIH0KIH0KIAorc3RhdGljIHZvaWQgY2FsbEZ1bmN0aW9uT2Jq ZWN0KHZvaWQqIGNvbnRleHQpCit7CisgICAgRnVuY3Rpb248dm9pZCAoKT4qIGZ1bmN0aW9uID0g c3RhdGljX2Nhc3Q8RnVuY3Rpb248dm9pZCAoKT4qPihjb250ZXh0KTsKKyAgICAoKmZ1bmN0aW9u KSgpOworICAgIGRlbGV0ZSBmdW5jdGlvbjsKK30KKwordm9pZCBjYWxsT25NYWluVGhyZWFkKGNv bnN0IEZ1bmN0aW9uPHZvaWQgKCk+JiBmdW5jdGlvbikKK3sKKyAgICBjYWxsT25NYWluVGhyZWFk KGNhbGxGdW5jdGlvbk9iamVjdCwgbmV3IEZ1bmN0aW9uPHZvaWQgKCk+KGZ1bmN0aW9uKSk7Cit9 CisKIHZvaWQgc2V0TWFpblRocmVhZENhbGxiYWNrc1BhdXNlZChib29sIHBhdXNlZCkKIHsKICAg ICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL3d0Zi9NYWluVGhyZWFkLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL01haW5UaHJl YWQuaAppbmRleCAxZmMwZTMyNjY3YWY3OTU0ZDViZDdmN2U0M2Y3ZWUzMjE3MmVmZjBlLi5jMTUz ZDFlYmE0ODVhNzJmMWRhZmQyOTUzMjM2YWFiM2I3Y2ZjZWQ3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvd3RmL01haW5UaHJlYWQuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvd3RmL01haW5UaHJlYWQuaApAQCAtNDYsNiArNDYsOSBAQCB2b2lkIGNhbGxPbk1haW5UaHJl YWQoTWFpblRocmVhZEZ1bmN0aW9uKiwgdm9pZCogY29udGV4dCk7CiB2b2lkIGNhbGxPbk1haW5U aHJlYWRBbmRXYWl0KE1haW5UaHJlYWRGdW5jdGlvbiosIHZvaWQqIGNvbnRleHQpOwogdm9pZCBj YW5jZWxDYWxsT25NYWluVGhyZWFkKE1haW5UaHJlYWRGdW5jdGlvbiosIHZvaWQqIGNvbnRleHQp OwogCit0ZW1wbGF0ZTx0eXBlbmFtZT4gY2xhc3MgRnVuY3Rpb247Cit2b2lkIGNhbGxPbk1haW5U aHJlYWQoY29uc3QgRnVuY3Rpb248dm9pZCAoKT4mKTsKKyAgICAKIHZvaWQgc2V0TWFpblRocmVh ZENhbGxiYWNrc1BhdXNlZChib29sIHBhdXNlZCk7CiAKIGJvb2wgaXNNYWluVGhyZWFkKCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHAKaW5k ZXggNDE1NjJjMzM2ZWI1YWM5MzAzNDQxZDliOTFiYzdhM2Y3ODVjZmVhZC4uN2NjMmRlZWRmMmQ1 MzRjOTcyMDI4ZDZiYTExZmY1NGQwOWJkM2M1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvanMvSlNET01XaW5kb3dDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL0pTRE9NV2luZG93Q3VzdG9tLmNwcApAQCAtMTM3LDEyICsxMzcsMTIgQEAgYm9v bCBKU0RPTVdpbmRvdzo6Z2V0T3duUHJvcGVydHlTbG90KEpTQ2VsbCogY2VsbCwgRXhlY1N0YXRl KiBleGVjLCBjb25zdCBJZGVudGkKICAgICAgICAgLy8gVGhlIGZvbGxvd2luZyBjb2RlIGlzIHNh ZmUgZm9yIGNyb3NzLWRvbWFpbiBhbmQgc2FtZSBkb21haW4gdXNlLgogICAgICAgICAvLyBJdCBp Z25vcmVzIGFueSBjdXN0b20gcHJvcGVydGllcyB0aGF0IG1pZ2h0IGJlIHNldCBvbiB0aGUgRE9N V2luZG93IChpbmNsdWRpbmcgYSBjdXN0b20gcHJvdG90eXBlKS4KICAgICAgICAgZW50cnkgPSBz X2luZm8ucHJvcEhhc2hUYWJsZShleGVjKS0+ZW50cnkoZXhlYywgcHJvcGVydHlOYW1lKTsKLSAg ICAgICAgaWYgKGVudHJ5ICYmICEoZW50cnktPmF0dHJpYnV0ZXMoKSAmIEZ1bmN0aW9uKSAmJiBl bnRyeS0+cHJvcGVydHlHZXR0ZXIoKSA9PSBqc0RPTVdpbmRvd0Nsb3NlZCkgeworICAgICAgICBp ZiAoZW50cnkgJiYgIShlbnRyeS0+YXR0cmlidXRlcygpICYgSlNDOjpGdW5jdGlvbikgJiYgZW50 cnktPnByb3BlcnR5R2V0dGVyKCkgPT0ganNET01XaW5kb3dDbG9zZWQpIHsKICAgICAgICAgICAg IHNsb3Quc2V0Q3VzdG9tKHRoaXNPYmplY3QsIGVudHJ5LT5wcm9wZXJ0eUdldHRlcigpKTsKICAg ICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAgICAgIGVudHJ5ID0gSlNET01X aW5kb3dQcm90b3R5cGU6OnNfaW5mby5wcm9wSGFzaFRhYmxlKGV4ZWMpLT5lbnRyeShleGVjLCBw cm9wZXJ0eU5hbWUpOwotICAgICAgICBpZiAoZW50cnkgJiYgKGVudHJ5LT5hdHRyaWJ1dGVzKCkg JiBGdW5jdGlvbikgJiYgZW50cnktPmZ1bmN0aW9uKCkgPT0ganNET01XaW5kb3dQcm90b3R5cGVG dW5jdGlvbkNsb3NlKSB7CisgICAgICAgIGlmIChlbnRyeSAmJiAoZW50cnktPmF0dHJpYnV0ZXMo KSAmIEpTQzo6RnVuY3Rpb24pICYmIGVudHJ5LT5mdW5jdGlvbigpID09IGpzRE9NV2luZG93UHJv dG90eXBlRnVuY3Rpb25DbG9zZSkgewogICAgICAgICAgICAgc2xvdC5zZXRDdXN0b20odGhpc09i amVjdCwgbm9uQ2FjaGluZ1N0YXRpY0Z1bmN0aW9uR2V0dGVyPGpzRE9NV2luZG93UHJvdG90eXBl RnVuY3Rpb25DbG9zZSwgMD4pOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0K QEAgLTE3MCw3ICsxNzAsNyBAQCBib29sIEpTRE9NV2luZG93OjpnZXRPd25Qcm9wZXJ0eVNsb3Qo SlNDZWxsKiBjZWxsLCBFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IElkZW50aQogICAgIC8vIHdoYXQg cHJvdG90eXBlIGlzIGFjdHVhbGx5IHNldCBvbiB0aGlzIG9iamVjdC4KICAgICBlbnRyeSA9IEpT RE9NV2luZG93UHJvdG90eXBlOjpzX2luZm8ucHJvcEhhc2hUYWJsZShleGVjKS0+ZW50cnkoZXhl YywgcHJvcGVydHlOYW1lKTsKICAgICBpZiAoZW50cnkpIHsKLSAgICAgICAgaWYgKGVudHJ5LT5h dHRyaWJ1dGVzKCkgJiBGdW5jdGlvbikgeworICAgICAgICBpZiAoZW50cnktPmF0dHJpYnV0ZXMo KSAmIEpTQzo6RnVuY3Rpb24pIHsKICAgICAgICAgICAgIGlmIChlbnRyeS0+ZnVuY3Rpb24oKSA9 PSBqc0RPTVdpbmRvd1Byb3RvdHlwZUZ1bmN0aW9uQmx1cikgewogICAgICAgICAgICAgICAgIGlm ICghYWxsb3dzQWNjZXNzKSB7CiAgICAgICAgICAgICAgICAgICAgIHNsb3Quc2V0Q3VzdG9tKHRo aXNPYmplY3QsIG5vbkNhY2hpbmdTdGF0aWNGdW5jdGlvbkdldHRlcjxqc0RPTVdpbmRvd1Byb3Rv dHlwZUZ1bmN0aW9uQmx1ciwgMD4pOwpAQCAtMjgxLDEyICsyODEsMTIgQEAgYm9vbCBKU0RPTVdp bmRvdzo6Z2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKEpTT2JqZWN0KiBvYmplY3QsIEV4ZWNTdGF0 ZSogZXhlYywgY28KICAgICAgICAgLy8gVGhlIGZvbGxvd2luZyBjb2RlIGlzIHNhZmUgZm9yIGNy b3NzLWRvbWFpbiBhbmQgc2FtZSBkb21haW4gdXNlLgogICAgICAgICAvLyBJdCBpZ25vcmVzIGFu eSBjdXN0b20gcHJvcGVydGllcyB0aGF0IG1pZ2h0IGJlIHNldCBvbiB0aGUgRE9NV2luZG93IChp bmNsdWRpbmcgYSBjdXN0b20gcHJvdG90eXBlKS4KICAgICAgICAgZW50cnkgPSBzX2luZm8ucHJv cEhhc2hUYWJsZShleGVjKS0+ZW50cnkoZXhlYywgcHJvcGVydHlOYW1lKTsKLSAgICAgICAgaWYg KGVudHJ5ICYmICEoZW50cnktPmF0dHJpYnV0ZXMoKSAmIEZ1bmN0aW9uKSAmJiBlbnRyeS0+cHJv cGVydHlHZXR0ZXIoKSA9PSBqc0RPTVdpbmRvd0Nsb3NlZCkgeworICAgICAgICBpZiAoZW50cnkg JiYgIShlbnRyeS0+YXR0cmlidXRlcygpICYgSlNDOjpGdW5jdGlvbikgJiYgZW50cnktPnByb3Bl cnR5R2V0dGVyKCkgPT0ganNET01XaW5kb3dDbG9zZWQpIHsKICAgICAgICAgICAgIGRlc2NyaXB0 b3Iuc2V0RGVzY3JpcHRvcihqc0Jvb2xlYW4odHJ1ZSksIFJlYWRPbmx5IHwgRG9udERlbGV0ZSB8 IERvbnRFbnVtKTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAgICAg IGVudHJ5ID0gSlNET01XaW5kb3dQcm90b3R5cGU6OnNfaW5mby5wcm9wSGFzaFRhYmxlKGV4ZWMp LT5lbnRyeShleGVjLCBwcm9wZXJ0eU5hbWUpOwotICAgICAgICBpZiAoZW50cnkgJiYgKGVudHJ5 LT5hdHRyaWJ1dGVzKCkgJiBGdW5jdGlvbikgJiYgZW50cnktPmZ1bmN0aW9uKCkgPT0ganNET01X aW5kb3dQcm90b3R5cGVGdW5jdGlvbkNsb3NlKSB7CisgICAgICAgIGlmIChlbnRyeSAmJiAoZW50 cnktPmF0dHJpYnV0ZXMoKSAmIEpTQzo6RnVuY3Rpb24pICYmIGVudHJ5LT5mdW5jdGlvbigpID09 IGpzRE9NV2luZG93UHJvdG90eXBlRnVuY3Rpb25DbG9zZSkgewogICAgICAgICAgICAgUHJvcGVy dHlTbG90IHNsb3Q7CiAgICAgICAgICAgICBzbG90LnNldEN1c3RvbSh0aGlzT2JqZWN0LCBub25D YWNoaW5nU3RhdGljRnVuY3Rpb25HZXR0ZXI8anNET01XaW5kb3dQcm90b3R5cGVGdW5jdGlvbkNs b3NlLCAwPik7CiAgICAgICAgICAgICBkZXNjcmlwdG9yLnNldERlc2NyaXB0b3Ioc2xvdC5nZXRW YWx1ZShleGVjLCBwcm9wZXJ0eU5hbWUpLCBSZWFkT25seSB8IERvbnREZWxldGUgfCBEb250RW51 bSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0hpc3RvcnlDdXN0 b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNIaXN0b3J5Q3VzdG9tLmNwcApp bmRleCA2NDcyOWIyMzYyZGQ5NmM3Yzk0OGQxN2FiNWY3OTM0M2E0MDk2MGZiLi43ZTU0MzhlNGEz MGY2YzUwZDFkMDBlNjVmZDgwOTk5ZTM2NTQ5MGJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9qcy9KU0hpc3RvcnlDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL0pTSGlzdG9yeUN1c3RvbS5jcHAKQEAgLTY4LDcgKzY4LDcgQEAgYm9vbCBKU0hp c3Rvcnk6OmdldE93blByb3BlcnR5U2xvdERlbGVnYXRlKEV4ZWNTdGF0ZSogZXhlYywgY29uc3Qg SWRlbnRpZmllciYgcHIKICAgICBjb25zdCBIYXNoRW50cnkqIGVudHJ5ID0gSlNIaXN0b3J5UHJv dG90eXBlOjpzX2luZm8ucHJvcEhhc2hUYWJsZShleGVjKS0+ZW50cnkoZXhlYywgcHJvcGVydHlO YW1lKTsKICAgICBpZiAoZW50cnkpIHsKICAgICAgICAgLy8gQWxsb3cgYWNjZXNzIHRvIGJhY2so KSwgZm9yd2FyZCgpIGFuZCBnbygpIGZyb20gYW55IGZyYW1lLgotICAgICAgICBpZiAoZW50cnkt PmF0dHJpYnV0ZXMoKSAmIEZ1bmN0aW9uKSB7CisgICAgICAgIGlmIChlbnRyeS0+YXR0cmlidXRl cygpICYgSlNDOjpGdW5jdGlvbikgewogICAgICAgICAgICAgaWYgKGVudHJ5LT5mdW5jdGlvbigp ID09IGpzSGlzdG9yeVByb3RvdHlwZUZ1bmN0aW9uQmFjaykgewogICAgICAgICAgICAgICAgIHNs b3Quc2V0Q3VzdG9tKHRoaXMsIG5vbkNhY2hpbmdTdGF0aWNCYWNrRnVuY3Rpb25HZXR0ZXIpOwog ICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtMTA5LDcgKzEwOSw3IEBAIGJvb2wgSlNI aXN0b3J5OjpnZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3JEZWxlZ2F0ZShFeGVjU3RhdGUqIGV4ZWMs IGNvbnN0IElkZW50aWZpCiAgICAgaWYgKGVudHJ5KSB7CiAgICAgICAgIFByb3BlcnR5U2xvdCBz bG90OwogICAgICAgICAvLyBBbGxvdyBhY2Nlc3MgdG8gYmFjaygpLCBmb3J3YXJkKCkgYW5kIGdv KCkgZnJvbSBhbnkgZnJhbWUuCi0gICAgICAgIGlmIChlbnRyeS0+YXR0cmlidXRlcygpICYgRnVu Y3Rpb24pIHsKKyAgICAgICAgaWYgKGVudHJ5LT5hdHRyaWJ1dGVzKCkgJiBKU0M6OkZ1bmN0aW9u KSB7CiAgICAgICAgICAgICBpZiAoZW50cnktPmZ1bmN0aW9uKCkgPT0ganNIaXN0b3J5UHJvdG90 eXBlRnVuY3Rpb25CYWNrKSB7CiAgICAgICAgICAgICAgICAgc2xvdC5zZXRDdXN0b20odGhpcywg bm9uQ2FjaGluZ1N0YXRpY0JhY2tGdW5jdGlvbkdldHRlcik7CiAgICAgICAgICAgICAgICAgZGVz Y3JpcHRvci5zZXREZXNjcmlwdG9yKHNsb3QuZ2V0VmFsdWUoZXhlYywgcHJvcGVydHlOYW1lKSwg ZW50cnktPmF0dHJpYnV0ZXMoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0xvY2F0aW9uQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pT TG9jYXRpb25DdXN0b20uY3BwCmluZGV4IGExODgzMWMxMDRkNjU4MmVhYmNjYWJhZDkwN2E0OGU3 Y2U4OTA4NTAuLjA5NWVhYmM0MzBjMWNlMzNlNjk0ZjlkOTMzYmZkNDczOTRmYmM0ZTQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTG9jYXRpb25DdXN0b20uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTG9jYXRpb25DdXN0b20uY3BwCkBAIC02 NCw3ICs2NCw3IEBAIGJvb2wgSlNMb2NhdGlvbjo6Z2V0T3duUHJvcGVydHlTbG90RGVsZWdhdGUo RXhlY1N0YXRlKiBleGVjLCBjb25zdCBJZGVudGlmaWVyJiBwCiAKICAgICAvLyBDaGVjayBmb3Ig dGhlIGZldyBmdW5jdGlvbnMgdGhhdCB3ZSBhbGxvdywgZXZlbiB3aGVuIGNhbGxlZCBjcm9zcy1k b21haW4uCiAgICAgY29uc3QgSGFzaEVudHJ5KiBlbnRyeSA9IEpTTG9jYXRpb25Qcm90b3R5cGU6 OnNfaW5mby5wcm9wSGFzaFRhYmxlKGV4ZWMpLT5lbnRyeShleGVjLCBwcm9wZXJ0eU5hbWUpOwot ICAgIGlmIChlbnRyeSAmJiAoZW50cnktPmF0dHJpYnV0ZXMoKSAmIEZ1bmN0aW9uKSkgeworICAg IGlmIChlbnRyeSAmJiAoZW50cnktPmF0dHJpYnV0ZXMoKSAmIEpTQzo6RnVuY3Rpb24pKSB7CiAg ICAgICAgIGlmIChlbnRyeS0+ZnVuY3Rpb24oKSA9PSBqc0xvY2F0aW9uUHJvdG90eXBlRnVuY3Rp b25SZXBsYWNlKSB7CiAgICAgICAgICAgICBzbG90LnNldEN1c3RvbSh0aGlzLCBub25DYWNoaW5n U3RhdGljUmVwbGFjZUZ1bmN0aW9uR2V0dGVyKTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwpA QCAtMTAxLDcgKzEwMSw3IEBAIGJvb2wgSlNMb2NhdGlvbjo6Z2V0T3duUHJvcGVydHlEZXNjcmlw dG9yRGVsZWdhdGUoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBJZGVudGlmCiAgICAgLy8gQ2hlY2sg Zm9yIHRoZSBmZXcgZnVuY3Rpb25zIHRoYXQgd2UgYWxsb3csIGV2ZW4gd2hlbiBjYWxsZWQgY3Jv c3MtZG9tYWluLgogICAgIGNvbnN0IEhhc2hFbnRyeSogZW50cnkgPSBKU0xvY2F0aW9uUHJvdG90 eXBlOjpzX2luZm8ucHJvcEhhc2hUYWJsZShleGVjKS0+ZW50cnkoZXhlYywgcHJvcGVydHlOYW1l KTsKICAgICBQcm9wZXJ0eVNsb3Qgc2xvdDsKLSAgICBpZiAoZW50cnkgJiYgKGVudHJ5LT5hdHRy aWJ1dGVzKCkgJiBGdW5jdGlvbikpIHsKKyAgICBpZiAoZW50cnkgJiYgKGVudHJ5LT5hdHRyaWJ1 dGVzKCkgJiBKU0M6OkZ1bmN0aW9uKSkgewogICAgICAgICBpZiAoZW50cnktPmZ1bmN0aW9uKCkg PT0ganNMb2NhdGlvblByb3RvdHlwZUZ1bmN0aW9uUmVwbGFjZSkgewogICAgICAgICAgICAgc2xv dC5zZXRDdXN0b20odGhpcywgbm9uQ2FjaGluZ1N0YXRpY1JlcGxhY2VGdW5jdGlvbkdldHRlcik7 CiAgICAgICAgICAgICBkZXNjcmlwdG9yLnNldERlc2NyaXB0b3Ioc2xvdC5nZXRWYWx1ZShleGVj LCBwcm9wZXJ0eU5hbWUpLCBlbnRyeS0+YXR0cmlidXRlcygpKTsK