87318 2012-05-23 16:31:48 -0700 Refactored WeakBlock to use malloc, clarify behavior 2012-05-23 16:54:31 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren oldest_to_newest 632170 0 ggaren 2012-05-23 16:31:48 -0700 Refactored WeakBlock to use malloc, clarify behavior 632173 1 143673 ggaren 2012-05-23 16:35:09 -0700 Created attachment 143673 Patch 632195 2 ggaren 2012-05-23 16:54:31 -0700 Committed r118269: <http://trac.webkit.org/changeset/118269> 143673 2012-05-23 16:35:09 -0700 2012-05-23 16:47:14 -0700 Patch bug-87318-20120523163511.patch text/plain 7430 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTE4MjY1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBA CisyMDEyLTA1LTIzICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgUmVmYWN0b3JlZCBXZWFrQmxvY2sgdG8gdXNlIG1hbGxvYywgY2xhcmlmeSBiZWhhdmlvcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODczMTgKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSB3YW50IHRv IHVzZSBtYWxsb2Mgc28gd2UgY2FuIG1ha2UgdGhlc2Ugc21hbGxlciB0aGFuIDRLQiwKKyAgICAg ICAgc2luY2UgYW4gaW5kaXZpZHVhbCBNYXJrZWRCbG9jayB3aWxsIHVzdWFsbHkgaGF2ZSBmZXdl ciB0aGFuCisgICAgICAgIDRLQiB3b3J0aCBvZiB3ZWFrIHBvaW50ZXJzLgorCisgICAgICAgICog aGVhcC9IZWFwLmNwcDoKKyAgICAgICAgKEpTQzo6SGVhcDo6bWFya1Jvb3RzKTogUmVuYW1lZCB2 aXNpdExpdmVXZWFrSW1wbHMgdG8gdmlzaXQsIHNpbmNlCisgICAgICAgIHdlIG5vIGxvbmdlciBu ZWVkIHRvIGRpc3Rpbmd1aXNoIGZyb20gInZpc2l0RGVhZFdlYWtJbXBscyIuCisKKyAgICAgICAg UmVuYW1lZCAidmlzaXREZWFkV2Vha0ltcGxzIiB0byAicmVhcCIgYmVjYXVzZSB3ZSdyZSBub3Qg YWN0dWFsbHkKKyAgICAgICAgZG9pbmcgYW55IHZpc2l0aW5nIC0tIHdlJ3JlIGp1c3QgdGFnZ2lu ZyB0aGluZ3MgYXMgZGVhZC4KKworICAgICAgICAqIGhlYXAvV2Vha0Jsb2NrLmNwcDoKKyAgICAg ICAgKEpTQzo6V2Vha0Jsb2NrOjpjcmVhdGUpOgorICAgICAgICAoSlNDOjpXZWFrQmxvY2s6OmRl c3Ryb3kpOgorICAgICAgICAoSlNDOjpXZWFrQmxvY2s6OldlYWtCbG9jayk6IE1hbGxvYyEKKwor ICAgICAgICAoSlNDOjpXZWFrQmxvY2s6OnZpc2l0KToKKyAgICAgICAgKEpTQzo6V2Vha0Jsb2Nr OjpyZWFwKTogUmVuYW1lZCBhcyBhYm92ZS4KKworICAgICAgICAqIGhlYXAvV2Vha0Jsb2NrLmg6 CisgICAgICAgIChXZWFrQmxvY2spOiBSZWR1Y2VkIHRvIDNLQiwgYXMgZXhwbGFpbmVkIGFib3Zl LgorCisgICAgICAgICogaGVhcC9XZWFrU2V0LmNwcDoKKyAgICAgICAgKEpTQzo6V2Vha1NldDo6 dmlzaXQpOgorICAgICAgICAoSlNDOjpXZWFrU2V0OjpyZWFwKToKKyAgICAgICAgKiBoZWFwL1dl YWtTZXQuaDoKKyAgICAgICAgKFdlYWtTZXQpOiBVcGRhdGVkIGZvciByZW5hbWVzLCBhbmQgdG8g bWF0Y2ggV2ViS2l0IHN0eWxlLgorCiAyMDEyLTA1LTIzICBGaWxpcCBQaXpsbyAgPGZwaXpsb0Bh cHBsZS5jb20+CiAKICAgICAgICAgVXNlIGFmdGVyIGZyZWUgaW4gSlNDOjpERkc6OkJ5dGVDb2Rl UGFyc2VyOjpwcm9jZXNzUGhpU3RhY2sKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFw L0hlYXAuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAu Y3BwCShyZXZpc2lvbiAxMTgyMzgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFw LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTYxLDcgKzU2MSw3IEBAIHZvaWQgSGVhcDo6bWFya1Jv b3RzKGJvb2wgZnVsbEdDKQogICAgIHsKICAgICAgICAgR0NQSEFTRShWaXNpdGluZ0xpdmVXZWFr SGFuZGxlcyk7CiAgICAgICAgIHdoaWxlICh0cnVlKSB7Ci0gICAgICAgICAgICBtX3dlYWtTZXQu dmlzaXRMaXZlV2Vha0ltcGxzKGhlYXBSb290VmlzaXRvcik7CisgICAgICAgICAgICBtX3dlYWtT ZXQudmlzaXQoaGVhcFJvb3RWaXNpdG9yKTsKICAgICAgICAgICAgIGhhcnZlc3RXZWFrUmVmZXJl bmNlcygpOwogICAgICAgICAgICAgaWYgKHZpc2l0b3IuaXNFbXB0eSgpKQogICAgICAgICAgICAg ICAgIGJyZWFrOwpAQCAtNTc2LDggKzU3Niw4IEBAIHZvaWQgSGVhcDo6bWFya1Jvb3RzKGJvb2wg ZnVsbEdDKQogICAgIH0KIAogICAgIHsKLSAgICAgICAgR0NQSEFTRShWaXNpdGluZ0RlYWRXZWFr SGFuZGxlcyk7Ci0gICAgICAgIG1fd2Vha1NldC52aXNpdERlYWRXZWFrSW1wbHMoaGVhcFJvb3RW aXNpdG9yKTsKKyAgICAgICAgR0NQSEFTRShSZWFwaW5nV2Vha0hhbmRsZXMpOworICAgICAgICBt X3dlYWtTZXQucmVhcCgpOwogICAgIH0KIAogICAgIEdDQ09VTlRFUihWaXNpdGVkVmFsdWVDb3Vu dCwgdmlzaXRvci52aXNpdENvdW50KCkpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hl YXAvV2Vha0Jsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVh cC9XZWFrQmxvY2suY3BwCShyZXZpc2lvbiAxMTgyMzgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvaGVhcC9XZWFrQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNiwxOSArMzYsMTYgQEAg bmFtZXNwYWNlIEpTQyB7CiAKIFdlYWtCbG9jayogV2Vha0Jsb2NrOjpjcmVhdGUoKQogewotICAg IFBhZ2VBbGxvY2F0aW9uIGFsbG9jYXRpb24gPSBQYWdlQWxsb2NhdGlvbjo6YWxsb2NhdGUoYmxv Y2tTaXplLCBPU0FsbG9jYXRvcjo6SlNHQ0hlYXBQYWdlcyk7Ci0gICAgaWYgKCFzdGF0aWNfY2Fz dDxib29sPihhbGxvY2F0aW9uKSkKLSAgICAgICAgQ1JBU0goKTsKLSAgICByZXR1cm4gbmV3IChO b3ROdWxsLCBhbGxvY2F0aW9uLmJhc2UoKSkgV2Vha0Jsb2NrKGFsbG9jYXRpb24pOworICAgIHZv aWQqIGFsbG9jYXRpb24gPSBmYXN0TWFsbG9jKGJsb2NrU2l6ZSk7CisgICAgcmV0dXJuIG5ldyAo Tm90TnVsbCwgYWxsb2NhdGlvbikgV2Vha0Jsb2NrOwogfQogCiB2b2lkIFdlYWtCbG9jazo6ZGVz dHJveShXZWFrQmxvY2sqIGJsb2NrKQogewotICAgIGJsb2NrLT5tX2FsbG9jYXRpb24uZGVhbGxv Y2F0ZSgpOworICAgIGZhc3RGcmVlKGJsb2NrKTsKIH0KIAotV2Vha0Jsb2NrOjpXZWFrQmxvY2so UGFnZUFsbG9jYXRpb24mIGFsbG9jYXRpb24pCi0gICAgOiBtX2FsbG9jYXRpb24oYWxsb2NhdGlv bikKK1dlYWtCbG9jazo6V2Vha0Jsb2NrKCkKIHsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IHdlYWtJbXBsQ291bnQoKTsgKytpKSB7CiAgICAgICAgIFdlYWtJbXBsKiB3ZWFrSW1wbCA9ICZ3 ZWFrSW1wbHMoKVtpXTsKQEAgLTkwLDcgKzg3LDcgQEAgdm9pZCBXZWFrQmxvY2s6OnN3ZWVwKCkK ICAgICBBU1NFUlQoIW1fc3dlZXBSZXN1bHQuaXNOdWxsKCkpOwogfQogCi12b2lkIFdlYWtCbG9j azo6dmlzaXRMaXZlV2Vha0ltcGxzKEhlYXBSb290VmlzaXRvciYgaGVhcFJvb3RWaXNpdG9yKQor dm9pZCBXZWFrQmxvY2s6OnZpc2l0KEhlYXBSb290VmlzaXRvciYgaGVhcFJvb3RWaXNpdG9yKQog ewogICAgIC8vIElmIGEgYmxvY2sgaXMgY29tcGxldGVseSBlbXB0eSwgYSB2aXNpdCB3b24ndCBo YXZlIGFueSBlZmZlY3QuCiAgICAgaWYgKGlzRW1wdHkoKSkKQEAgLTExOCw5ICsxMTUsOSBAQCB2 b2lkIFdlYWtCbG9jazo6dmlzaXRMaXZlV2Vha0ltcGxzKEhlYXBSCiAgICAgfQogfQogCi12b2lk IFdlYWtCbG9jazo6dmlzaXREZWFkV2Vha0ltcGxzKEhlYXBSb290VmlzaXRvciYpCit2b2lkIFdl YWtCbG9jazo6cmVhcCgpCiB7Ci0gICAgLy8gSWYgYSBibG9jayBpcyBjb21wbGV0ZWx5IGVtcHR5 LCBhIHZpc2l0IHdvbid0IGhhdmUgYW55IGVmZmVjdC4KKyAgICAvLyBJZiBhIGJsb2NrIGlzIGNv bXBsZXRlbHkgZW1wdHksIGEgcmVhcGluZyB3b24ndCBoYXZlIGFueSBlZmZlY3QuCiAgICAgaWYg KGlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvaGVhcC9XZWFrQmxvY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv aGVhcC9XZWFrQmxvY2suaAkocmV2aXNpb24gMTE4MjM4KQorKysgU291cmNlL0phdmFTY3JpcHRD b3JlL2hlYXAvV2Vha0Jsb2NrLmgJKHdvcmtpbmcgY29weSkKQEAgLTMwLDcgKzMwLDYgQEAKICNp bmNsdWRlICJXZWFrSGFuZGxlT3duZXIuaCIKICNpbmNsdWRlICJXZWFrSW1wbC5oIgogI2luY2x1 ZGUgPHd0Zi9Eb3VibHlMaW5rZWRMaXN0Lmg+Ci0jaW5jbHVkZSA8d3RmL1BhZ2VBbGxvY2F0aW9u Lmg+CiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgogCiBuYW1lc3BhY2UgSlNDIHsKQEAg LTQyLDcgKzQxLDcgQEAgY2xhc3MgV2Vha0hhbmRsZU93bmVyOwogY2xhc3MgV2Vha0Jsb2NrIDog cHVibGljIERvdWJseUxpbmtlZExpc3ROb2RlPFdlYWtCbG9jaz4gewogcHVibGljOgogICAgIGZy aWVuZCBjbGFzcyBXVEY6OkRvdWJseUxpbmtlZExpc3ROb2RlPFdlYWtCbG9jaz47Ci0gICAgc3Rh dGljIGNvbnN0IHNpemVfdCBibG9ja1NpemUgPSA0ICogS0I7CisgICAgc3RhdGljIGNvbnN0IHNp emVfdCBibG9ja1NpemUgPSAzICogS0I7IC8vIDUlIG9mIE1hcmtlZEJsb2NrIHNpemUKIAogICAg IHN0cnVjdCBGcmVlQ2VsbCB7CiAgICAgICAgIEZyZWVDZWxsKiBuZXh0OwpAQCAtNjQsMjUgKzYz LDIzIEBAIHB1YmxpYzoKICAgICBib29sIGlzRW1wdHkoKTsKIAogICAgIHZvaWQgc3dlZXAoKTsK LSAgICBjb25zdCBTd2VlcFJlc3VsdCYgc3dlZXBSZXN1bHQoKTsKICAgICBTd2VlcFJlc3VsdCB0 YWtlU3dlZXBSZXN1bHQoKTsKIAotICAgIHZvaWQgdmlzaXRMaXZlV2Vha0ltcGxzKEhlYXBSb290 VmlzaXRvciYpOwotICAgIHZvaWQgdmlzaXREZWFkV2Vha0ltcGxzKEhlYXBSb290VmlzaXRvciYp OworICAgIHZvaWQgdmlzaXQoSGVhcFJvb3RWaXNpdG9yJik7CisgICAgdm9pZCByZWFwKCk7CiAK ICAgICB2b2lkIGxhc3RDaGFuY2VUb0ZpbmFsaXplKCk7CiAKIHByaXZhdGU6CiAgICAgc3RhdGlj IEZyZWVDZWxsKiBhc0ZyZWVDZWxsKFdlYWtJbXBsKik7CiAKLSAgICBXZWFrQmxvY2soUGFnZUFs bG9jYXRpb24mKTsKKyAgICBXZWFrQmxvY2soKTsKICAgICBXZWFrSW1wbCogZmlyc3RXZWFrSW1w bCgpOwogICAgIHZvaWQgZmluYWxpemUoV2Vha0ltcGwqKTsKICAgICBXZWFrSW1wbCogd2Vha0lt cGxzKCk7CiAgICAgc2l6ZV90IHdlYWtJbXBsQ291bnQoKTsKICAgICB2b2lkIGFkZFRvRnJlZUxp c3QoRnJlZUNlbGwqKiwgV2Vha0ltcGwqKTsKIAotICAgIFBhZ2VBbGxvY2F0aW9uIG1fYWxsb2Nh dGlvbjsKICAgICBXZWFrQmxvY2sqIG1fcHJldjsKICAgICBXZWFrQmxvY2sqIG1fbmV4dDsKICAg ICBTd2VlcFJlc3VsdCBtX3N3ZWVwUmVzdWx0OwpAQCAtMTEzLDExICsxMTAsNiBAQCBpbmxpbmUg V2Vha0Jsb2NrOjpTd2VlcFJlc3VsdCBXZWFrQmxvY2s6CiAgICAgcmV0dXJuIHRtcDsKIH0KIAot aW5saW5lIGNvbnN0IFdlYWtCbG9jazo6U3dlZXBSZXN1bHQmIFdlYWtCbG9jazo6c3dlZXBSZXN1 bHQoKQotewotICAgIHJldHVybiBtX3N3ZWVwUmVzdWx0OwotfQotCiBpbmxpbmUgV2Vha0Jsb2Nr OjpGcmVlQ2VsbCogV2Vha0Jsb2NrOjphc0ZyZWVDZWxsKFdlYWtJbXBsKiB3ZWFrSW1wbCkKIHsK ICAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxGcmVlQ2VsbCo+KHdlYWtJbXBsKTsKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1dlYWtTZXQuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1dlYWtTZXQuY3BwCShyZXZpc2lvbiAxMTgyMzgpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9XZWFrU2V0LmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDYsMTYgKzQ2LDE2IEBAIHZvaWQgV2Vha1NldDo6bGFzdENoYW5jZVRvRmluYWxpemUoKQog ICAgICAgICBibG9jay0+bGFzdENoYW5jZVRvRmluYWxpemUoKTsKIH0KIAotdm9pZCBXZWFrU2V0 Ojp2aXNpdExpdmVXZWFrSW1wbHMoSGVhcFJvb3RWaXNpdG9yJiB2aXNpdG9yKQordm9pZCBXZWFr U2V0Ojp2aXNpdChIZWFwUm9vdFZpc2l0b3ImIHZpc2l0b3IpCiB7CiAgICAgZm9yIChXZWFrQmxv Y2sqIGJsb2NrID0gbV9ibG9ja3MuaGVhZCgpOyBibG9jazsgYmxvY2sgPSBibG9jay0+bmV4dCgp KQotICAgICAgICBibG9jay0+dmlzaXRMaXZlV2Vha0ltcGxzKHZpc2l0b3IpOworICAgICAgICBi bG9jay0+dmlzaXQodmlzaXRvcik7CiB9CiAKLXZvaWQgV2Vha1NldDo6dmlzaXREZWFkV2Vha0lt cGxzKEhlYXBSb290VmlzaXRvciYgdmlzaXRvcikKK3ZvaWQgV2Vha1NldDo6cmVhcCgpCiB7CiAg ICAgZm9yIChXZWFrQmxvY2sqIGJsb2NrID0gbV9ibG9ja3MuaGVhZCgpOyBibG9jazsgYmxvY2sg PSBibG9jay0+bmV4dCgpKQotICAgICAgICBibG9jay0+dmlzaXREZWFkV2Vha0ltcGxzKHZpc2l0 b3IpOworICAgICAgICBibG9jay0+cmVhcCgpOwogfQogCiB2b2lkIFdlYWtTZXQ6OnN3ZWVwKCkK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1dlYWtTZXQuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9XZWFrU2V0LmgJKHJldmlzaW9uIDExODIzOCkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1dlYWtTZXQuaAkod29ya2luZyBjb3B5KQpA QCAtMzUsMTUgKzM1LDE1IEBAIGNsYXNzIFdlYWtJbXBsOwogCiBjbGFzcyBXZWFrU2V0IHsKIHB1 YmxpYzoKLSAgICBXZWFrU2V0KEhlYXAqKTsKLSAgICB2b2lkIGxhc3RDaGFuY2VUb0ZpbmFsaXpl KCk7Ci0gICAgfldlYWtTZXQoKTsKLQogICAgIHN0YXRpYyBXZWFrSW1wbCogYWxsb2NhdGUoSlNW YWx1ZSwgV2Vha0hhbmRsZU93bmVyKiA9IDAsIHZvaWQqIGNvbnRleHQgPSAwKTsKICAgICBzdGF0 aWMgdm9pZCBkZWFsbG9jYXRlKFdlYWtJbXBsKik7CiAKLSAgICB2b2lkIHZpc2l0TGl2ZVdlYWtJ bXBscyhIZWFwUm9vdFZpc2l0b3ImKTsKLSAgICB2b2lkIHZpc2l0RGVhZFdlYWtJbXBscyhIZWFw Um9vdFZpc2l0b3ImKTsKKyAgICBXZWFrU2V0KEhlYXAqKTsKKyAgICB+V2Vha1NldCgpOworICAg IHZvaWQgbGFzdENoYW5jZVRvRmluYWxpemUoKTsKKworICAgIHZvaWQgdmlzaXQoSGVhcFJvb3RW aXNpdG9yJik7CisgICAgdm9pZCByZWFwKCk7CiAKICAgICB2b2lkIHN3ZWVwKCk7CiAgICAgdm9p ZCByZXNldEFsbG9jYXRvcigpOwo=