125311 2013-12-05 12:19:50 -0800 Tweak WeakObjCPtr 2013-12-05 12:37:42 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 957001 0 andersca 2013-12-05 12:19:50 -0800 Tweak WeakObjCPtr 957003 1 218530 andersca 2013-12-05 12:22:21 -0800 Created attachment 218530 Patch 957012 2 andersca 2013-12-05 12:37:42 -0800 Committed r160187: <http://trac.webkit.org/changeset/160187> 218530 2013-12-05 12:22:21 -0800 2013-12-05 12:32:52 -0800 Patch bug-125311-20131205122221.patch text/plain 5915 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwMTgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNGNkYTcyYmRjOGFmZjg4 YWMxZTdiOGYwYjFkNjY2NWFhYTg4NzVmMy4uZmY1ZjE3OTQyODllNTUwYjJhN2Y5NWNkM2Y0NDQy NGJkZWFlZmFhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTEyLTA1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgVHdlYWsgV2Vha09i akNQdHIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy NTMxMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1h a2UgaXQgcG9zc2libGUgdG8gdXNlIFdlYWtPYmpDUHRyIHdpdGggcG9pbnRlciB0eXBlcyBzdWNo IGFzIGlkLiBBbHNvLAorICAgICAgICBhZGQgYSBnZXRBdXRvcmVsZWFzZWQoKSBtZW1iZXIgdGhh dCB3aWxsIGxvYWQgdGhlIHdlYWsgcG9pbnRlciBhbmQgcmV0YWluICsgYXV0b3JlbGVhc2UgaXQu CisKKyAgICAgICAgKiBTaGFyZWQvbWFjL1dlYWtPYmpDUHRyLmg6CisgICAgICAgIChXZWJLaXQ6 OldlYWtPYmpDUHRyOjpXZWFrT2JqQ1B0cik6CisgICAgICAgIChXZWJLaXQ6OldlYWtPYmpDUHRy OjpvcGVyYXRvcj0pOgorICAgICAgICAoV2ViS2l0OjpXZWFrT2JqQ1B0cjo6Z2V0KToKKyAgICAg ICAgKFdlYktpdDo6V2Vha09iakNQdHI6OmdldEF1dG9yZWxlYXNlZCk6CisKIDIwMTMtMTItMDUg IFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdW1dL Ml0gQ2xlYW4gdXAgV29ya1F1ZXVlR3RrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvbWFjL1dlYWtPYmpDUHRyLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1dlYWtPYmpD UHRyLmgKaW5kZXggMTdkY2NkYjI4ZmI1ODA2OGQyMWI1OWFjYTY0NzRkNTNkNzRiM2ExNS4uY2Ew ZjFiMmJmNzk3NmY4YTUwZmFmNjg5NTg0M2E1ZDAzNWVmZTY4OCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvU2hhcmVkL21hYy9XZWFrT2JqQ1B0ci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9tYWMvV2Vha09iakNQdHIuaApAQCAtMjcsNiArMjcsNyBAQAogI2RlZmluZSBXZWFrT2Jq Q1B0cl9oCiAKICNpbmNsdWRlIDxvYmpjL3J1bnRpbWUuaD4KKyNpbmNsdWRlIDx0eXBlX3RyYWl0 cz4KICNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CiAKICNpZiBfX2hhc19pbmNsdWRlKDxvYmpj L29iamMtaW50ZXJuYWwuaD4pCkBAIC00MywxMiArNDQsMTQgQEAgbmFtZXNwYWNlIFdlYktpdCB7 CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGNsYXNzIFdlYWtPYmpDUHRyIHsKIHB1YmxpYzoKKyAg ICB0eXBlZGVmIHR5cGVuYW1lIHN0ZDo6cmVtb3ZlX3BvaW50ZXI8VD46OnR5cGUgVmFsdWVUeXBl OworCiAgICAgV2Vha09iakNQdHIoKQogICAgICAgICA6IG1fd2Vha1JlZmVyZW5jZShudWxscHRy KQogICAgIHsKICAgICB9CiAKLSAgICBXZWFrT2JqQ1B0cihUICpwdHIpCisgICAgV2Vha09iakNQ dHIoVmFsdWVUeXBlICpwdHIpCiAgICAgewogICAgICAgICBvYmpjX2luaXRXZWFrKCZtX3dlYWtS ZWZlcmVuY2UsIHB0cik7CiAgICAgfQpAQCAtNTgsMTggKzYxLDIzIEBAIHB1YmxpYzoKICAgICAg ICAgb2JqY19kZXN0cm95V2VhaygmbV93ZWFrUmVmZXJlbmNlKTsKICAgICB9CiAKLSAgICBXZWFr T2JqQ1B0ciYgb3BlcmF0b3I9KFQgKnB0cikKKyAgICBXZWFrT2JqQ1B0ciYgb3BlcmF0b3I9KFZh bHVlVHlwZSAqcHRyKQogICAgIHsKICAgICAgICAgb2JqY19zdG9yZVdlYWsoJm1fd2Vha1JlZmVy ZW5jZSwgcHRyKTsKIAogICAgICAgICByZXR1cm4gKnRoaXM7CiAgICAgfQogCi0gICAgUmV0YWlu UHRyPFQ+IGdldCgpIGNvbnN0CisgICAgUmV0YWluUHRyPFZhbHVlVHlwZT4gZ2V0KCkgY29uc3QK ICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdE5TKG9iamNfbG9hZFdlYWtSZXRhaW5lZChjb25z dF9jYXN0PGlkKj4oJm1fd2Vha1JlZmVyZW5jZSkpKTsKICAgICB9CiAKKyAgICBWYWx1ZVR5cGUg KmdldEF1dG9yZWxlYXNlZCgpIGNvbnN0CisgICAgeworICAgICAgICByZXR1cm4gc3RhdGljX2Nh c3Q8VmFsdWVUeXBlICo+KG9iamNfbG9hZFdlYWsoY29uc3RfY2FzdDxpZCo+KCZtX3dlYWtSZWZl cmVuY2UpKSk7CisgICAgfQorCiBwcml2YXRlOgogICAgIGlkIG1fd2Vha1JlZmVyZW5jZTsKIH07 CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMGRk ZGUzM2EzMGRiZTUwMTgwNmI1YTg2ZjAzNWMyMDMwZjEwODM1NC4uYjIxNDE3NTBhNjI2NWQyMjU4 ZjgxNTljZDk2NDcwZjc0OTI2MjQyZCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEzLTEyLTA1ICBBbmRlcnMgQ2Fy bHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgVHdlYWsgV2Vha09iakNQdHIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTMxMQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNwbGl0IHVw IHRlc3RzIGludG8gbW9yZSBsb2dpY2FsIGdyb3Vwcy4gQWRkIG5ldyB0ZXN0cyBmb3IgbmV3IGZ1 bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvbWFj L1dlYWtPYmpDUHRyLm1tOgorCiAyMDEzLTEyLTA1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBGaXggZ3RrLWRvYyB3YXJuaW5ncyB3 aGVuIGdlbmVyYXRpbmcgRE9NIGJpbmRpbmdzIEFQSSBkb2NzCmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvbWFjL1dlYWtPYmpDUHRyLm1tIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL21hYy9XZWFrT2JqQ1B0ci5tbQppbmRleCAyNDRlYzM0 ZmEzMDI0NTAzNGYyZTBmM2Q5ZTU5ZDhlY2IxMjEzMDFhLi4wZDAzMzFjNzc0ZDg1Mjc1MTA1Y2M4 MTdkODUyMDM4OGUzYWY5MGFjIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdDIvbWFjL1dlYWtPYmpDUHRyLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Mi9tYWMvV2Vha09iakNQdHIubW0KQEAgLTI5LDUyICsyOSw4MCBAQAogCiB1c2lu ZyBXZWJLaXQ6OldlYWtPYmpDUHRyOwogCi1URVNUKFdlYktpdDIsIFdlYWtPYmpDUHRyKQorVEVT VChXZWJLaXQyX1dlYWtPYmpDUHRyLCBDb25zdHJ1Y3Rpb24pCiB7Ci0gICAgLy8gVGVzdCBjb25z dHJ1Y3Rpb24uCi0gICAgewotICAgICAgICBOU09iamVjdCAqb2JqZWN0ID0gW1tOU09iamVjdCBh bGxvY10gaW5pdF07CisgICAgTlNPYmplY3QgKm9iamVjdCA9IFtbTlNPYmplY3QgYWxsb2NdIGlu aXRdOwogCi0gICAgICAgIFdlYWtPYmpDUHRyPE5TT2JqZWN0PiB3ZWFrKG9iamVjdCk7CisgICAg V2Vha09iakNQdHI8TlNPYmplY3Q+IHdlYWsob2JqZWN0KTsKIAotICAgICAgICBFWFBFQ1RfRVEo d2Vhay5nZXQoKSwgb2JqZWN0KTsKKyAgICBFWFBFQ1RfRVEod2Vhay5nZXQoKSwgb2JqZWN0KTsK IAotICAgICAgICBbb2JqZWN0IHJlbGVhc2VdOworICAgIFtvYmplY3QgcmVsZWFzZV07CiAKLSAg ICAgICAgRVhQRUNUX0VRKHdlYWsuZ2V0KCksICh2b2lkKiluaWwpOwotICAgIH0KKyAgICBFWFBF Q1RfRVEod2Vhay5nZXQoKSwgKHZvaWQqKW5pbCk7Cit9CiAKLSAgICAvLyBUZXN0IGFzc2lnbm1l bnQuCi0gICAgewotICAgICAgICBOU09iamVjdCAqb2JqZWN0MSA9IFtbTlNPYmplY3QgYWxsb2Nd IGluaXRdOworVEVTVChXZWJLaXQyX1dlYWtPYmpDUHRyLCBBc3NpZ25tZW50KQoreworICAgIE5T T2JqZWN0ICpvYmplY3QxID0gW1tOU09iamVjdCBhbGxvY10gaW5pdF07CiAKLSAgICAgICAgV2Vh a09iakNQdHI8TlNPYmplY3Q+IHdlYWsob2JqZWN0MSk7CisgICAgV2Vha09iakNQdHI8TlNPYmpl Y3Q+IHdlYWsob2JqZWN0MSk7CiAKLSAgICAgICAgRVhQRUNUX0VRKHdlYWsuZ2V0KCksIG9iamVj dDEpOworICAgIEVYUEVDVF9FUSh3ZWFrLmdldCgpLCBvYmplY3QxKTsKIAotICAgICAgICBOU09i amVjdCAqb2JqZWN0MiA9IFtbTlNPYmplY3QgYWxsb2NdIGluaXRdOworICAgIE5TT2JqZWN0ICpv YmplY3QyID0gW1tOU09iamVjdCBhbGxvY10gaW5pdF07CiAKLSAgICAgICAgd2VhayA9IG9iamVj dDI7Ci0gICAgICAgIEVYUEVDVF9FUSh3ZWFrLmdldCgpLCBvYmplY3QyKTsKKyAgICB3ZWFrID0g b2JqZWN0MjsKKyAgICBFWFBFQ1RfRVEod2Vhay5nZXQoKSwgb2JqZWN0Mik7CiAKLSAgICAgICAg W29iamVjdDEgcmVsZWFzZV07Ci0gICAgICAgIEVYUEVDVF9FUSh3ZWFrLmdldCgpLCBvYmplY3Qy KTsKKyAgICBbb2JqZWN0MSByZWxlYXNlXTsKKyAgICBFWFBFQ1RfRVEod2Vhay5nZXQoKSwgb2Jq ZWN0Mik7CiAKLSAgICAgICAgW29iamVjdDIgcmVsZWFzZV07Ci0gICAgICAgIEVYUEVDVF9FUSh3 ZWFrLmdldCgpLCAodm9pZCopbmlsKTsKLSAgICB9CisgICAgW29iamVjdDIgcmVsZWFzZV07Cisg ICAgRVhQRUNUX0VRKHdlYWsuZ2V0KCksICh2b2lkKiluaWwpOworfQorCitURVNUKFdlYktpdDJf V2Vha09iakNQdHIsIE9iamVjdE91dGxpdmVzSXRzV2Vha1BvaW50ZXIpCit7CisgICAgTlNPYmpl Y3QgKm9iamVjdCA9IFtbTlNPYmplY3QgYWxsb2NdIGluaXRdOwogCi0gICAgLy8gVGVzdCBoYXZp bmcgYW4gb2JqZWN0IHRoYXQgb3V0bGl2ZXMgaXRzIHdlYWsgcG9pbnRlci4KICAgICB7Ci0gICAg ICAgIE5TT2JqZWN0ICpvYmplY3QgPSBbW05TT2JqZWN0IGFsbG9jXSBpbml0XTsKKyAgICAgICAg V2Vha09iakNQdHI8TlNPYmplY3Q+IHdlYWsob2JqZWN0KTsKIAotICAgICAgICB7Ci0gICAgICAg ICAgICBXZWFrT2JqQ1B0cjxOU09iamVjdD4gd2VhayhvYmplY3QpOworICAgICAgICBFWFBFQ1Rf RVEod2Vhay5nZXQoKSwgb2JqZWN0KTsKKyAgICB9CisKKyAgICBbb2JqZWN0IHJlbGVhc2VdOwor fQorCitURVNUKFdlYktpdDJfV2Vha09iakNQdHIsIEdldEF1dG9yZWxlYXNlZCkKK3sKKyAgICBX ZWFrT2JqQ1B0cjxOU09iamVjdD4gd2VhazsKKworICAgIEBhdXRvcmVsZWFzZXBvb2wgeworICAg ICAgICBOU09iamVjdCAqb2JqZWN0ID0gW1tOU09iamVjdCBhbGxvY10gaW5pdF07CiAKLSAgICAg ICAgICAgIEVYUEVDVF9FUSh3ZWFrLmdldCgpLCBvYmplY3QpOwotICAgICAgICB9CisgICAgICAg IHdlYWsgPSBvYmplY3Q7CiAKKyAgICAgICAgRVhQRUNUX0VRKHdlYWsuZ2V0QXV0b3JlbGVhc2Vk KCksIG9iamVjdCk7CisgICAgICAgIAogICAgICAgICBbb2JqZWN0IHJlbGVhc2VdOworCisgICAg ICAgIC8vIFRoZSBvYmplY3QgaXMgc3RpbGwgaW4gdGhlIGF1dG9yZWxlYXNlIHBvb2wuCisgICAg ICAgIEVYUEVDVF9FUSh3ZWFrLmdldEF1dG9yZWxlYXNlZCgpLCBvYmplY3QpOwogICAgIH0KIAor ICAgIEVYUEVDVF9FUSh3ZWFrLmdldEF1dG9yZWxlYXNlZCgpLCAoaWQpbmlsKTsKK30KKworVEVT VChXZWJLaXQyX1dlYWtPYmpDUHRyLCBJZCkKK3sKKyAgICBpZCBvYmplY3QgPSBbW05TT2JqZWN0 IGFsbG9jXSBpbml0XTsKKyAgICBXZWFrT2JqQ1B0cjxpZD4gd2VhayhvYmplY3QpOworCisgICAg RVhQRUNUX0VRKHdlYWsuZ2V0KCksIG9iamVjdCk7CisKKyAgICBbb2JqZWN0IHJlbGVhc2VdOwor CisgICAgRVhQRUNUX0VRKHdlYWsuZ2V0KCksICh2b2lkKiluaWwpOwogfQo=