121964 2013-09-26 10:39:55 -0700 WeakGCMap should not inherit from HashMap 2013-09-26 10:59:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 933582 0 andersca 2013-09-26 10:39:55 -0700 WeakGCMap should not inherit from HashMap 933584 1 212723 andersca 2013-09-26 10:43:17 -0700 Created attachment 212723 Patch 933591 2 212723 ggaren 2013-09-26 10:53:27 -0700 Comment on attachment 212723 Patch r=me 933594 3 andersca 2013-09-26 10:59:06 -0700 Committed r156476: <http://trac.webkit.org/changeset/156476> 212723 2013-09-26 10:43:17 -0700 2013-09-26 10:53:27 -0700 Patch bug-121964-20130926104316.patch text/plain 4927 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2NDY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAx ZjRmNGVlMjJiYTU1NmNjNzZkYjdiMzZhNmM5YmIxMzY1ZGIzYmMxLi45NmU2MDJkNWFiMjNjOGZh ZDRlYzdmZjlmNjU2NzFkNWJmYjY3MWIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxNiBAQAogMjAxMy0wOS0yNiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgogCisgICAgICAgIFdlYWtHQ01hcCBzaG91bGQgbm90IGluaGVyaXQgZnJvbSBIYXNoTWFw CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjE5NjQK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGhl IEhhc2hNYXAgYXMgYSBtZW1iZXIgdmFyaWFibGUgaW5zdGVhZCBhbmQgaW1wbGVtZW50IHRoZSBt aXNzaW5nIG1lbWJlciBmdW5jdGlvbnMuCisKKyAgICAgICAgKiBydW50aW1lL1dlYWtHQ01hcC5o OgorCisyMDEzLTA5LTI2ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisK ICAgICAgICAgV2VhayBzaG91bGQgaGF2ZSBhIG1vdmUgY29uc3RydWN0b3IgYW5kIG1vdmUgYXNz aWdubWVudCBvcGVyYXRvcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTIxOTYzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL1dlYWtHQ01hcC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2Vha0dDTWFw LmgKaW5kZXggZjc0MWZhNGM0YzNlMGZhNjBhNTE1NGE4NzNmYzg2MjRlZGZkZTA2MC4uMjNmODg4 YjA1N2U0MTgzMmQ1OGQyMTc5ZGI0ZjJlNTk3YmRkYzY0NyAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvV2Vha0dDTWFwLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvV2Vha0dDTWFwLmgKQEAgLTM1LDM5ICszNSwzOSBAQCBuYW1lc3BhY2UgSlND IHsKIC8vIEEgSGFzaE1hcCB3aXRoIFdlYWs8SlNDZWxsPiB2YWx1ZXMsIHdoaWNoIGF1dG9tYXRp Y2FsbHkgcmVtb3ZlcyB2YWx1ZXMgb25jZSB0aGV5J3JlIGdhcmJhZ2UgY29sbGVjdGVkLgogCiB0 ZW1wbGF0ZTx0eXBlbmFtZSBLZXlBcmcsIHR5cGVuYW1lIFJhd01hcHBlZEFyZywgdHlwZW5hbWUg SGFzaEFyZyA9IHR5cGVuYW1lIERlZmF1bHRIYXNoPEtleUFyZz46Okhhc2gsCi0gICAgdHlwZW5h bWUgS2V5VHJhaXRzQXJnID0gSGFzaFRyYWl0czxLZXlBcmc+ID4KLWNsYXNzIFdlYWtHQ01hcCA6 IHB1YmxpYyBIYXNoTWFwPEtleUFyZywgV2VhazxSYXdNYXBwZWRBcmc+LCBIYXNoQXJnLCBLZXlU cmFpdHNBcmc+IHsKKyAgICB0eXBlbmFtZSBLZXlUcmFpdHNBcmcgPSBIYXNoVHJhaXRzPEtleUFy Zz4+CitjbGFzcyBXZWFrR0NNYXAgewogICAgIHR5cGVkZWYgV2VhazxSYXdNYXBwZWRBcmc+IE1h cHBlZFR5cGU7Ci0gICAgdHlwZWRlZiBIYXNoTWFwPEtleUFyZywgTWFwcGVkVHlwZSwgSGFzaEFy ZywgS2V5VHJhaXRzQXJnPiBCYXNlOwotICAgIHR5cGVkZWYgV2Vha0dDTWFwPEtleUFyZywgUmF3 TWFwcGVkQXJnLCBIYXNoQXJnLCBLZXlUcmFpdHNBcmc+IFNlbGY7CisgICAgdHlwZWRlZiBIYXNo TWFwPEtleUFyZywgTWFwcGVkVHlwZSwgSGFzaEFyZywgS2V5VHJhaXRzQXJnPiBIYXNoTWFwVHlw ZTsKICAgICB0eXBlZGVmIEhhc2hUcmFpdHM8TWFwcGVkVHlwZT4gTWFwcGVkVHJhaXRzOwogICAg IHR5cGVkZWYgdHlwZW5hbWUgTWFwcGVkVHJhaXRzOjpQYXNzSW5UeXBlIE1hcHBlZFBhc3NJblR5 cGU7CiAKIHB1YmxpYzoKLSAgICB0eXBlZGVmIHR5cGVuYW1lIEJhc2U6OktleVR5cGUgS2V5VHlw ZTsKLSAgICB0eXBlZGVmIHR5cGVuYW1lIEJhc2U6OkFkZFJlc3VsdCBBZGRSZXN1bHQ7Ci0gICAg dHlwZWRlZiB0eXBlbmFtZSBCYXNlOjppdGVyYXRvciBpdGVyYXRvcjsKLSAgICB0eXBlZGVmIHR5 cGVuYW1lIEJhc2U6OmNvbnN0X2l0ZXJhdG9yIGNvbnN0X2l0ZXJhdG9yOwotICAgIHVzaW5nIEJh c2U6OmJlZ2luOwotICAgIHVzaW5nIEJhc2U6OmVuZDsKLSAgICB1c2luZyBCYXNlOjpzaXplOwot ICAgIHVzaW5nIEJhc2U6OnJlbW92ZTsKKyAgICB0eXBlZGVmIHR5cGVuYW1lIEhhc2hNYXBUeXBl OjpLZXlUeXBlIEtleVR5cGU7CisgICAgdHlwZWRlZiB0eXBlbmFtZSBIYXNoTWFwVHlwZTo6QWRk UmVzdWx0IEFkZFJlc3VsdDsKKyAgICB0eXBlZGVmIHR5cGVuYW1lIEhhc2hNYXBUeXBlOjppdGVy YXRvciBpdGVyYXRvcjsKKyAgICB0eXBlZGVmIHR5cGVuYW1lIEhhc2hNYXBUeXBlOjpjb25zdF9p dGVyYXRvciBjb25zdF9pdGVyYXRvcjsKIAogICAgIFdlYWtHQ01hcCgpCiAgICAgICAgIDogbV9n Y1RocmVzaG9sZChtaW5HQ1RocmVzaG9sZCkKICAgICB7CiAgICAgfQogCisgICAgUmF3TWFwcGVk QXJnKiBnZXQoY29uc3QgS2V5VHlwZSYga2V5KSBjb25zdAorICAgIHsKKyAgICAgICAgcmV0dXJu IG1fbWFwLmdldChrZXkpOworICAgIH0KKwogICAgIEFkZFJlc3VsdCBzZXQoY29uc3QgS2V5VHlw ZSYga2V5LCBNYXBwZWRQYXNzSW5UeXBlIHZhbHVlKQogICAgIHsKICAgICAgICAgZ2NNYXBJZk5l ZWRlZCgpOwotICAgICAgICByZXR1cm4gQmFzZTo6c2V0KGtleSwgdmFsdWUpOworICAgICAgICBy ZXR1cm4gbV9tYXAuc2V0KGtleSwgdmFsdWUpOwogICAgIH0KIAogICAgIEFkZFJlc3VsdCBhZGQo Y29uc3QgS2V5VHlwZSYga2V5LCBNYXBwZWRQYXNzSW5UeXBlIHZhbHVlKQogICAgIHsKICAgICAg ICAgZ2NNYXBJZk5lZWRlZCgpOwotICAgICAgICBBZGRSZXN1bHQgYWRkUmVzdWx0ID0gQmFzZTo6 YWRkKGtleSwgbnVsbHB0cik7CisgICAgICAgIEFkZFJlc3VsdCBhZGRSZXN1bHQgPSBtX21hcC5h ZGQoa2V5LCBudWxscHRyKTsKICAgICAgICAgaWYgKCFhZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVl KSB7IC8vIE5ldyB2YWx1ZSBvciBmb3VuZCBhIHpvbWJpZSB2YWx1ZS4KICAgICAgICAgICAgIGFk ZFJlc3VsdC5pc05ld0VudHJ5ID0gdHJ1ZTsKICAgICAgICAgICAgIGFkZFJlc3VsdC5pdGVyYXRv ci0+dmFsdWUgPSB2YWx1ZTsKQEAgLTc1LDEwICs3NSwyMCBAQCBwdWJsaWM6CiAgICAgICAgIHJl dHVybiBhZGRSZXN1bHQ7CiAgICAgfQogCisgICAgYm9vbCByZW1vdmUoY29uc3QgS2V5VHlwZSYg a2V5KQorICAgIHsKKyAgICAgICAgcmV0dXJuIG1fbWFwLnJlbW92ZShrZXkpOworICAgIH0KKwor ICAgIHZvaWQgY2xlYXIoKQorICAgIHsKKyAgICAgICAgbV9tYXAuY2xlYXIoKTsKKyAgICB9CisK ICAgICBpdGVyYXRvciBmaW5kKGNvbnN0IEtleVR5cGUmIGtleSkKICAgICB7Ci0gICAgICAgIGl0 ZXJhdG9yIGl0ID0gQmFzZTo6ZmluZChrZXkpOwotICAgICAgICBpdGVyYXRvciBlbmQgPSBCYXNl OjplbmQoKTsKKyAgICAgICAgaXRlcmF0b3IgaXQgPSBtX21hcC5maW5kKGtleSk7CisgICAgICAg IGl0ZXJhdG9yIGVuZCA9IG1fbWFwLmVuZCgpOwogICAgICAgICBpZiAoaXQgIT0gZW5kICYmICFp dC0+dmFsdWUpIC8vIEZvdW5kIGEgem9tYmllIHZhbHVlLgogICAgICAgICAgICAgcmV0dXJuIGVu ZDsKICAgICAgICAgcmV0dXJuIGl0OwpAQCAtODYsMTIgKzk2LDEyIEBAIHB1YmxpYzoKIAogICAg IGNvbnN0X2l0ZXJhdG9yIGZpbmQoY29uc3QgS2V5VHlwZSYga2V5KSBjb25zdAogICAgIHsKLSAg ICAgICAgcmV0dXJuIGNvbnN0X2Nhc3Q8U2VsZio+KHRoaXMpLT5maW5kKGtleSk7CisgICAgICAg IHJldHVybiBjb25zdF9jYXN0PFdlYWtHQ01hcCo+KHRoaXMpLT5maW5kKGtleSk7CiAgICAgfQog CiAgICAgYm9vbCBjb250YWlucyhjb25zdCBLZXlUeXBlJiBrZXkpIGNvbnN0CiAgICAgewotICAg ICAgICByZXR1cm4gZmluZChrZXkpICE9IGVuZCgpOworICAgICAgICByZXR1cm4gZmluZChrZXkp ICE9IG1fbWFwLmVuZCgpOwogICAgIH0KIAogcHJpdmF0ZToKQEAgLTEwMCwyNCArMTEwLDI2IEBA IHByaXZhdGU6CiAgICAgdm9pZCBnY01hcCgpCiAgICAgewogICAgICAgICBWZWN0b3I8S2V5VHlw ZSwgND4gem9tYmllczsKLSAgICAgICAgaXRlcmF0b3IgZW5kID0gdGhpcy0+ZW5kKCk7Ci0gICAg ICAgIGZvciAoaXRlcmF0b3IgaXQgPSBiZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKKworICAg ICAgICBmb3IgKGl0ZXJhdG9yIGl0ID0gbV9tYXAuYmVnaW4oKSwgZW5kID0gbV9tYXAuZW5kKCk7 IGl0ICE9IGVuZDsgKytpdCkgewogICAgICAgICAgICAgaWYgKCFpdC0+dmFsdWUpCiAgICAgICAg ICAgICAgICAgem9tYmllcy5hcHBlbmQoaXQtPmtleSk7CiAgICAgICAgIH0KKwogICAgICAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IHpvbWJpZXMuc2l6ZSgpOyArK2kpCi0gICAgICAgICAgICBy ZW1vdmUoem9tYmllc1tpXSk7CisgICAgICAgICAgICBtX21hcC5yZW1vdmUoem9tYmllc1tpXSk7 CiAgICAgfQogCiAgICAgdm9pZCBnY01hcElmTmVlZGVkKCkKICAgICB7Ci0gICAgICAgIGlmIChz aXplKCkgPCBtX2djVGhyZXNob2xkKQorICAgICAgICBpZiAobV9tYXAuc2l6ZSgpIDwgbV9nY1Ro cmVzaG9sZCkKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBnY01hcCgpOwotICAgICAg ICBtX2djVGhyZXNob2xkID0gc3RkOjptYXgobWluR0NUaHJlc2hvbGQsIHNpemUoKSAqIDIgLSAx KTsKKyAgICAgICAgbV9nY1RocmVzaG9sZCA9IHN0ZDo6bWF4KG1pbkdDVGhyZXNob2xkLCBtX21h cC5zaXplKCkgKiAyIC0gMSk7CiAgICAgfQogCisgICAgSGFzaE1hcFR5cGUgbV9tYXA7CiAgICAg aW50IG1fZ2NUaHJlc2hvbGQ7CiB9OwogCg==