42221 2010-07-13 18:14:36 -0700 Add support for loading javascript: URLs 2010-07-14 11:24:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 250877 0 andersca 2010-07-13 18:14:36 -0700 Add support for loading javascript: URLs 250883 1 61448 andersca 2010-07-13 18:17:57 -0700 Created attachment 61448 Patch 251306 2 andersca 2010-07-14 11:24:43 -0700 Committed r63335: <http://trac.webkit.org/changeset/63335> 61448 2010-07-13 18:17:57 -0700 2010-07-13 22:57:19 -0700 Patch bug-42221-20100713181756.patch text/plain 11716 andersca ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzQxZGQ3YzljYmU5ZTRhOWY5YzE5MjUwMzhlNzZlNjgyMWI2M2Y5YS4uZGQ3YzRjYmVjOGJiOGQ3 ZTE4YTA1Zjk2YjFjMTJiNTZlMzEwOGEwOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNSBAQAogMjAxMC0wNy0xMyAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBsb2FkaW5nIGphdmFz Y3JpcHQ6IFVSTHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQyMjIxCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAgRXhwb3J0IHBy b3RvY29sSXNKYXZhU2NyaXB0IGFuZCBTY3JpcHRWYWx1ZTo6Z2V0U3RyaW5nLgorCisyMDEwLTA3 LTEzICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgUmV2 aWV3ZWQgYnkgU2FtIFdlaW5pZy4KIAogICAgICAgICBBZGQgc3VwcG9ydCBmb3IgVVJMIGZyYW1l IGxvYWRpbmcgdXNpbmcgTlBOX0dldFVSTE5vdGlmeQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9XZWJD b3JlLmV4cC5pbiBiL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXggOTY3ZDExNWJmZDMzMmE3 Zjc5MzYwOWU0ODhlYzQ2OTU5ZWRkZGFjZi4uOWE0NDdhNjhiMzY3ODE5YTU0NzFlNGNmNTMwNjg4 ZjBkNWU4MTYwNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9XZWJD b3JlL1dlYkNvcmUuZXhwLmluCkBAIC00MTksNiArNDE5LDcgQEAgX19aTjdXZWJDb3JlMTlhcHBs aWNhdGlvbklzU2FmYXJpRXYKIF9fWk43V2ViQ29yZTIwUmVuZGVyRW1iZWRkZWRPYmplY3QzMHNl dFNob3dzQ3Jhc2hlZFBsdWdpbkluZGljYXRvckV2CiBfX1pON1dlYkNvcmUyMFJlc291cmNlUmVz cG9uc2VCYXNlMjRzZXRFeHBlY3RlZENvbnRlbnRMZW5ndGhFeAogX19aTjdXZWJDb3JlMjBSZXNv dXJjZVJlc3BvbnNlQmFzZUMyRXYKK19fWk43V2ViQ29yZTIwcHJvdG9jb2xJc0phdmFTY3JpcHRF UktOU182U3RyaW5nRQogX19aTjdXZWJDb3JlMjFQbGF0Zm9ybUtleWJvYXJkRXZlbnQyNGRpc2Ft YmlndWF0ZUtleURvd25FdmVudEVOUzBfNFR5cGVFYgogX19aTjdXZWJDb3JlMjFQbGF0Zm9ybUtl eWJvYXJkRXZlbnRDMUVQN05TRXZlbnQKIF9fWk43V2ViQ29yZTIxU1ZHRG9jdW1lbnRFeHRlbnNp b25zMjFzYW1wbGVBbmltYXRpb25BdFRpbWVFUktOU182U3RyaW5nRVBOU18xNFNWR1NNSUxFbGVt ZW50RWQKQEAgLTgwOSw2ICs4MTAsNyBAQCBfX1pOSzdXZWJDb3JlMTFIaXN0b3J5SXRlbThyZWZl cnJlckV2CiBfX1pOSzdXZWJDb3JlMTFIaXN0b3J5SXRlbTl1cmxTdHJpbmdFdgogX19aTks3V2Vi Q29yZTExSGlzdG9yeUl0ZW05dmlld1N0YXRlRXYKIF9fWk5LN1dlYkNvcmUxMVJlbmRlclN0eWxl MjF2aXNpdGVkRGVwZW5kZW50Q29sb3JFaQorX19aTks3V2ViQ29yZTExU2NyaXB0VmFsdWU5Z2V0 U3RyaW5nRVBOM0pTQzlFeGVjU3RhdGVFUk5TXzZTdHJpbmdFCiBfX1pOSzdXZWJDb3JlMTJFdmVu dEhhbmRsZXIyMGN1cnJlbnRLZXlib2FyZEV2ZW50RXYKIF9fWk5LN1dlYkNvcmUxMkljb25EYXRh YmFzZTEyZGF0YWJhc2VQYXRoRXYKIF9fWk5LN1dlYkNvcmUxMkljb25EYXRhYmFzZTI0c2hvdWxk U3RvcFRocmVhZEFjdGl2aXR5RXYKZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2Vi S2l0Mi9DaGFuZ2VMb2cKaW5kZXggOWRlMjM2NmNmNTE3YWVjY2E0MWNhN2NlODBhZjExMTkxMmM2 NjJiNy4uMjNhOWVjNWRjYzU2OGVhMTU1YzNiODNhODVhMzAyMTEyZjliZmE3MSAxMDA2NDQKLS0t IGEvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0 NCBAQAogMjAxMC0wNy0xMyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgog CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBzdXBw b3J0IGZvciBsb2FkaW5nIGphdmFzY3JpcHQ6IFVSTHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMjIxCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1Bs dWdpbnMvRHVtbXlQbHVnaW4uY3BwOgorICAgICAgICAoV2ViS2l0OjpEdW1teVBsdWdpbjo6Y29u dHJvbGxlcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL0R1bW15UGx1Z2luLmg6Cisg ICAgICAgIEFkZCBzdHViIGZ1bmN0aW9uLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5z L05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQ bHVnaW46OmRlc3Ryb3kpOgorICAgICAgICBTZXQgdGhlIHBsdWctaW4gY29udHJvbGxlciB0byAw LgorCisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpjb250cm9sbGVyKToKKyAgICAg ICAgUmV0dXJuIHRoZSBwbHVnLWluIGNvbnRyb2xsZXIuCisKKyAgICAgICAgKiBXZWJQcm9jZXNz L1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaDoKKyAgICAgICAgQWRkIGNvbnRyb2xs ZXIoKSBtZW1iZXIgZnVuY3Rpb24uCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1 Z2luLmg6CisgICAgICAgIEFkZCBjb250cm9sbGVyKCkgcHVyZSB2aXJ0dWFsIG1lbWJlciBmdW5j dGlvbi4KKyAgICAgICAgCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcu Y3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5WaWV3OjpwZXJmb3JtVVJMUmVxdWVzdCk6Cisg ICAgICAgIElmIHRoZSBnaXZlbiBVUkwgcmVxdWVzdCBoYXMgYSBqYXZhc2NyaXB0OiBwcm90b2Nv bCwgY2FsbAorICAgICAgICBwZXJmb3JtSmF2YVNjcmlwdFVSTFJlcXVlc3QuCisKKyAgICAgICAg KFdlYktpdDo6UGx1Z2luVmlldzo6cGVyZm9ybUZyYW1lTG9hZFVSTFJlcXVlc3QpOgorICAgICAg ICBBZGQgYSBzZWN1cml0eSBvcmlnaW4gY2hlY2suCisKKyAgICAgICAgKFdlYktpdDo6UGx1Z2lu Vmlldzo6cGVyZm9ybUphdmFTY3JpcHRVUkxSZXF1ZXN0KToKKyAgICAgICAgRXZhbHVhdGUgdGhl IEphdmFTY3JpcHQgY29kZSwgR2V0IHRoZSByZXN1bHRpbmcgc3RyaW5nLgorCisgICAgICAgICog V2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaDoKKyAgICAgICAgQWRkIHBlcmZvcm1KYXZh U2NyaXB0VVJMUmVxdWVzdC4KKworMjAxMC0wNy0xMyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJz Y2FAYXBwbGUuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCiAKICAgICAg ICAgQWRkIHN1cHBvcnQgZm9yIFVSTCBmcmFtZSBsb2FkaW5nIHVzaW5nIE5QTl9HZXRVUkxOb3Rp ZnkKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL0R1bW15UGx1Z2luLmNw cCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL0R1bW15UGx1Z2luLmNwcAppbmRleCAxZWU0 YjNmYThkYTk1MTkwYzg2NjlmZjkwZDUxMzU2MjRlYTY2M2U3Li4yNDUwZjkxN2ZiMmRkYmYzN2Jk MmUyOWNmNWMzZjQ0NjVjNWVhMTkwIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9EdW1teVBsdWdpbi5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvRHVt bXlQbHVnaW4uY3BwCkBAIC02OSw0ICs2OSw5IEBAIHZvaWQgRHVtbXlQbHVnaW46OmZyYW1lRGlk RmFpbCh1aW50NjRfdCByZXF1ZXN0SUQsIGJvb2wgd2FzQ2FuY2VsbGVkKQogewogfQogCitQbHVn aW5Db250cm9sbGVyKiBEdW1teVBsdWdpbjo6Y29udHJvbGxlcigpCit7CisgICAgcmV0dXJuIDA7 Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9j ZXNzL1BsdWdpbnMvRHVtbXlQbHVnaW4uaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL0R1 bW15UGx1Z2luLmgKaW5kZXggMGE4ZmY5OTdlODExOTc0NWE2YmMyODg0ZTMxMjYzNDkyM2JhNDI3 OC4uMjgwZmY3ZjhjNmZjMGY1Mzg1YTk2ZWU0OTlkN2JhYmQwMWZiM2U4NCAxMDA2NDQKLS0tIGEv V2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvRHVtbXlQbHVnaW4uaAorKysgYi9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9EdW1teVBsdWdpbi5oCkBAIC00OCw2ICs0OCw3IEBAIHByaXZhdGU6 CiAgICAgdmlydHVhbCB2b2lkIGdlb21ldHJ5RGlkQ2hhbmdlKGNvbnN0IFdlYkNvcmU6OkludFJl Y3QmIGZyYW1lUmVjdCwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgY2xpcFJlY3QpOwogICAgIHZp cnR1YWwgdm9pZCBmcmFtZURpZEZpbmlzaExvYWRpbmcodWludDY0X3QgcmVxdWVzdElEKTsKICAg ICB2aXJ0dWFsIHZvaWQgZnJhbWVEaWRGYWlsKHVpbnQ2NF90IHJlcXVlc3RJRCwgYm9vbCB3YXND YW5jZWxsZWQpOworICAgIHZpcnR1YWwgUGx1Z2luQ29udHJvbGxlciogY29udHJvbGxlcigpOwog CiB9OwogCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9O ZXRzY2FwZVBsdWdpbi5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9O ZXRzY2FwZVBsdWdpbi5jcHAKaW5kZXggMTI5YTI4YTMwZmViM2EwNzU2YjQ2YTQ0NGMxNjVmYjUx YTkxZTg4ZS4uODRjNDkwZWQwMTRmMTVkYTMxNjRiYzNkNDc5MTMzZDQ2MmRkN2FmYSAxMDA2NDQK LS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4u Y3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1 Z2luLmNwcApAQCAtMTc4LDYgKzE3OCw3IEBAIHZvaWQgTmV0c2NhcGVQbHVnaW46OmRlc3Ryb3ko KQogCiAgICAgbV9wbHVnaW5Nb2R1bGUtPnBsdWdpbkZ1bmNzKCkuZGVzdHJveSgmbV9ucHAsIDAp OwogICAgIG1faXNTdGFydGVkID0gZmFsc2U7CisgICAgbV9wbHVnaW5Db250cm9sbGVyID0gMDsK IH0KICAgICAKIHZvaWQgTmV0c2NhcGVQbHVnaW46OnBhaW50KEdyYXBoaWNzQ29udGV4dCogY29u dGV4dCwgY29uc3QgSW50UmVjdCYgZGlydHlSZWN0KQpAQCAtMjEyLDQgKzIxMyw5IEBAIHZvaWQg TmV0c2NhcGVQbHVnaW46OmZyYW1lRGlkRmFpbCh1aW50NjRfdCByZXF1ZXN0SUQsIGJvb2wgd2Fz Q2FuY2VsbGVkKQogICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCiB9CiAKK1BsdWdpbkNvbnRyb2xs ZXIqIE5ldHNjYXBlUGx1Z2luOjpjb250cm9sbGVyKCkKK3sKKyAgICByZXR1cm4gbV9wbHVnaW5D b250cm9sbGVyOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmggYi9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oCmluZGV4IDNjN2Iz NDdjYmVhZDgxODYwMTAwY2NhNzJkODliYTVjM2VkYThkNTYuLjdhNmQ2NWJjZjMzN2M3M2M0Zjhm NmM5NjM5NGRmYmYxMWE4NmFjMjAgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVn aW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaApAQCAtNjYsNiArNjYsNyBAQCBwcml2YXRl OgogICAgIHZpcnR1YWwgdm9pZCBnZW9tZXRyeURpZENoYW5nZShjb25zdCBXZWJDb3JlOjpJbnRS ZWN0JiBmcmFtZVJlY3QsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGNsaXBSZWN0KTsKICAgICB2 aXJ0dWFsIHZvaWQgZnJhbWVEaWRGaW5pc2hMb2FkaW5nKHVpbnQ2NF90IHJlcXVlc3RJRCk7CiAg ICAgdmlydHVhbCB2b2lkIGZyYW1lRGlkRmFpbCh1aW50NjRfdCByZXF1ZXN0SUQsIGJvb2wgd2Fz Q2FuY2VsbGVkKTsKKyAgICB2aXJ0dWFsIFBsdWdpbkNvbnRyb2xsZXIqIGNvbnRyb2xsZXIoKTsK IAogICAgIFBsdWdpbkNvbnRyb2xsZXIqIG1fcGx1Z2luQ29udHJvbGxlcjsKICAgICB1aW50NjRf dCBtX25leHRSZXF1ZXN0SUQ7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9QbHVnaW4uaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5oCmluZGV4IGM5 NDczMWY0MTkwMmI5NTM0MjFlYTRhMjA1YWQ4MmI2NzhiOGI4YjIuLjk2OTI5MDkyZTk2NTBjNzI0 ZDRlNDk5ZTAwNzk4MDcwODY5Yzc2MzQgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL1BsdWdpbi5oCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5o CkBAIC02MywxMiArNjMsMTYgQEAgcHVibGljOgogICAgIC8vIFRlbGxzIHRoZSBwbHVnLWluIHRo YXQgZWl0aGVyIHRoZSBwbHVnLWlucyBmcmFtZSByZWN0IG9yIGl0cyBjbGlwIHJlY3QgaGFzIGNo YW5nZWQuIEJvdGggcmVjdHMgYXJlIGluIHdpbmRvdyBjb29yZGluYXRlcy4KICAgICB2aXJ0dWFs IHZvaWQgZ2VvbWV0cnlEaWRDaGFuZ2UoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgZnJhbWVSZWN0 LCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBjbGlwUmVjdCkgPSAwOwogCi0gICAgLy8vIFRlbGxz IHRoZSBwbHVnLWluIHRoYXQgYSBmcmFtZSBsb2FkIHJlcXVlc3QgdGhhdCB0aGUgcGx1Zy1pbiBt YWRlIGJ5IGNhbGxpbmcgUGx1Z2luQ29udHJvbGxlcjo6bG9hZFVSTCBoYXMgZmluaXNoZWQuCisg ICAgLy8gVGVsbHMgdGhlIHBsdWctaW4gdGhhdCBhIGZyYW1lIGxvYWQgcmVxdWVzdCB0aGF0IHRo ZSBwbHVnLWluIG1hZGUgYnkgY2FsbGluZyBQbHVnaW5Db250cm9sbGVyOjpsb2FkVVJMIGhhcyBm aW5pc2hlZC4KICAgICB2aXJ0dWFsIHZvaWQgZnJhbWVEaWRGaW5pc2hMb2FkaW5nKHVpbnQ2NF90 IHJlcXVlc3RJRCkgPSAwOwogCi0gICAgLy8vIFRlbGxzIHRoZSBwbHVnLWluIHRoYXQgYSBmcmFt ZSBsb2FkIHJlcXVlc3QgdGhhdCB0aGUgcGx1Zy1pbiBtYWRlIGJ5IGNhbGxpbmcgUGx1Z2luQ29u dHJvbGxlcjo6bG9hZFVSTCBoYXMgZmFpbGVkLgorICAgIC8vIFRlbGxzIHRoZSBwbHVnLWluIHRo YXQgYSBmcmFtZSBsb2FkIHJlcXVlc3QgdGhhdCB0aGUgcGx1Zy1pbiBtYWRlIGJ5IGNhbGxpbmcg UGx1Z2luQ29udHJvbGxlcjo6bG9hZFVSTCBoYXMgZmFpbGVkLgogICAgIHZpcnR1YWwgdm9pZCBm cmFtZURpZEZhaWwodWludDY0X3QgcmVxdWVzdElELCBib29sIHdhc0NhbmNlbGxlZCkgPSAwOwog CisgICAgLy8gUmV0dXJucyB0aGUgcGx1Zy1pbiBjb250cm9sbGVyIGZvciB0aGlzIHBsdWctaW4u CisgICAgLy8gRklYTUU6IFdlIGNvdWxkIGp1c3QgaGF2ZSB0aGUgY29udHJvbGxlciBiZSBhIG1l bWJlciB2YXJpYWJsZSBvZiBQbHVnaW4uCisgICAgdmlydHVhbCBQbHVnaW5Db250cm9sbGVyKiBj b250cm9sbGVyKCkgPSAwOworCiBwcm90ZWN0ZWQ6CiAgICAgUGx1Z2luKCk7CiB9OwpkaWZmIC0t Z2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAgYi9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAppbmRleCBkMDlhOTIxMjkxYjFmNTE3 YmIxYjA0NjQxNDJiNjExM2RiMDIxZTY3Li5kMTViZTgzNGJjZjBiN2FkYTk1MTY4YWJhZTkzODVi ODBiZWE1MDhjIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5W aWV3LmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcApA QCAtNTgsNyArNTgsNyBAQCBwcml2YXRlOgogICAgICAgICAsIG1fYWxsb3dQb3B1cHMoYWxsb3dQ b3B1cHMpCiAgICAgewogICAgIH0KLSAgICAKKwogICAgIHVpbnQ2NF90IG1fcmVxdWVzdElEOwog ICAgIEZyYW1lTG9hZFJlcXVlc3QgbV9yZXF1ZXN0OwogICAgIGJvb2wgbV9hbGxvd1BvcHVwczsK QEAgLTIwNiw4ICsyMDYsMTYgQEAgdm9pZCBQbHVnaW5WaWV3OjpwZW5kaW5nVVJMUmVxdWVzdHNU aW1lckZpcmVkKCkKICAgICAKIHZvaWQgUGx1Z2luVmlldzo6cGVyZm9ybVVSTFJlcXVlc3QoVVJM UmVxdWVzdCogcmVxdWVzdCkKIHsKLSAgICBpZiAoIXJlcXVlc3QtPnRhcmdldCgpLmlzTnVsbCgp KQotICAgICAgICByZXR1cm4gcGVyZm9ybUZyYW1lTG9hZFVSTFJlcXVlc3QocmVxdWVzdCk7Cisg ICAgLy8gRmlyc3QsIGNoZWNrIGlmIHRoaXMgaXMgYSBqYXZhc2NyaXB0OiB1cmwuCisgICAgaWYg KHByb3RvY29sSXNKYXZhU2NyaXB0KHJlcXVlc3QtPnJlcXVlc3QoKS51cmwoKSkpIHsKKyAgICAg ICAgcGVyZm9ybUphdmFTY3JpcHRVUkxSZXF1ZXN0KHJlcXVlc3QpOworICAgICAgICByZXR1cm47 CisgICAgfQorCisgICAgaWYgKCFyZXF1ZXN0LT50YXJnZXQoKS5pc051bGwoKSkgeworICAgICAg ICBwZXJmb3JtRnJhbWVMb2FkVVJMUmVxdWVzdChyZXF1ZXN0KTsKKyAgICAgICAgcmV0dXJuOwor ICAgIH0KIH0KIAogdm9pZCBQbHVnaW5WaWV3OjpwZXJmb3JtRnJhbWVMb2FkVVJMUmVxdWVzdChV UkxSZXF1ZXN0KiByZXF1ZXN0KQpAQCAtMjE4LDYgKzIyNiwxMyBAQCB2b2lkIFBsdWdpblZpZXc6 OnBlcmZvcm1GcmFtZUxvYWRVUkxSZXF1ZXN0KFVSTFJlcXVlc3QqIHJlcXVlc3QpCiAgICAgaWYg KCFmcmFtZSkKICAgICAgICAgcmV0dXJuOwogCisgICAgLy8gQ2hlY2sgaWYgdGhpcyBpcyBVUkwg Y2FuIGJlIGxvYWRlZC4KKyAgICBpZiAoIVNlY3VyaXR5T3JpZ2luOjpjYW5Mb2FkKHJlcXVlc3Qt PnJlcXVlc3QoKS51cmwoKSwgU3RyaW5nKCksIG1fcGx1Z2luRWxlbWVudC0+ZG9jdW1lbnQoKSkp IHsKKyAgICAgICAgLy8gV2UgY2FuJ3QgbG9hZCB0aGUgcmVxdWVzdCwgc2VuZCBiYWNrIGEgcmVw bHkgdG8gdGhlIHBsdWctaW4uCisgICAgICAgIG1fcGx1Z2luLT5mcmFtZURpZEZhaWwocmVxdWVz dC0+cmVxdWVzdElEKCksIGZhbHNlKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIC8v IEZpcnN0LCB0cnkgdG8gZmluZCBhIHRhcmdldCBmcmFtZS4KICAgICBGcmFtZSogdGFyZ2V0RnJh bWUgPSBmcmFtZS0+bG9hZGVyKCktPmZpbmRGcmFtZUZvck5hdmlnYXRpb24ocmVxdWVzdC0+dGFy Z2V0KCkpOwogICAgIGlmICghdGFyZ2V0RnJhbWUpIHsKQEAgLTI0NCw2ICsyNTksNDIgQEAgdm9p ZCBQbHVnaW5WaWV3OjpwZXJmb3JtRnJhbWVMb2FkVVJMUmVxdWVzdChVUkxSZXF1ZXN0KiByZXF1 ZXN0KQogICAgIHRhcmdldFdlYkZyYW1lLT5zZXRMb2FkTGlzdGVuZXIodGhpcyk7CiB9CiAKK3Zv aWQgUGx1Z2luVmlldzo6cGVyZm9ybUphdmFTY3JpcHRVUkxSZXF1ZXN0KFVSTFJlcXVlc3QqIHJl cXVlc3QpCit7CisgICAgQVNTRVJUKHByb3RvY29sSXNKYXZhU2NyaXB0KHJlcXVlc3QtPnJlcXVl c3QoKS51cmwoKSkpOworCisgICAgUmVmUHRyPEZyYW1lPiBmcmFtZSA9IG1fcGx1Z2luRWxlbWVu dC0+ZG9jdW1lbnQoKS0+ZnJhbWUoKTsKKyAgICBpZiAoIWZyYW1lKQorICAgICAgICByZXR1cm47 CisgICAgCisgICAgU3RyaW5nIGpzU3RyaW5nID0gZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKHJl cXVlc3QtPnJlcXVlc3QoKS51cmwoKS5zdHJpbmcoKS5zdWJzdHJpbmcoMTEpKTsKKworICAgIGlm ICghcmVxdWVzdC0+dGFyZ2V0KCkuaXNOdWxsKCkpIHsKKyAgICAgICAgLy8gRm9yIHNlY3VyaXR5 IHJlYXNvbnMsIG9ubHkgYWxsb3cgSlMgcmVxdWVzdHMgdG8gYmUgbWFkZSBvbiB0aGUgZnJhbWUg dGhhdCBjb250YWlucyB0aGUgcGx1Zy1pbi4KKyAgICAgICAgaWYgKGZyYW1lLT50cmVlKCktPmZp bmQocmVxdWVzdC0+dGFyZ2V0KCkpICE9IGZyYW1lKSB7CisgICAgICAgICAgICAvLyBMZXQgdGhl IHBsdWctaW4ga25vdyB0aGF0IGl0cyBmcmFtZSBsb2FkIGZhaWxlZC4KKyAgICAgICAgICAgIG1f cGx1Z2luLT5mcmFtZURpZEZhaWwocmVxdWVzdC0+cmVxdWVzdElEKCksIGZhbHNlKTsKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgIH0KKyAgICAKKyAgICAvLyBFdmFsdWF0ZSB0 aGUgSmF2YVNjcmlwdCBjb2RlLiBOb3RlIHRoYXQgcnVubmluZyBKYXZhU2NyaXB0IGhlcmUgY291 bGQgY2F1c2UgdGhlIHBsdWctaW4gdG8gYmUgZGVzdHJveWVkLCBzbyB3ZQorICAgIC8vIGdyYWIg cmVmZXJlbmNlcyB0byB0aGUgcGx1Zy1pbiBoZXJlLiAoV2UgYWxyZWFkeSBoYXZlIGEgcmVmZXJl bmNlIHRvIHRoZSBmcmFtZSkuCisgICAgUmVmUHRyPFBsdWdpbj4gcGx1Z2luID0gbV9wbHVnaW47 CisgICAgCisgICAgU2NyaXB0VmFsdWUgcmVzdWx0ID0gbV9wbHVnaW5FbGVtZW50LT5kb2N1bWVu dCgpLT5mcmFtZSgpLT5zY3JpcHQoKS0+ZXhlY3V0ZVNjcmlwdChqc1N0cmluZyk7CisKKyAgICAv LyBDaGVjayBpZiBldmFsdWF0aW5nIHRoZSBKYXZhU2NyaXB0IGRlc3Ryb3llZCB0aGUgcGx1Zy1p bi4KKyAgICBpZiAoIXBsdWdpbi0+Y29udHJvbGxlcigpKQorICAgICAgICByZXR1cm47CisKKyAg ICBTY3JpcHRTdGF0ZSogc2NyaXB0U3RhdGUgPSBtX3BsdWdpbkVsZW1lbnQtPmRvY3VtZW50KCkt PmZyYW1lKCktPnNjcmlwdCgpLT5nbG9iYWxPYmplY3QocGx1Z2luV29ybGQoKSktPmdsb2JhbEV4 ZWMoKTsKKyAgICBTdHJpbmcgcmVzdWx0U3RyaW5nOworICAgIHJlc3VsdC5nZXRTdHJpbmcoc2Ny aXB0U3RhdGUsIHJlc3VsdFN0cmluZyk7CisgICAgCisgICAgLy8gRklYTUU6IFNlbmQgdGhlIHJl c3VsdCBzdHJpbmcgYmFjayB0byB0aGUgcGx1Zy1pbi4KK30KKwogdm9pZCBQbHVnaW5WaWV3Ojpp bnZhbGlkYXRlUmVjdChjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QpCiB7CiAgICAgaWYgKCFwYXJl bnQoKSB8fCAhbV9wbHVnaW4gfHwgIW1faXNJbml0aWFsaXplZCkKZGlmZiAtLWdpdCBhL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL1BsdWdpblZpZXcuaAppbmRleCBhNjhkNzkzNjRlNjVjZjQ3Yzk3ZWI2Yzg1ZGU0NWJm N2M0YjY0MjAwLi4yNjFlNmFjMzQ3MzJkNDAxNWJhMTI2ZWU3NDgzODI3ZGYxNzBiOGJmIDEwMDY0 NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgKKysrIGIvV2Vi S2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5oCkBAIC02NCw5ICs2NCwxMiBAQCBw cml2YXRlOgogICAgIGNsYXNzIFVSTFJlcXVlc3Q7CiAgICAgdm9pZCBwZXJmb3JtVVJMUmVxdWVz dChVUkxSZXF1ZXN0Kik7CiAKLSAgICAvLyBQZXJmb3JtIGFuIFVSTCByZXF1ZXN0IHdoZXJlIHRo ZSBmcmFtZSB0YXJnZXQgaXMgbm90IG51bGwuCisgICAgLy8gUGVyZm9ybSBhIFVSTCByZXF1ZXN0 IHdoZXJlIHRoZSBmcmFtZSB0YXJnZXQgaXMgbm90IG51bGwuCiAgICAgdm9pZCBwZXJmb3JtRnJh bWVMb2FkVVJMUmVxdWVzdChVUkxSZXF1ZXN0Kik7CiAKKyAgICAvLyBQZXJmb3JtIGEgVVJMIHJl cXVlc3Qgd2hlcmUgdGhlIFVSTCBwcm90b2NvbCBpcyAiamF2YXNjcmlwdDoiLgorICAgIHZvaWQg cGVyZm9ybUphdmFTY3JpcHRVUkxSZXF1ZXN0KFVSTFJlcXVlc3QqKTsKKwogICAgIC8vIFdlYkNv cmU6OldpZGdldAogICAgIHZpcnR1YWwgdm9pZCBzZXRGcmFtZVJlY3QoY29uc3QgV2ViQ29yZTo6 SW50UmVjdCYpOwogICAgIHZpcnR1YWwgdm9pZCBwYWludChXZWJDb3JlOjpHcmFwaGljc0NvbnRl eHQqLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7Cg==