47209 2010-10-05 14:11:54 -0700 Start sending Carbon plug-in events in the Carbon event model 2010-10-05 14:44:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 andersca andersca oldest_to_newest 289876 0 andersca 2010-10-05 14:11:54 -0700 Start sending Carbon plug-in events in th Carbon event model 289877 1 andersca 2010-10-05 14:12:40 -0700 <rdar://problem/8515677> 289880 2 69841 andersca 2010-10-05 14:17:26 -0700 Created attachment 69841 Patch 289900 3 andersca 2010-10-05 14:44:13 -0700 Committed r69150: <http://trac.webkit.org/changeset/69150> 69841 2010-10-05 14:17:26 -0700 2010-10-05 14:41:21 -0700 Patch bug-47209-20101005141724.patch text/plain 10763 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg OTljNDBmZjY1NWY1MjQ5MDBmODBkN2E5OTA3OTg2YzY2ZjJlN2RlOS4uMzg5MDVmMGJiZGNjMGQ5 OTgyMjJkNjc5MzE4MDk1NTk2NTIxNzJmMiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNCBAQAorMjAxMC0xMC0wNSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0YXJ0IHNlbmRpbmcgQ2FyYm9uIHBsdWctaW4g ZXZlbnRzIGluIHRoIENhcmJvbiBldmVudCBtb2RlbAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDcyMDkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg1 MTU2Nzc+CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQ bHVnaW4uY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6TmV0c2NhcGVQbHVn aW4pOgorICAgICAgICBJbml0aWFsaXplIHRoZSBOUF9DR0NvbnRleHQgc3RydWN0LgorCisgICAg ICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL21hYy9OZXRzY2FwZVBsdWdpbk1hYy5t bToKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtUG9zdEluaXRpYWxp emUpOgorICAgICAgICBDcmVhdGUgYSBmYWtlIENhcmJvbiB3aW5kb3cuCisKKyAgICAgICAgKFdl YktpdDo6TmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtRGVzdHJveSk6CisgICAgICAgIERlc3Ryb3kg dGhlIENhcmJvbiB3aW5kb3cuCisKKyAgICAgICAgKFdlYktpdDo6bW9kaWZpZXJzRm9yRXZlbnQp OgorICAgICAgICBHaXZlbiBhIFdlYkV2ZW50LCByZXR1cm4gdGhlIEV2ZW50UmVjb3JkIG1vZGlm aWVycy4KKworICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1QYWludCk6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybUhhbmRsZU1vdXNlRXZl bnQpOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1IYW5kbGVXaGVl bEV2ZW50KToKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtSGFuZGxl TW91c2VFbnRlckV2ZW50KToKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46OnBsYXRm b3JtSGFuZGxlTW91c2VMZWF2ZUV2ZW50KToKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVn aW46OnBsYXRmb3JtU2V0Rm9jdXMpOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6 d2luZG93Rm9jdXNDaGFuZ2VkKToKKyAgICAgICAgQ3JlYXRlIENhcmJvbiBFdmVudFJlY29yZHMg YW5kIGNhbGwgTlBQX0hhbmRsZUV2ZW50LgorCiAyMDEwLTEwLTA1ICBTYW0gV2VpbmlnICA8c2Ft QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFyayBSb3dlLgpkaWZmIC0tZ2l0 IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3Bw IGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3Bw CmluZGV4IDY1ZmNhY2UzNzljNTNmNGZmOTM2NmFiMWI5M2Q4ZmMxNDZiNDM4ZWEuLjE4ZWRjMzgy YWQ4MDNiNDMxNjBiYzcxYTFlNGI1MjUzNWI1ZDQ2NDAgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcAorKysgYi9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAKQEAgLTU2LDYg KzU2LDkgQEAgTmV0c2NhcGVQbHVnaW46Ok5ldHNjYXBlUGx1Z2luKFBhc3NSZWZQdHI8TmV0c2Nh cGVQbHVnaW5Nb2R1bGU+IHBsdWdpbk1vZHVsZSkKICNpZiBQTEFURk9STShNQUMpCiAgICAgLCBt X2RyYXdpbmdNb2RlbChzdGF0aWNfY2FzdDxOUERyYXdpbmdNb2RlbD4oLTEpKQogICAgICwgbV9l dmVudE1vZGVsKHN0YXRpY19jYXN0PE5QRXZlbnRNb2RlbD4oLTEpKQorI2lmbmRlZiBOUF9OT19D QVJCT04KKyAgICAsIG1fbnBDR0NvbnRleHQoKQorI2VuZGlmICAgIAogI2VuZGlmCiB7CiAgICAg bV9ucHAubmRhdGEgPSB0aGlzOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmgKaW5kZXggNjBmYzI5ZTQzMGViYmFlYTA5NzI1Yjhh Y2FiMWQ0NTFmYjBjMWNlZS4uZjI3Mzc1NTc4MzFhNDZmZGRkYjI5M2JjNzllNzQ1OTFmNmI0OTli NCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2Nh cGVQbHVnaW4uaAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRz Y2FwZVBsdWdpbi5oCkBAIC01NSw2ICs1NSw5IEBAIHB1YmxpYzoKICNpZiBQTEFURk9STShNQUMp CiAgICAgTlBFcnJvciBzZXREcmF3aW5nTW9kZWwoTlBEcmF3aW5nTW9kZWwpOwogICAgIE5QRXJy b3Igc2V0RXZlbnRNb2RlbChOUEV2ZW50TW9kZWwpOworI2lmbmRlZiBOUF9OT19DQVJCT04KKyAg ICBXaW5kb3dSZWYgd2luZG93UmVmKCkgY29uc3Q7CisjZW5kaWYKICNlbGlmIFBMQVRGT1JNKFdJ TikKICAgICBIV05EIGNvbnRhaW5pbmdXaW5kb3coKSBjb25zdDsKICNlbmRpZgpAQCAtMTg2LDYg KzE4OSw5IEBAIHByaXZhdGU6CiAgICAgTlBEcmF3aW5nTW9kZWwgbV9kcmF3aW5nTW9kZWw7CiAg ICAgTlBFdmVudE1vZGVsIG1fZXZlbnRNb2RlbDsKICAgICBSZXRhaW5QdHI8UGxhdGZvcm1MYXll cj4gbV9wbHVnaW5MYXllcjsKKyNpZm5kZWYgTlBfTk9fQ0FSQk9OCisgICAgTlBfQ0dDb250ZXh0 IG1fbnBDR0NvbnRleHQ7CisjZW5kaWYKICNlbGlmIFBMQVRGT1JNKFdJTikKICAgICBIV05EIG1f d2luZG93OwogI2VuZGlmCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9O ZXRzY2FwZS9tYWMvTmV0c2NhcGVQbHVnaW5NYWMubW0gYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9OZXRzY2FwZS9tYWMvTmV0c2NhcGVQbHVnaW5NYWMubW0KaW5kZXggMTYzNmFiMmU5YThl M2EwZDg3NjJmZWRiMzlmZTg5N2ZiMDFkYjg1MC4uYTk3MGJkNDQ5ODYwMDc1MTkyOWU1MzNiMTgz NGU5MGY2Nzc1YmUwZCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0 c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2luTWFjLm1tCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL05ldHNjYXBlL21hYy9OZXRzY2FwZVBsdWdpbk1hYy5tbQpAQCAtMjUsNyArMjUsNyBA QAogCiAjaW5jbHVkZSAiTmV0c2NhcGVQbHVnaW4uaCIKIAotI2luY2x1ZGUgPEFwcEtpdC9BcHBL aXQuaD4KKyNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgogI2luY2x1ZGUgIldlYkV2ZW50Lmgi CiAjaW5jbHVkZSA8V2ViQ29yZS9HcmFwaGljc0NvbnRleHQuaD4KIApAQCAtMTIyLDExICsxMjIs MzAgQEAgYm9vbCBOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1Qb3N0SW5pdGlhbGl6ZSgpCiAgICAg ICAgIH0KICAgICB9CiAKKyNpZm5kZWYgTlBfTk9fQ0FSQk9OCisgICAgaWYgKG1fZXZlbnRNb2Rl bCA9PSBOUEV2ZW50TW9kZWxDYXJib24pIHsKKyAgICAgICAgLy8gSW5pdGlhbGl6ZSB0aGUgZmFr ZSBDYXJib24gd2luZG93LgorICAgICAgICBSZWN0IGJvdW5kcyA9IHsgMCwgMCwgMCwgMCB9Owor ICAgICAgICBDcmVhdGVOZXdXaW5kb3coa0RvY3VtZW50V2luZG93Q2xhc3MsIDAsICZib3VuZHMs IHJlaW50ZXJwcmV0X2Nhc3Q8V2luZG93UmVmKj4oJm1fbnBDR0NvbnRleHQud2luZG93KSk7Cisg ICAgICAgIAorICAgICAgICAvLyBGSVhNRTogRGlzYWJsZSB0aGUgYmFja2luZyBzdG9yZS4KKyAg ICAgICAgCisgICAgICAgIG1fbnBXaW5kb3cud2luZG93ID0gJm1fbnBDR0NvbnRleHQ7CisgICAg fQorI2VuZGlmCisKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAogdm9pZCBOZXRzY2FwZVBsdWdpbjo6 cGxhdGZvcm1EZXN0cm95KCkKIHsKKyNpZm5kZWYgTlBfTk9fQ0FSQk9OCisgICAgaWYgKG1fZXZl bnRNb2RlbCA9PSBOUEV2ZW50TW9kZWxDYXJib24pIHsKKyAgICAgICAgLy8gRGVzdHJveSB0aGUg ZmFrZSBDYXJib24gd2luZG93LgorICAgICAgICBBU1NFUlQobV9ucENHQ29udGV4dC53aW5kb3cp OworICAgICAgICBEaXNwb3NlV2luZG93KHN0YXRpY19jYXN0PFdpbmRvd1JlZj4obV9ucENHQ29u dGV4dC53aW5kb3cpKTsKKyAgICB9CisjZW5kaWYKIH0KIAogdm9pZCBOZXRzY2FwZVBsdWdpbjo6 cGxhdGZvcm1HZW9tZXRyeURpZENoYW5nZSgpCkBAIC0xNDMsOCArMTYyLDgwIEBAIHN0YXRpYyBp bmxpbmUgTlBDb2NvYUV2ZW50IGluaXRpYWxpemVFdmVudChOUENvY29hRXZlbnRUeXBlIHR5cGUp CiAgICAgcmV0dXJuIGV2ZW50OwogfQogCisjaWZuZGVmIE5QX05PX0NBUkJPTgorV2luZG93UmVm IE5ldHNjYXBlUGx1Z2luOjp3aW5kb3dSZWYoKSBjb25zdAoreworICAgIEFTU0VSVChtX2V2ZW50 TW9kZWwgPT0gTlBFdmVudE1vZGVsQ2FyYm9uKTsKKworICAgIHJldHVybiByZWludGVycHJldF9j YXN0PFdpbmRvd1JlZj4obV9ucENHQ29udGV4dC53aW5kb3cpOworfQorCitzdGF0aWMgaW5saW5l IEV2ZW50UmVjb3JkIGluaXRpYWxpemVFdmVudFJlY29yZChFdmVudEtpbmQgZXZlbnRLaW5kKQor eworICAgIEV2ZW50UmVjb3JkIGV2ZW50UmVjb3JkOworCisgICAgZXZlbnRSZWNvcmQud2hhdCA9 IGV2ZW50S2luZDsKKyAgICBldmVudFJlY29yZC5tZXNzYWdlID0gMDsKKyAgICBldmVudFJlY29y ZC53aGVuID0gVGlja0NvdW50KCk7CisgICAgZXZlbnRSZWNvcmQud2hlcmUgPSBQb2ludCgpOwor ICAgIGV2ZW50UmVjb3JkLm1vZGlmaWVycyA9IDA7CisKKyAgICByZXR1cm4gZXZlbnRSZWNvcmQ7 Cit9CisKK3N0YXRpYyBib29sIGFueU1vdXNlQnV0dG9uSXNEb3duKGNvbnN0IFdlYkV2ZW50JiBl dmVudCkKK3sKKyAgICBpZiAoZXZlbnQudHlwZSgpID09IFdlYkV2ZW50OjpNb3VzZURvd24pCisg ICAgICAgIHJldHVybiB0cnVlOworCisgICAgaWYgKGV2ZW50LnR5cGUoKSA9PSBXZWJFdmVudDo6 TW91c2VNb3ZlICYmIHN0YXRpY19jYXN0PGNvbnN0IFdlYk1vdXNlRXZlbnQmPihldmVudCkuYnV0 dG9uKCkgIT0gV2ViTW91c2VFdmVudDo6Tm9CdXR0b24pCisgICAgICAgIHJldHVybiB0cnVlOwor CisgICAgcmV0dXJuIGZhbHNlOworfQorCitzdGF0aWMgYm9vbCByaWdodE1vdXNlQnV0dG9uSXNE b3duKGNvbnN0IFdlYkV2ZW50JiBldmVudCkKK3sKKyAgICBpZiAoZXZlbnQudHlwZSgpID09IFdl YkV2ZW50OjpNb3VzZURvd24gJiYgc3RhdGljX2Nhc3Q8Y29uc3QgV2ViTW91c2VFdmVudCY+KGV2 ZW50KS5idXR0b24oKSA9PSBXZWJNb3VzZUV2ZW50OjpSaWdodEJ1dHRvbikKKyAgICAgICAgcmV0 dXJuIHRydWU7CisgICAgCisgICAgaWYgKGV2ZW50LnR5cGUoKSA9PSBXZWJFdmVudDo6TW91c2VN b3ZlICYmIHN0YXRpY19jYXN0PGNvbnN0IFdlYk1vdXNlRXZlbnQmPihldmVudCkuYnV0dG9uKCkg PT0gV2ViTW91c2VFdmVudDo6UmlnaHRCdXR0b24pCisgICAgICAgIHJldHVybiB0cnVlOworICAg IAorICAgIHJldHVybiBmYWxzZTsKK30KKworICAgIAorc3RhdGljIEV2ZW50TW9kaWZpZXJzIG1v ZGlmaWVyc0ZvckV2ZW50KGNvbnN0IFdlYkV2ZW50JiBldmVudCkKK3sKKyAgICBFdmVudE1vZGlm aWVycyBtb2RpZmllcnMgPSAwOworCisgICAgLy8gV2Ugb25seSB3YW50IHRvIHNldCB0aGUgYnRu U3RhdGUgaWYgYSBtb3VzZSBidXR0b24gaXMgX25vdF8gZG93bi4KKyAgICBpZiAoIWFueU1vdXNl QnV0dG9uSXNEb3duKGV2ZW50KSkKKyAgICAgICAgbW9kaWZpZXJzIHw9IGJ0blN0YXRlOworCisg ICAgaWYgKGV2ZW50Lm1ldGFLZXkoKSkKKyAgICAgICAgbW9kaWZpZXJzIHw9IGNtZEtleTsKKwor ICAgIGlmIChldmVudC5zaGlmdEtleSgpKQorICAgICAgICBtb2RpZmllcnMgfD0gc2hpZnRLZXk7 CisKKyAgICBpZiAoZXZlbnQuYWx0S2V5KCkpCisgICAgICAgIG1vZGlmaWVycyB8PSBvcHRpb25L ZXk7CisKKyAgICAvLyBTZXQgY29udHJvbEtleSBpZiB0aGUgY29udHJvbCBrZXkgaXMgZG93biBv ciB0aGUgcmlnaHQgbW91c2UgYnV0dG9uIGlzIGRvd24uCisgICAgaWYgKGV2ZW50LmNvbnRyb2xL ZXkoKSB8fCByaWdodE1vdXNlQnV0dG9uSXNEb3duKGV2ZW50KSkKKyAgICAgICAgbW9kaWZpZXJz IHw9IGNvbnRyb2xLZXk7CisKKyAgICByZXR1cm4gbW9kaWZpZXJzOworfQorCisjZW5kaWYKKwog dm9pZCBOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1QYWludChHcmFwaGljc0NvbnRleHQqIGNvbnRl eHQsIGNvbnN0IEludFJlY3QmIGRpcnR5UmVjdCkKIHsKKyAgICBDR0NvbnRleHRSZWYgcGxhdGZv cm1Db250ZXh0ID0gY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCk7CisKICAgICAvLyBUcmFuc2xh dGUgdGhlIGNvbnRleHQgc28gdGhhdCB0aGUgb3JpZ2luIGlzIGF0IHRoZSB0b3AgbGVmdCBjb3Ju ZXIgb2YgdGhlIHBsdWctaW4gdmlldy4KICAgICBjb250ZXh0LT50cmFuc2xhdGUobV9mcmFtZVJl Y3QueCgpLCBtX2ZyYW1lUmVjdC55KCkpOwogCkBAIC0xNTYsNyArMjQ3LDcgQEAgdm9pZCBOZXRz Y2FwZVBsdWdpbjo6cGxhdGZvcm1QYWludChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0 IEludFJlY3QmIGRpcnQKIAogICAgICAgICAgICAgTlBDb2NvYUV2ZW50IGV2ZW50ID0gaW5pdGlh bGl6ZUV2ZW50KE5QQ29jb2FFdmVudERyYXdSZWN0KTsKIAotICAgICAgICAgICAgZXZlbnQuZGF0 YS5kcmF3LmNvbnRleHQgPSBjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKKyAgICAgICAgICAg IGV2ZW50LmRhdGEuZHJhdy5jb250ZXh0ID0gcGxhdGZvcm1Db250ZXh0OwogICAgICAgICAgICAg ZXZlbnQuZGF0YS5kcmF3LnggPSBkaXJ0eVJlY3QueCgpIC0gbV9mcmFtZVJlY3QueCgpOwogICAg ICAgICAgICAgZXZlbnQuZGF0YS5kcmF3LnkgPSBkaXJ0eVJlY3QueSgpIC0gbV9mcmFtZVJlY3Qu eSgpOwogICAgICAgICAgICAgZXZlbnQuZGF0YS5kcmF3LndpZHRoID0gZGlydHlSZWN0LndpZHRo KCk7CkBAIC0xNjUsNyArMjU2LDIyIEBAIHZvaWQgTmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtUGFp bnQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkaXJ0CiAgICAgICAg ICAgICBOUFBfSGFuZGxlRXZlbnQoJmV2ZW50KTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICB9Ci0gICAgICAgIAorCisjaWZuZGVmIE5QX05PX0NBUkJPTgorICAgICAgICBjYXNlIE5QRXZl bnRNb2RlbENhcmJvbjogeworICAgICAgICAgICAgaWYgKHBsYXRmb3JtQ29udGV4dCAhPSBtX25w Q0dDb250ZXh0LmNvbnRleHQpIHsKKyAgICAgICAgICAgICAgICBtX25wQ0dDb250ZXh0LmNvbnRl eHQgPSBwbGF0Zm9ybUNvbnRleHQ7CisgICAgICAgICAgICAgICAgY2FsbFNldFdpbmRvdygpOwor ICAgICAgICAgICAgfQorCisgICAgICAgICAgICBFdmVudFJlY29yZCBldmVudCA9IGluaXRpYWxp emVFdmVudFJlY29yZCh1cGRhdGVFdnQpOworICAgICAgICAgICAgZXZlbnQubWVzc2FnZSA9IHJl aW50ZXJwcmV0X2Nhc3Q8dW5zaWduZWQgbG9uZz4od2luZG93UmVmKCkpOworICAgICAgICAgICAg CisgICAgICAgICAgICBOUFBfSGFuZGxlRXZlbnQoJmV2ZW50KTsKKyAgICAgICAgICAgIGJyZWFr OyAgICAgICAgICAgIAorICAgICAgICB9CisjZW5kaWYKKwogICAgICAgICBkZWZhdWx0OgogICAg ICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgfQpAQCAtMjUxLDYgKzM1NywxMyBA QCBib29sIE5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybUhhbmRsZU1vdXNlRXZlbnQoY29uc3QgV2Vi TW91c2VFdmVudCYgbW91c2VFdmVudCkKICAgICAgICAgICAgIHJldHVybiBOUFBfSGFuZGxlRXZl bnQoJmV2ZW50KTsKICAgICAgICAgfQogCisjaWZuZGVmIE5QX05PX0NBUkJPTgorICAgICAgICBj YXNlIE5QRXZlbnRNb2RlbENhcmJvbjogeworICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsK KyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorI2VuZGlmCisKICAgICAgICAg ZGVmYXVsdDoKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KQEAgLTI3 NSw2ICszODgsMTIgQEAgYm9vbCBOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1IYW5kbGVXaGVlbEV2 ZW50KGNvbnN0IFdlYldoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCiAgICAgICAgICAgICByZXR1cm4g TlBQX0hhbmRsZUV2ZW50KCZldmVudCk7CiAgICAgICAgIH0KIAorI2lmbmRlZiBOUF9OT19DQVJC T04KKyAgICAgICAgY2FzZSBOUEV2ZW50TW9kZWxDYXJib246CisgICAgICAgICAgICAvLyBDYXJi b24gZG9lc24ndCBoYXZlIHdoZWVsIGV2ZW50cy4KKyAgICAgICAgICAgIGJyZWFrOworI2VuZGlm CisKICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwog ICAgIH0KQEAgLTI5Miw2ICs0MTEsMTUgQEAgYm9vbCBOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1I YW5kbGVNb3VzZUVudGVyRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYgbW91c2VFdmUKICAgICAg ICAgICAgIHJldHVybiBOUFBfSGFuZGxlRXZlbnQoJmV2ZW50KTsKICAgICAgICAgfQogCisjaWZu ZGVmIE5QX05PX0NBUkJPTgorICAgICAgICBjYXNlIE5QRXZlbnRNb2RlbENhcmJvbjogeworICAg ICAgICAgICAgRXZlbnRSZWNvcmQgZXZlbnRSZWNvcmQgPSBpbml0aWFsaXplRXZlbnRSZWNvcmQo YWRqdXN0Q3Vyc29yRXZlbnQpOworICAgICAgICAgICAgZXZlbnRSZWNvcmQubW9kaWZpZXJzID0g bW9kaWZpZXJzRm9yRXZlbnQobW91c2VFdmVudCk7CisgICAgICAgICAgICAKKyAgICAgICAgICAg IHJldHVybiBOUFBfSGFuZGxlRXZlbnQoJmV2ZW50UmVjb3JkKTsKKyAgICAgICAgfQorI2VuZGlm CisKICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwog ICAgIH0KQEAgLTMwOSw2ICs0MzcsMTUgQEAgYm9vbCBOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1I YW5kbGVNb3VzZUxlYXZlRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYgbW91c2VFdmUKICAgICAg ICAgICAgIHJldHVybiBOUFBfSGFuZGxlRXZlbnQoJmV2ZW50KTsKICAgICAgICAgfQogCisjaWZu ZGVmIE5QX05PX0NBUkJPTgorICAgICAgICBjYXNlIE5QRXZlbnRNb2RlbENhcmJvbjogeworICAg ICAgICAgICAgRXZlbnRSZWNvcmQgZXZlbnRSZWNvcmQgPSBpbml0aWFsaXplRXZlbnRSZWNvcmQo YWRqdXN0Q3Vyc29yRXZlbnQpOworICAgICAgICAgICAgZXZlbnRSZWNvcmQubW9kaWZpZXJzID0g bW9kaWZpZXJzRm9yRXZlbnQobW91c2VFdmVudCk7CisgICAgICAgICAgICAKKyAgICAgICAgICAg IHJldHVybiBOUFBfSGFuZGxlRXZlbnQoJmV2ZW50UmVjb3JkKTsKKyAgICAgICAgfQorI2VuZGlm CisKICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwog ICAgIH0KQEAgLTM4NCw2ICs1MjEsMTUgQEAgdm9pZCBOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1T ZXRGb2N1cyhib29sIGhhc0ZvY3VzKQogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KIAor I2lmbmRlZiBOUF9OT19DQVJCT04KKyAgICAgICAgY2FzZSBOUEV2ZW50TW9kZWxDYXJib246IHsK KyAgICAgICAgICAgIEV2ZW50UmVjb3JkIGV2ZW50ID0gaW5pdGlhbGl6ZUV2ZW50UmVjb3JkKGhh c0ZvY3VzID8gZ2V0Rm9jdXNFdmVudCA6IGxvc2VGb2N1c0V2ZW50KTsKKworICAgICAgICAgICAg TlBQX0hhbmRsZUV2ZW50KCZldmVudCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQor I2VuZGlmCisgICAgICAgICAgICAKICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KQEAgLTQwMCw2ICs1NDYsMjIgQEAgdm9pZCBOZXRzY2Fw ZVBsdWdpbjo6d2luZG93Rm9jdXNDaGFuZ2VkKGJvb2wgaGFzRm9jdXMpCiAgICAgICAgICAgICBO UFBfSGFuZGxlRXZlbnQoJmV2ZW50KTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9Cisg ICAgICAgIAorI2lmbmRlZiBOUF9OT19DQVJCT04KKyAgICAgICAgY2FzZSBOUEV2ZW50TW9kZWxD YXJib246IHsKKyAgICAgICAgICAgIEhpbGl0ZVdpbmRvdyh3aW5kb3dSZWYoKSwgaGFzRm9jdXMp OworICAgICAgICAgICAgaWYgKGhhc0ZvY3VzKQorICAgICAgICAgICAgICAgIFNldFVzZXJGb2N1 c1dpbmRvdyh3aW5kb3dSZWYoKSk7CisKKyAgICAgICAgICAgIEV2ZW50UmVjb3JkIGV2ZW50ID0g aW5pdGlhbGl6ZUV2ZW50UmVjb3JkKGFjdGl2YXRlRXZ0KTsKKyAgICAgICAgICAgIGV2ZW50Lm1l c3NhZ2UgPSByZWludGVycHJldF9jYXN0PHVuc2lnbmVkIGxvbmc+KHdpbmRvd1JlZigpKTsKKyAg ICAgICAgICAgIGlmIChoYXNGb2N1cykKKyAgICAgICAgICAgICAgICBldmVudC5tb2RpZmllcnMg fD0gYWN0aXZlRmxhZzsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgTlBQX0hhbmRsZUV2ZW50 KCZldmVudCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorI2VuZGlmCiAKICAgICAg ICAgZGVmYXVsdDoKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwo=