71526 2011-11-03 17:41:10 -0700 Add NetscapePlugin::convertFromRootView 2011-11-04 10:04:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 495943 0 andersca 2011-11-03 17:41:10 -0700 Add NetscapePlugin::convertFromRootView 495945 1 113596 andersca 2011-11-03 17:43:09 -0700 Created attachment 113596 Patch 496251 2 andersca 2011-11-04 10:04:26 -0700 Committed r99289: <http://trac.webkit.org/changeset/99289> 113596 2011-11-03 17:43:09 -0700 2011-11-04 09:49:51 -0700 Patch bug-71526-20111103174328.patch text/plain 9669 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogOTkyNTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlOGU0ZmMxZGEwMDkxNDEw Y2Y3ZjA0MTJkMzIwNTZjMjA5ZDc2YTU0Li44MTg1NmE1NTBkZjljNzI0OTAwYzc5NDRhZmFhMzQz MzU0MDc0Y2JlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMTEtMDMgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgTmV0c2NhcGVQ bHVnaW46OmNvbnZlcnRGcm9tUm9vdFZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTcxNTI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRXhwb3J0IHNvbWUgc3ltYm9scyB0aGF0IFdlYktpdDIgbmVlZHMu CisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKwogMjAxMS0xMS0wMyAgRGFuaWVsIEJhdGVz ICA8ZGJhdGVzQHJpbS5jb20+CiAKICAgICAgICAgQ01ha2U6IEFkZCBtaXNzaW5nIFdlYkdMIElE TCBmaWxlIGh0bWwvY2FudmFzL1dlYkdMQ29udGV4dEV2ZW50LmlkbApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGE0 NTg0YTJiMGIwYTFlMWJiNmE1ZjQwZWE2ZjNhNjc4YTUxNzg5NTkuLmJkYjhmMzYyNWI2NDIyZWQ5 OTc3ZTZlOGZmNmRmZTA4NWMwZTQ2ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyOCBAQAogMjAx MS0xMS0wMyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAg IEFkZCBOZXRzY2FwZVBsdWdpbjo6Y29udmVydEZyb21Sb290VmlldworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE1MjYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRz Y2FwZS9OZXRzY2FwZVBsdWdpbi5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2lu Ojpjb252ZXJ0RnJvbVJvb3RWaWV3KToKKyAgICAgICAgTmV3IGZ1bmN0aW9uIHRoYXQgY29udmVy dHMgYSBwb2ludCBmcm9tIHJvb3QgdmlldyBjb29yZGluYXRlcyB0byBwbHVnLWluIGNvb3JkaW5h dGVzLgorICAgICAgICBSZXR1cm5zIGZhbHNlIGlmIHRoZSBjb252ZXJzaW9uIGNhbid0IGJlIGRv bmUuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVn aW4uaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBl UGx1Z2luTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpmaWxsSW5Db2NvYUV2ZW50RnJvbU1vdXNl RXZlbnQpOgorICAgICAgICAoV2ViS2l0Ojppbml0aWFsaXplTW91c2VFdmVudCk6CisgICAgICAg IChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybUhhbmRsZU1vdXNlRXZlbnQpOgorICAg ICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1IYW5kbGVXaGVlbEV2ZW50KToK KyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtSGFuZGxlTW91c2VFbnRl ckV2ZW50KToKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtSGFuZGxl TW91c2VMZWF2ZUV2ZW50KToKKyAgICAgICAgVXNlIGNvbnZlcnRGcm9tUm9vdFZpZXcgaW5zdGVh ZCBvZiBzdWJ0cmFjdGluZyBtX2ZyYW1lUmVjdEluV2luZG93Q29vcmRpbmF0ZXMubG9jYXRpb24o KSBmcm9tIHRoZQorICAgICAgICBldmVudCBwb3NpdGlvbiAod2hpY2ggaXMgaW4gcm9vdCB2aWV3 IGNvb3JkaW5hdGVzKS4KKworMjAxMS0xMS0wMyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FA YXBwbGUuY29tPgorCiAgICAgICAgIEdldCByaWQgb2YgTmV0c2NhcGVQbHVnaW46Om1fY2xpcFJl Y3RJbldpbmRvd0Nvb3JkaW5hdGVzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03MTUyMQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4IGM5MzRkMDUyNDgx YzNkNGU3ZGU3NGNiNjg4NjJlNmI4NjRmNDU0ZDEuLjQ5OTUxZjA0ZjVmMWNhOWY5NWQ3NjgzZDkw ZDk3YzZkNjFkMjczMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmlu CisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC0xMjIzLDYgKzEyMjMsOCBA QCBfX1pOSzdXZWJDb3JlMTRTY3JvbGxhYmxlQXJlYTE0c2Nyb2xsQW5pbWF0b3JFdgogX19aTks3 V2ViQ29yZTE0U2VjdXJpdHlPcmlnaW4xMGNhbkRpc3BsYXlFUktOU180S1VSTEUKIF9fWk5LN1dl YkNvcmUxNFNlY3VyaXR5T3JpZ2luMThkYXRhYmFzZUlkZW50aWZpZXJFdgogX19aTks3V2ViQ29y ZTE0U2VjdXJpdHlPcmlnaW41ZXF1YWxFUEtTMF8KK19fWk5LN1dlYkNvcmUxNUFmZmluZVRyYW5z Zm9ybTEyaXNJbnZlcnRpYmxlRXYKK19fWk5LN1dlYkNvcmUxNUFmZmluZVRyYW5zZm9ybTdpbnZl cnNlRXYKIF9fWk5LN1dlYkNvcmUxNUFmZmluZVRyYW5zZm9ybThtYXBQb2ludEVSS05TXzhJbnRQ b2ludEUKIF9fWk5LN1dlYkNvcmUxNUZvY3VzQ29udHJvbGxlcjE4Zm9jdXNlZE9yTWFpbkZyYW1l RXYKIF9fWk5LN1dlYkNvcmUxNUdyYXBoaWNzQ29udGV4dDE1cGxhdGZvcm1Db250ZXh0RXYKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRz Y2FwZVBsdWdpbi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2Nh cGUvTmV0c2NhcGVQbHVnaW4uY3BwCmluZGV4IDVjYzM2MzAxNjRkNDg5OTQzMmE5NmU5ZDljMDM2 NzRjMWFiOTlkYjUuLmE4YThlZTFhN2VkMzczOTU2YTAzZDNhOWIyN2Q5OTMwZTRiNWRlMTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRz Y2FwZVBsdWdpbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05l dHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcApAQCAtOTUyLDQgKzk1MiwxMyBAQCBJbnRQb2ludCBO ZXRzY2FwZVBsdWdpbjo6Y29udmVydFRvUm9vdFZpZXcoY29uc3QgSW50UG9pbnQmIHBvaW50SW5Q bHVnaW5Db29yZGluYQogICAgIHJldHVybiBtX3BsdWdpblRvUm9vdFZpZXdUcmFuc2Zvcm0ubWFw UG9pbnQocG9pbnRJblBsdWdpbkNvb3JkaW5hdGVzKTsKIH0KIAorYm9vbCBOZXRzY2FwZVBsdWdp bjo6Y29udmVydEZyb21Sb290Vmlldyhjb25zdCBJbnRQb2ludCYgcG9pbnRJblJvb3RWaWV3Q29v cmRpbmF0ZXMsIEludFBvaW50JiBwb2ludEluUGx1Z2luQ29vcmRpbmF0ZXMpCit7CisgICAgaWYg KCFtX3BsdWdpblRvUm9vdFZpZXdUcmFuc2Zvcm0uaXNJbnZlcnRpYmxlKCkpCisgICAgICAgIHJl dHVybiBmYWxzZTsKKworICAgIHBvaW50SW5QbHVnaW5Db29yZGluYXRlcyA9IG1fcGx1Z2luVG9S b290Vmlld1RyYW5zZm9ybS5pbnZlcnNlKCkubWFwUG9pbnQocG9pbnRJblJvb3RWaWV3Q29vcmRp bmF0ZXMpOworICAgIHJldHVybiB0cnVlOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRz Y2FwZVBsdWdpbi5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBl L05ldHNjYXBlUGx1Z2luLmgKaW5kZXggZThhNGUzY2RmNzZkN2M4ZDVmMjQwMzg0MTRhYTI5ZDk5 M2QwNGM2Yi4uZWMwNWMxNTExYTIwNDY3ZDVlNzM3YTdjMTVjZTc5NzAzOTI4ZWU0OCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBl UGx1Z2luLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBl L05ldHNjYXBlUGx1Z2luLmgKQEAgLTIyMCw2ICsyMjAsMTAgQEAgcHJpdmF0ZToKICAgICAvLyBD b252ZXJ0IHRoZSBnaXZlbiBwb2ludCBmcm9tIHBsdWctaW4gY29vcmRpbmF0ZXMgdG8gcm9vdCB2 aWV3IGNvb3JkaW5hdGVzLgogICAgIFdlYkNvcmU6OkludFBvaW50IGNvbnZlcnRUb1Jvb3RWaWV3 KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JikgY29uc3Q7CiAKKyAgICAvLyBDb252ZXJ0IHRoZSBn aXZlbiBwb2ludCBmcm9tIHJvb3QgdmlldyBjb29yZGluYXRlcyB0byBwbHVnLWluIGNvb3JkaW5h dGVzLiBSZXR1cm5zIGZhbHNlIGlmIHRoZSBwb2ludCBjYW4ndCBiZQorICAgIC8vIGNvbnZlcnRl ZCAoaWYgdGhlIHRyYW5zZm9ybWF0aW9uIG1hdHJpeCBpc24ndCBpbnZlcnRpYmxlKS4KKyAgICBi b29sIGNvbnZlcnRGcm9tUm9vdFZpZXcoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvaW50SW5S b290Vmlld0Nvb3JkaW5hdGVzLCBXZWJDb3JlOjpJbnRQb2ludCYgcG9pbnRJblBsdWdpbkNvb3Jk aW5hdGVzKTsKKwogI2lmIFBMVUdJTl9BUkNISVRFQ1RVUkUoV0lOKQogICAgIHN0YXRpYyBCT09M IFdJTkFQSSBob29rZWRUcmFja1BvcHVwTWVudShITUVOVSwgVUlOVCB1RmxhZ3MsIGludCB4LCBp bnQgeSwgaW50IG5SZXNlcnZlZCwgSFdORCwgY29uc3QgUkVDVCopOwogICAgIHZvaWQgc2NoZWR1 bGVXaW5kb3dlZEdlb21ldHJ5VXBkYXRlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2luTWFjLm1tIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL21hYy9OZXRzY2FwZVBsdWdp bk1hYy5tbQppbmRleCBiNzMxY2EyMjYxZmM4MGU4YzIzMmU4MWVkYjUxOGM3NTc1ZmNkMmViLi45 MmIxZWIyNzMwNzIyYWU3MTE4ZWFlMWIzZjY4OGFjNDYxY2ZmZDY5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2lu TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9t YWMvTmV0c2NhcGVQbHVnaW5NYWMubW0KQEAgLTQ3MywxMSArNDczLDExIEBAIHN0YXRpYyBpbnQz Ml90IGJ1dHRvbk51bWJlcihXZWJNb3VzZUV2ZW50OjpCdXR0b24gYnV0dG9uKQogICAgIHJldHVy biAtMTsKIH0KIAotc3RhdGljIHZvaWQgZmlsbEluQ29jb2FFdmVudEZyb21Nb3VzZUV2ZW50KE5Q Q29jb2FFdmVudCYgZXZlbnQsIGNvbnN0IFdlYk1vdXNlRXZlbnQmIG1vdXNlRXZlbnQsIGNvbnN0 IFdlYkNvcmU6OkludFBvaW50JiBwbHVnaW5Mb2NhdGlvbikKK3N0YXRpYyB2b2lkIGZpbGxJbkNv Y29hRXZlbnRGcm9tTW91c2VFdmVudChOUENvY29hRXZlbnQmIGV2ZW50LCBjb25zdCBXZWJNb3Vz ZUV2ZW50JiBtb3VzZUV2ZW50LCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgZXZlbnRQb3NpdGlv bkluUGx1Z2luQ29vcmRpbmF0ZXMpCiB7CiAgICAgZXZlbnQuZGF0YS5tb3VzZS5tb2RpZmllckZs YWdzID0gbW9kaWZpZXJGbGFncyhtb3VzZUV2ZW50KTsKLSAgICBldmVudC5kYXRhLm1vdXNlLnBs dWdpblggPSBtb3VzZUV2ZW50LnBvc2l0aW9uKCkueCgpIC0gcGx1Z2luTG9jYXRpb24ueCgpOwot ICAgIGV2ZW50LmRhdGEubW91c2UucGx1Z2luWSA9IG1vdXNlRXZlbnQucG9zaXRpb24oKS55KCkg LSBwbHVnaW5Mb2NhdGlvbi55KCk7CisgICAgZXZlbnQuZGF0YS5tb3VzZS5wbHVnaW5YID0gZXZl bnRQb3NpdGlvbkluUGx1Z2luQ29vcmRpbmF0ZXMueCgpOworICAgIGV2ZW50LmRhdGEubW91c2Uu cGx1Z2luWSA9IGV2ZW50UG9zaXRpb25JblBsdWdpbkNvb3JkaW5hdGVzLnkoKTsKICAgICBldmVu dC5kYXRhLm1vdXNlLmJ1dHRvbk51bWJlciA9IGJ1dHRvbk51bWJlcihtb3VzZUV2ZW50LmJ1dHRv bigpKTsKICAgICBldmVudC5kYXRhLm1vdXNlLmNsaWNrQ291bnQgPSBtb3VzZUV2ZW50LmNsaWNr Q291bnQoKTsKICAgICBldmVudC5kYXRhLm1vdXNlLmRlbHRhWCA9IG1vdXNlRXZlbnQuZGVsdGFY KCk7CkBAIC00ODUsNyArNDg1LDcgQEAgc3RhdGljIHZvaWQgZmlsbEluQ29jb2FFdmVudEZyb21N b3VzZUV2ZW50KE5QQ29jb2FFdmVudCYgZXZlbnQsIGNvbnN0IFdlYk1vdXNlRXYKICAgICBldmVu dC5kYXRhLm1vdXNlLmRlbHRhWiA9IG1vdXNlRXZlbnQuZGVsdGFaKCk7CiB9CiAgICAgCi1zdGF0 aWMgTlBDb2NvYUV2ZW50IGluaXRpYWxpemVNb3VzZUV2ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQm IG1vdXNlRXZlbnQsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwbHVnaW5Mb2NhdGlvbikKK3N0 YXRpYyBOUENvY29hRXZlbnQgaW5pdGlhbGl6ZU1vdXNlRXZlbnQoY29uc3QgV2ViTW91c2VFdmVu dCYgbW91c2VFdmVudCwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIGV2ZW50UG9zaXRpb25JblBs dWdpbkNvb3JkaW5hdGVzKQogewogICAgIE5QQ29jb2FFdmVudFR5cGUgZXZlbnRUeXBlOwogCkBA IC01MDgsNyArNTA4LDcgQEAgc3RhdGljIE5QQ29jb2FFdmVudCBpbml0aWFsaXplTW91c2VFdmVu dChjb25zdCBXZWJNb3VzZUV2ZW50JiBtb3VzZUV2ZW50LCBjb25zdAogICAgIH0KIAogICAgIE5Q Q29jb2FFdmVudCBldmVudCA9IGluaXRpYWxpemVFdmVudChldmVudFR5cGUpOwotICAgIGZpbGxJ bkNvY29hRXZlbnRGcm9tTW91c2VFdmVudChldmVudCwgbW91c2VFdmVudCwgcGx1Z2luTG9jYXRp b24pOworICAgIGZpbGxJbkNvY29hRXZlbnRGcm9tTW91c2VFdmVudChldmVudCwgbW91c2VFdmVu dCwgZXZlbnRQb3NpdGlvbkluUGx1Z2luQ29vcmRpbmF0ZXMpOwogICAgIHJldHVybiBldmVudDsK IH0KIApAQCAtNTE2LDcgKzUxNiwxMSBAQCBib29sIE5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybUhh bmRsZU1vdXNlRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYgbW91c2VFdmVudCkKIHsKICAgICBz d2l0Y2ggKG1fZXZlbnRNb2RlbCkgewogICAgICAgICBjYXNlIE5QRXZlbnRNb2RlbENvY29hOiB7 Ci0gICAgICAgICAgICBOUENvY29hRXZlbnQgZXZlbnQgPSBpbml0aWFsaXplTW91c2VFdmVudCht b3VzZUV2ZW50LCBtX2ZyYW1lUmVjdEluV2luZG93Q29vcmRpbmF0ZXMubG9jYXRpb24oKSk7Cisg ICAgICAgICAgICBJbnRQb2ludCBldmVudFBvc2l0aW9uSW5QbHVnaW5Db29yZGluYXRlczsKKyAg ICAgICAgICAgIGlmICghY29udmVydEZyb21Sb290Vmlldyhtb3VzZUV2ZW50LnBvc2l0aW9uKCks IGV2ZW50UG9zaXRpb25JblBsdWdpbkNvb3JkaW5hdGVzKSkKKyAgICAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKKworICAgICAgICAgICAgTlBDb2NvYUV2ZW50IGV2ZW50ID0gaW5pdGlhbGl6ZU1v dXNlRXZlbnQobW91c2VFdmVudCwgZXZlbnRQb3NpdGlvbkluUGx1Z2luQ29vcmRpbmF0ZXMpOwog CiAgICAgICAgICAgICBOUENvY29hRXZlbnQqIHByZXZpb3VzTW91c2VFdmVudCA9IG1fY3VycmVu dE1vdXNlRXZlbnQ7CiAgICAgICAgICAgICBtX2N1cnJlbnRNb3VzZUV2ZW50ID0gJmV2ZW50OwpA QCAtNTgwLDExICs1ODQsMTUgQEAgYm9vbCBOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1IYW5kbGVX aGVlbEV2ZW50KGNvbnN0IFdlYldoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCiB7CiAgICAgc3dpdGNo IChtX2V2ZW50TW9kZWwpIHsKICAgICAgICAgY2FzZSBOUEV2ZW50TW9kZWxDb2NvYTogeworICAg ICAgICAgICAgSW50UG9pbnQgZXZlbnRQb3NpdGlvbkluUGx1Z2luQ29vcmRpbmF0ZXM7CisgICAg ICAgICAgICBpZiAoIWNvbnZlcnRGcm9tUm9vdFZpZXcod2hlZWxFdmVudC5wb3NpdGlvbigpLCBl dmVudFBvc2l0aW9uSW5QbHVnaW5Db29yZGluYXRlcykpCisgICAgICAgICAgICAgICAgcmV0dXJu IHRydWU7CisKICAgICAgICAgICAgIE5QQ29jb2FFdmVudCBldmVudCA9IGluaXRpYWxpemVFdmVu dChOUENvY29hRXZlbnRTY3JvbGxXaGVlbCk7CiAgICAgICAgICAgICAKICAgICAgICAgICAgIGV2 ZW50LmRhdGEubW91c2UubW9kaWZpZXJGbGFncyA9IG1vZGlmaWVyRmxhZ3Mod2hlZWxFdmVudCk7 Ci0gICAgICAgICAgICBldmVudC5kYXRhLm1vdXNlLnBsdWdpblggPSB3aGVlbEV2ZW50LnBvc2l0 aW9uKCkueCgpIC0gbV9mcmFtZVJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLngoKTsKLSAgICAgICAg ICAgIGV2ZW50LmRhdGEubW91c2UucGx1Z2luWSA9IHdoZWVsRXZlbnQucG9zaXRpb24oKS55KCkg LSBtX2ZyYW1lUmVjdEluV2luZG93Q29vcmRpbmF0ZXMueSgpOworICAgICAgICAgICAgZXZlbnQu ZGF0YS5tb3VzZS5wbHVnaW5YID0gZXZlbnRQb3NpdGlvbkluUGx1Z2luQ29vcmRpbmF0ZXMueCgp OworICAgICAgICAgICAgZXZlbnQuZGF0YS5tb3VzZS5wbHVnaW5ZID0gZXZlbnRQb3NpdGlvbklu UGx1Z2luQ29vcmRpbmF0ZXMueSgpOwogICAgICAgICAgICAgZXZlbnQuZGF0YS5tb3VzZS5idXR0 b25OdW1iZXIgPSAwOwogICAgICAgICAgICAgZXZlbnQuZGF0YS5tb3VzZS5jbGlja0NvdW50ID0g MDsKICAgICAgICAgICAgIGV2ZW50LmRhdGEubW91c2UuZGVsdGFYID0gd2hlZWxFdmVudC5kZWx0 YSgpLndpZHRoKCk7CkBAIC02MTIsNyArNjIwLDcgQEAgYm9vbCBOZXRzY2FwZVBsdWdpbjo6cGxh dGZvcm1IYW5kbGVNb3VzZUVudGVyRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYgbW91c2VFdmUK ICAgICAgICAgY2FzZSBOUEV2ZW50TW9kZWxDb2NvYTogewogICAgICAgICAgICAgTlBDb2NvYUV2 ZW50IGV2ZW50ID0gaW5pdGlhbGl6ZUV2ZW50KE5QQ29jb2FFdmVudE1vdXNlRW50ZXJlZCk7CiAg ICAgICAgICAgICAKLSAgICAgICAgICAgIGZpbGxJbkNvY29hRXZlbnRGcm9tTW91c2VFdmVudChl dmVudCwgbW91c2VFdmVudCwgbV9mcmFtZVJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLmxvY2F0aW9u KCkpOworICAgICAgICAgICAgZmlsbEluQ29jb2FFdmVudEZyb21Nb3VzZUV2ZW50KGV2ZW50LCBt b3VzZUV2ZW50LCBJbnRQb2ludCgpKTsKICAgICAgICAgICAgIHJldHVybiBOUFBfSGFuZGxlRXZl bnQoJmV2ZW50KTsKICAgICAgICAgfQogCkBAIC02MzgsNyArNjQ2LDcgQEAgYm9vbCBOZXRzY2Fw ZVBsdWdpbjo6cGxhdGZvcm1IYW5kbGVNb3VzZUxlYXZlRXZlbnQoY29uc3QgV2ViTW91c2VFdmVu dCYgbW91c2VFdmUKICAgICAgICAgY2FzZSBOUEV2ZW50TW9kZWxDb2NvYTogewogICAgICAgICAg ICAgTlBDb2NvYUV2ZW50IGV2ZW50ID0gaW5pdGlhbGl6ZUV2ZW50KE5QQ29jb2FFdmVudE1vdXNl RXhpdGVkKTsKICAgICAgICAgICAgIAotICAgICAgICAgICAgZmlsbEluQ29jb2FFdmVudEZyb21N b3VzZUV2ZW50KGV2ZW50LCBtb3VzZUV2ZW50LCBtX2ZyYW1lUmVjdEluV2luZG93Q29vcmRpbmF0 ZXMubG9jYXRpb24oKSk7CisgICAgICAgICAgICBmaWxsSW5Db2NvYUV2ZW50RnJvbU1vdXNlRXZl bnQoZXZlbnQsIG1vdXNlRXZlbnQsIEludFBvaW50KCkpOwogICAgICAgICAgICAgcmV0dXJuIE5Q UF9IYW5kbGVFdmVudCgmZXZlbnQpOwogICAgICAgICB9CiAK