42030 2010-07-10 13:35:46 -0700 Have the plug-in view initialize the plug-in 2010-07-14 11:33:01 -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 249550 0 andersca 2010-07-10 13:35:46 -0700 Have the plug-in view initialize the plug-in 249551 1 61161 andersca 2010-07-10 13:38:46 -0700 Created attachment 61161 Patch 249554 2 61161 mitz 2010-07-10 14:20:45 -0700 Comment on attachment 61161 Patch > +#include <WebCore/KURL.h> You should remove the forward-declaration of KURL below. 251318 3 andersca 2010-07-14 11:33:01 -0700 Committed r63052: <http://trac.webkit.org/changeset/63052> 61161 2010-07-10 13:38:46 -0700 2010-07-10 14:20:45 -0700 Patch bug-42030-20100710133844.patch text/plain 12662 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg YzNlMmNmYzA4NjM4YjM5MTgwNDQ1NmFiYTkwMTMyOWJjNzBhYjEwOS4uYWUwMTNlN2FiMGM2Zjli ODcyMWNmZTA0NjlhZTU5ZjU1MzczOTdlNCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0NyBAQAogMjAxMC0wNy0xMCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhhdmUgdGhlIHBsdWctaW4gdmlldyBpbml0aWFs aXplIHRoZSBwbHVnLWluCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD00MjAzMAorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL0R1bW15UGx1Z2lu LmNwcDoKKyAgICAgICAgKFdlYktpdDo6RHVtbXlQbHVnaW46OmluaXRpYWxpemUpOgorICAgICAg ICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9EdW1teVBsdWdpbi5oOgorICAgICAgICBQbHVnaW46Omlu aXRpYWxpemUgbm93IHRha2VzIGEgc3RydWN0LgorICAgICAgICAKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwOgorICAgICAgICAoV2ViS2l0 OjpOZXRzY2FwZVBsdWdpbjo6aW5pdGlhbGl6ZSk6ICAgICAgICAKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaDoKKyAgICAgICAgUGx1Z2luOjpp bml0aWFsaXplIG5vdyB0YWtlcyBhIHN0cnVjdC4KKyAgICAgICAgCisgICAgICAgICogV2ViUHJv Y2Vzcy9QbHVnaW5zL1BsdWdpbi5oOgorICAgICAgICBBZGQgUGFyYW1ldGVycyBzdHJ1Y3QuCisK KyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHA6CisgICAgICAgIChX ZWJLaXQ6OlBsdWdpblZpZXc6OlBsdWdpblZpZXcpOgorICAgICAgICBBZGQgUGFyYW1ldGVycyBw YXJhbWV0ZXIuCisKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6flBsdWdpblZpZXcpOgor ICAgICAgICBBZGQgbV9wbHVnaW4gbnVsbCBjaGVjay4KKworICAgICAgICAoV2ViS2l0OjpQbHVn aW5WaWV3Ojppbml0aWFsaXplUGx1Z2luKToKKyAgICAgICAgVHJ5IHRvIGluaXRpYWxpemUgdGhl IHBsdWctaW4gYW5kIHplcm8gb3V0IHRoZSBwbHVnLWluIGlmIGluaXRpYWxpemF0aW9uIGZhaWxz LgorCisgICAgICAgIChXZWJLaXQ6OlBsdWdpblZpZXc6OnBhaW50KToKKyAgICAgICAgQWRkIG1f cGx1Z2luIG51bGwgY2hlY2suCisgICAgICAgIAorICAgICAgICAoV2ViS2l0OjpQbHVnaW5WaWV3 OjpzZXRQYXJlbnQpOgorICAgICAgICBJbml0aWFsaXplIHRoZSBwbHVnLWluLgorICAgIAorICAg ICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3Lmg6CisgICAgICAgIChXZWJLaXQ6 OlBsdWdpblZpZXc6OmNyZWF0ZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9y dC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9h ZGVyQ2xpZW50OjpjcmVhdGVQbHVnaW4pOgorICAgICAgICBEb24ndCBpbml0aWFsaXplIHRoZSBw bHVnLWluIGhlcmUuCisKKzIwMTAtMDctMTAgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKwogICAgICAgICBSZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KIAogICAgICAgICBD YWxsIFBhZ2U6OmNhblN0YXJ0TWVkaWEgd2hlbiB0aGUgV0tWaWV3IGlzIGFkZGVkIHRvL3JlbW92 ZWQgZnJvbSBhIHdpbmRvdwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv RHVtbXlQbHVnaW4uY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvRHVtbXlQbHVnaW4u Y3BwCmluZGV4IDY0MzMwNDNjZTllNGE4MmFiNTFiNGEzMWE0ZjdiZWZlZTUyNzk5ZTMuLjQ4YWY4 YjIxYmNmZWNiMWYzYzMzYTAxNzRlMGQ4MTE5MGU4MjAzNTEgMTAwNjQ0Ci0tLSBhL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL0R1bW15UGx1Z2luLmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9EdW1teVBsdWdpbi5jcHAKQEAgLTM1LDcgKzM1LDcgQEAgRHVtbXlQbHVnaW46 OkR1bW15UGx1Z2luKCkKIHsKIH0KIAotYm9vbCBEdW1teVBsdWdpbjo6aW5pdGlhbGl6ZShjb25z dCBLVVJMJiwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMsIGNvbnN0IFZlY3RvcjxT dHJpbmc+JiBwYXJhbVZhbHVlcywgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBsb2FkTWFu dWFsbHkpCitib29sIER1bW15UGx1Z2luOjppbml0aWFsaXplKGNvbnN0IFBhcmFtZXRlcnMmKQog ewogICAgIHJldHVybiB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvRHVtbXlQbHVnaW4uaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL0R1bW15UGx1 Z2luLmgKaW5kZXggZGU3OGMwYWU4YzZlNTJjOTY3Mjg5MTUxZTc1YWZkYjMzZDAyNWY0Zi4uODBi NTdmMWE5MmI5NjE4YjczYzQwYmQ1YTJkYTM5NjRhOGUzODEzZCAxMDA2NDQKLS0tIGEvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvRHVtbXlQbHVnaW4uaAorKysgYi9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9EdW1teVBsdWdpbi5oCkBAIC00Miw3ICs0Miw3IEBAIHByaXZhdGU6CiAgICAg RHVtbXlQbHVnaW4oKTsKIAogICAgIC8vIFBsdWdpbgotICAgIHZpcnR1YWwgYm9vbCBpbml0aWFs aXplKGNvbnN0IFdlYkNvcmU6OktVUkwmLCBjb25zdCBWZWN0b3I8V2ViQ29yZTo6U3RyaW5nPiYg cGFyYW1OYW1lcywgY29uc3QgVmVjdG9yPFdlYkNvcmU6OlN0cmluZz4mIHBhcmFtVmFsdWVzLCBj b25zdCBXZWJDb3JlOjpTdHJpbmcmIG1pbWVUeXBlLCBib29sIGxvYWRNYW51YWxseSk7CisgICAg dmlydHVhbCBib29sIGluaXRpYWxpemUoY29uc3QgUGFyYW1ldGVycyYpOwogICAgIHZpcnR1YWwg dm9pZCBkZXN0cm95KCk7CiAgICAgdmlydHVhbCB2b2lkIHBhaW50KFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dCosIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGRpcnR5UmVjdCk7CiAgICAgdmlydHVh bCB2b2lkIGdlb21ldHJ5RGlkQ2hhbmdlKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGZyYW1lUmVj dCwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgY2xpcFJlY3QpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwIGIvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwCmluZGV4IDk0 YzQ5Yjk3MTRlZWEwZWUyMzY2MzY1MGJkMDJmOGM3OGY1MjhkOTcuLjkyZTU1NDkxNTAzY2QxZmQ5 M2VhYjAzNjhiMzViYmY3ZjExNDczN2UgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAKQEAgLTg1LDMyICs4NSwzMSBA QCB2b2lkIE5ldHNjYXBlUGx1Z2luOjpjYWxsU2V0V2luZG93KCkKICAgICBtX3BsdWdpbk1vZHVs ZS0+cGx1Z2luRnVuY3MoKS5zZXR3aW5kb3coJm1fbnBwLCAmbV9ucFdpbmRvdyk7CiB9CiAKLWJv b2wgTmV0c2NhcGVQbHVnaW46OmluaXRpYWxpemUoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBWZWN0 b3I8U3RyaW5nPiYgcGFyYW1OYW1lcywgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtVmFsdWVz LCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGxvYWRNYW51YWxseSkKK2Jvb2wgTmV0c2Nh cGVQbHVnaW46OmluaXRpYWxpemUoY29uc3QgUGFyYW1ldGVycyYgcGFyYW1ldGVycykKIHsKLSAg ICB1aW50MTZfdCBtb2RlID0gbG9hZE1hbnVhbGx5ID8gTlBfRlVMTCA6IE5QX0VNQkVEOworICAg IHVpbnQxNl90IG1vZGUgPSBwYXJhbWV0ZXJzLmxvYWRNYW51YWxseSA/IE5QX0ZVTEwgOiBOUF9F TUJFRDsKICAgICAKICAgICBtX2luTlBQTmV3ID0gdHJ1ZTsKIAotICAgIENTdHJpbmcgbWltZVR5 cGVDU3RyaW5nID0gbWltZVR5cGUudXRmOCgpOworICAgIENTdHJpbmcgbWltZVR5cGVDU3RyaW5n ID0gcGFyYW1ldGVycy5taW1lVHlwZS51dGY4KCk7CiAKLSAgICBBU1NFUlQocGFyYW1OYW1lcy5z aXplKCkgPT0gcGFyYW1WYWx1ZXMuc2l6ZSgpKTsKKyAgICBBU1NFUlQocGFyYW1ldGVycy5uYW1l cy5zaXplKCkgPT0gcGFyYW1ldGVycy52YWx1ZXMuc2l6ZSgpKTsKIAotICAgIFZlY3RvcjxDU3Ry aW5nPiB1dGY4UGFyYW1OYW1lczsKLSAgICBWZWN0b3I8Q1N0cmluZz4gdXRmOFBhcmFtVmFsdWVz OwotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcGFyYW1OYW1lcy5zaXplKCk7ICsraSkgewot ICAgICAgICB1dGY4UGFyYW1OYW1lcy5hcHBlbmQocGFyYW1OYW1lc1tpXS51dGY4KCkpOwotICAg ICAgICB1dGY4UGFyYW1WYWx1ZXMuYXBwZW5kKHBhcmFtVmFsdWVzW2ldLnV0ZjgoKSk7CisgICAg VmVjdG9yPENTdHJpbmc+IHBhcmFtTmFtZXM7CisgICAgVmVjdG9yPENTdHJpbmc+IHBhcmFtVmFs dWVzOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcGFyYW1ldGVycy5uYW1lcy5zaXplKCk7 ICsraSkgeworICAgICAgICBwYXJhbU5hbWVzLmFwcGVuZChwYXJhbWV0ZXJzLm5hbWVzW2ldLnV0 ZjgoKSk7CisgICAgICAgIHBhcmFtVmFsdWVzLmFwcGVuZChwYXJhbWV0ZXJzLnZhbHVlc1tpXS51 dGY4KCkpOwogICAgIH0KIAotICAgIC8vIFRoZSBzdHJpbmdzIHRoYXQgdGhlc2UgcG9pbnRlcnMg cG9pbnQgdG8gYXJlIGtlcHQgYWxpdmUgYnkgdXRmOFBhcmFtTmFtZXMgYW5kIHV0ZjhQYXJhbVZh bHVlcy4KKyAgICAvLyBUaGUgc3RyaW5ncyB0aGF0IHRoZXNlIHBvaW50ZXJzIHBvaW50IHRvIGFy ZSBrZXB0IGFsaXZlIGJ5IHBhcmFtTmFtZXMgYW5kIHBhcmFtVmFsdWVzLgogICAgIFZlY3Rvcjxj b25zdCBjaGFyKj4gbmFtZXM7CiAgICAgVmVjdG9yPGNvbnN0IGNoYXIqPiB2YWx1ZXM7CiAgICAg Zm9yIChzaXplX3QgaSA9IDA7IGkgPCBwYXJhbU5hbWVzLnNpemUoKTsgKytpKSB7Ci0gICAgICAg IG5hbWVzLmFwcGVuZCh1dGY4UGFyYW1OYW1lc1tpXS5kYXRhKCkpOwotICAgICAgICB2YWx1ZXMu YXBwZW5kKHV0ZjhQYXJhbVZhbHVlc1tpXS5kYXRhKCkpOworICAgICAgICBuYW1lcy5hcHBlbmQo cGFyYW1OYW1lc1tpXS5kYXRhKCkpOworICAgICAgICB2YWx1ZXMuYXBwZW5kKHBhcmFtVmFsdWVz W2ldLmRhdGEoKSk7CiAgICAgfQogICAgIAotICAgIC8vIEZJWE1FOiBQYXNzIGFyZ3VtZW50cyB0 byBOUFBfTmV3LgogICAgIE5QRXJyb3IgZXJyb3IgPSBtX3BsdWdpbk1vZHVsZS0+cGx1Z2luRnVu Y3MoKS5uZXdwKGNvbnN0X2Nhc3Q8Y2hhcio+KG1pbWVUeXBlQ1N0cmluZy5kYXRhKCkpLCAmbV9u cHAsIG1vZGUsIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG5hbWVzLnNpemUoKSwgY29uc3RfY2FzdDxjaGFyKio+KG5hbWVzLmRhdGEoKSks IGNvbnN0X2Nhc3Q8Y2hhcioqPih2YWx1ZXMuZGF0YSgpKSwgMCk7CiAgICAgbV9pbk5QUE5ldyA9 IGZhbHNlOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUv TmV0c2NhcGVQbHVnaW4uaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05l dHNjYXBlUGx1Z2luLmgKaW5kZXggODUzOWIzNjAwODE2Zjc3NDBlMjUxY2UxN2Y4NmMwZjg5Yzg0 ODljMi4uMzA1OTVkNjE4YWMyY2FjMGJmM2IwMzUyNDIyNjMwZDFhODJhZGM5ZCAxMDA2NDQKLS0t IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaAor KysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5o CkBAIC01Niw3ICs1Niw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBwbGF0Zm9ybVBhaW50KFdlYkNv cmU6OkdyYXBoaWNzQ29udGV4dCosIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGRpcnR5UmVjdCk7 CiAKICAgICAvLyBQbHVnaW4KLSAgICB2aXJ0dWFsIGJvb2wgaW5pdGlhbGl6ZShjb25zdCBXZWJD b3JlOjpLVVJMJiwgY29uc3QgVmVjdG9yPFdlYkNvcmU6OlN0cmluZz4mIHBhcmFtTmFtZXMsIGNv bnN0IFZlY3RvcjxXZWJDb3JlOjpTdHJpbmc+JiBwYXJhbVZhbHVlcywgY29uc3QgV2ViQ29yZTo6 U3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBsb2FkTWFudWFsbHkpOworICAgIHZpcnR1YWwgYm9vbCBp bml0aWFsaXplKGNvbnN0IFBhcmFtZXRlcnMmKTsKICAgICB2aXJ0dWFsIHZvaWQgZGVzdHJveSgp OwogICAgIHZpcnR1YWwgdm9pZCBwYWludChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQqLCBjb25z dCBXZWJDb3JlOjpJbnRSZWN0JiBkaXJ0eVJlY3QpOwogICAgIHZpcnR1YWwgdm9pZCBnZW9tZXRy eURpZENoYW5nZShjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBmcmFtZVJlY3QsIGNvbnN0IFdlYkNv cmU6OkludFJlY3QmIGNsaXBSZWN0KTsKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL1BsdWdpbi5oIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luLmgKaW5k ZXggMWNiMzAyMGJjMTY1YzA2N2ZhMjM5ZDAxZWVkYzAzYTFmNTM2ZjdiNS4uNzdlZTYwZWY0NDc3 YmM2YWZlYWQ5NDYyMjkwZmI5OTkzYmQ2NzdlOCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9j ZXNzL1BsdWdpbnMvUGx1Z2luLmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1 Z2luLmgKQEAgLTI2LDYgKzI2LDcgQEAKICNpZm5kZWYgUGx1Z2luX2gKICNkZWZpbmUgUGx1Z2lu X2gKIAorI2luY2x1ZGUgPFdlYkNvcmUvS1VSTC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVk Lmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCkBAIC00MCw5ICs0MSwxNyBAQCBuYW1lc3Bh Y2UgV2ViS2l0IHsKIAogY2xhc3MgUGx1Z2luIDogcHVibGljIFJlZkNvdW50ZWQ8UGx1Z2luPiB7 CiBwdWJsaWM6CisgICAgc3RydWN0IFBhcmFtZXRlcnMgeworICAgICAgICBXZWJDb3JlOjpLVVJM IHVybDsKKyAgICAgICAgVmVjdG9yPFdlYkNvcmU6OlN0cmluZz4gbmFtZXM7CisgICAgICAgIFZl Y3RvcjxXZWJDb3JlOjpTdHJpbmc+IHZhbHVlczsKKyAgICAgICAgV2ViQ29yZTo6U3RyaW5nIG1p bWVUeXBlOworICAgICAgICBib29sIGxvYWRNYW51YWxseTsKKyAgICB9OworCiAgICAgdmlydHVh bCB+UGx1Z2luKCk7CiAgICAgCi0gICAgdmlydHVhbCBib29sIGluaXRpYWxpemUoY29uc3QgV2Vi Q29yZTo6S1VSTCYsIGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpTdHJpbmc+JiBwYXJhbU5hbWVzLCBj b25zdCBWZWN0b3I8V2ViQ29yZTo6U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFdlYkNvcmU6 OlN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1hbnVhbGx5KSA9IDA7CisgICAgdmlydHVhbCBi b29sIGluaXRpYWxpemUoY29uc3QgUGFyYW1ldGVycyYpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQg ZGVzdHJveSgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnQoV2ViQ29yZTo6R3JhcGhpY3ND b250ZXh0KiwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgZGlydHlSZWN0KSA9IDA7CiAgICAgdmly dHVhbCB2b2lkIGdlb21ldHJ5RGlkQ2hhbmdlKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGZyYW1l UmVjdCwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgY2xpcFJlY3QpID0gMDsKZGlmZiAtLWdpdCBh L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwIGIvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKaW5kZXggOGUzYzQ1ZTg4Yzg4NmNiMGVkZDQ2 ODRkYTYzZDhlNjNkMDJiZGZlMS4uNmQ5NTM0NmZhYmNhZTNmZjljZmVmZGYyYTNmNzAyNGM2ZmVh OWVjOSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5j cHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKQEAgLTM2 LDE1ICszNiwzOCBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktp dCB7CiAKLVBsdWdpblZpZXc6OlBsdWdpblZpZXcoUGFzc1JlZlB0cjxQbHVnaW4+IHBsdWdpbiwg SFRNTFBsdWdJbkVsZW1lbnQqIHBsdWdpbkVsZW1lbnQpCi0gICAgOiBtX3BsdWdpbihwbHVnaW4p Ci0gICAgLCBtX3BsdWdpbkVsZW1lbnQocGx1Z2luRWxlbWVudCkKK1BsdWdpblZpZXc6OlBsdWdp blZpZXcoV2ViQ29yZTo6SFRNTFBsdWdJbkVsZW1lbnQqIHBsdWdpbkVsZW1lbnQsIFBhc3NSZWZQ dHI8UGx1Z2luPiBwbHVnaW4sIGNvbnN0IFBsdWdpbjo6UGFyYW1ldGVycyYgcGFyYW1ldGVycykK KyAgICA6IG1fcGx1Z2luRWxlbWVudChwbHVnaW5FbGVtZW50KQorICAgICwgbV9wbHVnaW4ocGx1 Z2luKQorICAgICwgbV9wYXJhbWV0ZXJzKHBhcmFtZXRlcnMpCisgICAgLCBtX2lzSW5pdGlhbGl6 ZWQoZmFsc2UpCiB7CiB9CiAKIFBsdWdpblZpZXc6On5QbHVnaW5WaWV3KCkKIHsKLSAgICBtX3Bs dWdpbi0+ZGVzdHJveSgpOworICAgIGlmIChtX3BsdWdpbiAmJiBtX2lzSW5pdGlhbGl6ZWQpCisg ICAgICAgIG1fcGx1Z2luLT5kZXN0cm95KCk7Cit9CisKK3ZvaWQgUGx1Z2luVmlldzo6aW5pdGlh bGl6ZVBsdWdpbigpCit7CisgICAgaWYgKG1faXNJbml0aWFsaXplZCkKKyAgICAgICAgcmV0dXJu OworCisgICAgaWYgKCFtX3BsdWdpbikgeworICAgICAgICAvLyBXZSd2ZSBhbHJlYWR5IHRyaWVk IGFuZCBmYWlsZWQgdG8gaW5pdGlhbGl6ZSB0aGUgcGx1Zy1pbi4KKyAgICAgICAgcmV0dXJuOwor ICAgIH0KKworICAgIGlmICghbV9wbHVnaW4tPmluaXRpYWxpemUobV9wYXJhbWV0ZXJzKSkgewor ICAgICAgICAvLyBXZSBmYWlsZWQgdG8gaW5pdGlhbGl6ZSB0aGUgcGx1Zy1pbi4KKyAgICAgICAg bV9wbHVnaW4gPSAwOworCisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgCisgICAgbV9pc0lu aXRpYWxpemVkID0gdHJ1ZTsKIH0KIAogdm9pZCBQbHVnaW5WaWV3OjpzZXRGcmFtZVJlY3QoY29u c3QgV2ViQ29yZTo6SW50UmVjdCYgcmVjdCkKQEAgLTU1LDcgKzc4LDcgQEAgdm9pZCBQbHVnaW5W aWV3OjpzZXRGcmFtZVJlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgcmVjdCkKIAogdm9pZCBQ bHVnaW5WaWV3OjpwYWludChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3Qm IGRpcnR5UmVjdCkKIHsKLSAgICBpZiAoY29udGV4dC0+cGFpbnRpbmdEaXNhYmxlZCgpKQorICAg IGlmIChjb250ZXh0LT5wYWludGluZ0Rpc2FibGVkKCkgfHwgIW1fcGx1Z2luKQogICAgICAgICBy ZXR1cm47CiAgICAgCiAgICAgSW50UmVjdCBkaXJ0eVJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzID0g cGFyZW50KCktPmNvbnRlbnRzVG9XaW5kb3coZGlydHlSZWN0KTsKQEAgLTgyLDEyICsxMDUsMTYg QEAgdm9pZCBQbHVnaW5WaWV3OjpmcmFtZVJlY3RzQ2hhbmdlZCgpCiB2b2lkIFBsdWdpblZpZXc6 OnNldFBhcmVudChTY3JvbGxWaWV3KiBzY3JvbGxWaWV3KQogewogICAgIFdpZGdldDo6c2V0UGFy ZW50KHNjcm9sbFZpZXcpOworICAgIAorICAgIGlmIChzY3JvbGxWaWV3KQorICAgICAgICBpbml0 aWFsaXplUGx1Z2luKCk7CisKICAgICB2aWV3R2VvbWV0cnlEaWRDaGFuZ2UoKTsKIH0KIAogdm9p ZCBQbHVnaW5WaWV3Ojp2aWV3R2VvbWV0cnlEaWRDaGFuZ2UoKQogewotICAgIGlmICghcGFyZW50 KCkpCisgICAgaWYgKCFwYXJlbnQoKSB8fCAhbV9wbHVnaW4pCiAgICAgICAgIHJldHVybjsKIAog ICAgIC8vIEdldCB0aGUgZnJhbWUgcmVjdCBpbiB3aW5kb3cgY29vcmRpbmF0ZXMuCmRpZmYgLS1n aXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmggYi9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgKaW5kZXggODBkMzkxZmVhY2U0NDhlODAzZDll MjUzM2ZjYjQxMzk3NDc3ZjU1Mi4uODg1ODUwYmI0MDgyMmUzMWFkNGUyNWI0ZWJmYzNlNzc2ZTEz Y2U2YSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5o CisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaApAQCAtMzksMTUg KzM5LDE4IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBQbHVnaW5WaWV3IDogcHVibGlj IFdlYkNvcmU6OldpZGdldCB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8UGx1Z2lu Vmlldz4gY3JlYXRlKFBhc3NSZWZQdHI8UGx1Z2luPiBwbHVnaW4sIFdlYkNvcmU6OkhUTUxQbHVn SW5FbGVtZW50KiBwbHVnaW5FbGVtZW50KQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPFBsdWdpblZp ZXc+IGNyZWF0ZShXZWJDb3JlOjpIVE1MUGx1Z0luRWxlbWVudCogcGx1Z2luRWxlbWVudCwgUGFz c1JlZlB0cjxQbHVnaW4+IHBsdWdpbiwgY29uc3QgUGx1Z2luOjpQYXJhbWV0ZXJzJiBwYXJhbWV0 ZXJzKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBQbHVnaW5WaWV3KHBsdWdp biwgcGx1Z2luRWxlbWVudCkpOworICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFBsdWdpblZp ZXcocGx1Z2luRWxlbWVudCwgcGx1Z2luLCBwYXJhbWV0ZXJzKSk7CiAgICAgfQogCiBwcml2YXRl OgotICAgIFBsdWdpblZpZXcoUGFzc1JlZlB0cjxQbHVnaW4+LCBXZWJDb3JlOjpIVE1MUGx1Z0lu RWxlbWVudCopOworICAgIFBsdWdpblZpZXcoV2ViQ29yZTo6SFRNTFBsdWdJbkVsZW1lbnQqLCBQ YXNzUmVmUHRyPFBsdWdpbj4sIGNvbnN0IFBsdWdpbjo6UGFyYW1ldGVycyYgcGFyYW1ldGVycyk7 CiAgICAgdmlydHVhbCB+UGx1Z2luVmlldygpOwogCisgICAgdm9pZCBpbml0aWFsaXplUGx1Z2lu KCk7CisgICAgdm9pZCBkZXN0cm95UGx1Z2luKCk7CisKICAgICB2b2lkIHZpZXdHZW9tZXRyeURp ZENoYW5nZSgpOwogICAgIFdlYkNvcmU6OkludFJlY3QgY2xpcFJlY3RJbldpbmRvd0Nvb3JkaW5h dGVzKCkgY29uc3Q7CiAKQEAgLTU4LDggKzYxLDExIEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2 b2lkIGZyYW1lUmVjdHNDaGFuZ2VkKCk7CiAgICAgdmlydHVhbCB2b2lkIHNldFBhcmVudChXZWJD b3JlOjpTY3JvbGxWaWV3Kik7CiAKLSAgICBSZWZQdHI8UGx1Z2luPiBtX3BsdWdpbjsKICAgICBX ZWJDb3JlOjpIVE1MUGx1Z0luRWxlbWVudCogbV9wbHVnaW5FbGVtZW50OworICAgIFJlZlB0cjxQ bHVnaW4+IG1fcGx1Z2luOworICAgIFBsdWdpbjo6UGFyYW1ldGVycyBtX3BhcmFtZXRlcnM7Cisg ICAgCisgICAgYm9vbCBtX2lzSW5pdGlhbGl6ZWQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJL aXQKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi RnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDRmMjI3MGVmNThjOWQ1OWJiN2ExZThiZGU4ZjI4 ODlhNTQ1ZmUyMzMuLjk4MDk5MjI3OTc3MmFmMjBkNDE2ZWIyNjA0ZGY5ZWViZTY1YWNkOWQgMTAw NjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRl ckNsaWVudC5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNzg3LDEyICs3ODcsMTYgQEAgUGFzc1JlZlB0cjxXaWRn ZXQ+IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpjcmVhdGVQbHVnaW4oY29uc3QgSW50U2l6ZSYsIEhU TUxQbHVnSW4KICAgICBSZWZQdHI8TmV0c2NhcGVQbHVnaW5Nb2R1bGU+IHBsdWdpbk1vZHVsZSA9 IE5ldHNjYXBlUGx1Z2luTW9kdWxlOjpnZXRPckNyZWF0ZShwbHVnaW5QYXRoKTsKICAgICBpZiAo IXBsdWdpbk1vZHVsZSkKICAgICAgICAgcmV0dXJuIDA7Ci0gICAgCi0gICAgUmVmUHRyPFBsdWdp bj4gcGx1Z2luID0gTmV0c2NhcGVQbHVnaW46OmNyZWF0ZShwbHVnaW5Nb2R1bGUucmVsZWFzZSgp KTsKLSAgICBpZiAoIXBsdWdpbi0+aW5pdGlhbGl6ZSh1cmwsIHBhcmFtTmFtZXMsIHBhcmFtVmFs dWVzLCBtaW1lVHlwZSwgbG9hZE1hbnVhbGx5KSkKLSAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBy ZXR1cm4gUGx1Z2luVmlldzo6Y3JlYXRlKHBsdWdpbi5yZWxlYXNlKCksIHBsdWdpbkVsZW1lbnQp OworICAgIFBsdWdpbjo6UGFyYW1ldGVycyBwYXJhbWV0ZXJzOworICAgIHBhcmFtZXRlcnMudXJs ID0gdXJsOworICAgIHBhcmFtZXRlcnMubmFtZXMgPSBwYXJhbU5hbWVzOworICAgIHBhcmFtZXRl cnMudmFsdWVzID0gcGFyYW1WYWx1ZXM7CisgICAgcGFyYW1ldGVycy5taW1lVHlwZSA9IG1pbWVU eXBlOworICAgIHBhcmFtZXRlcnMubG9hZE1hbnVhbGx5ID0gbG9hZE1hbnVhbGx5OworCisgICAg UmVmUHRyPFBsdWdpbj4gcGx1Z2luID0gTmV0c2NhcGVQbHVnaW46OmNyZWF0ZShwbHVnaW5Nb2R1 bGUucmVsZWFzZSgpKTsKKyAgICByZXR1cm4gUGx1Z2luVmlldzo6Y3JlYXRlKHBsdWdpbkVsZW1l bnQsIHBsdWdpbi5yZWxlYXNlKCksIHBhcmFtZXRlcnMpOwogI2Vsc2UKICAgICByZXR1cm4gMDsK ICNlbmRpZgo=