77480 2012-01-31 14:32:50 -0800 Put tiles in a HashMap 2012-01-31 14:47:19 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 546504 0 andersca 2012-01-31 14:32:50 -0800 Put tiles in a HashMap 546506 1 124825 andersca 2012-01-31 14:38:59 -0800 Created attachment 124825 Patch 546521 2 andersca 2012-01-31 14:47:19 -0800 Committed r106397: <http://trac.webkit.org/changeset/106397> 124825 2012-01-31 14:38:59 -0800 2012-01-31 14:40:13 -0800 Patch bug-77480-20120131143918.patch text/plain 7650 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2Mzg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjRmMmEyMzYzYjcyZDY5 ZmYzYjY4MTM5ZDFlZDM1MmE3ZjY0N2Q1NC4uNmMxOGRkOGU4ODZlZjNmYWQ5MWZiNTIwOTY0MzQ4 MDkzOTYxZDFlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3IEBACiAyMDEyLTAxLTMxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgUHV0IHRpbGVzIGlu IGEgSGFzaE1hcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9Nzc0ODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBQdXQgdGlsZXMgaW4gYSBoYXNoIG1hcCBrZXllZCBvZmYgdGhlIHRpbGUgaW5kZXguCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUNhY2hlLmg6CisgICAgICAgIFNo dWZmbGUgbWVtYmVyIHZhcmlhYmxlcyBhcm91bmQgc28gdGhlIG9yZGVyIG1ha2VzIG1vcmUgc2Vu c2UuCisgICAgICAgIEFkZCB0aGUgdGlsZSBtYXAuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9jYS9tYWMvVGlsZUNhY2hlLm1tOgorICAgICAgICAoV2ViQ29yZTo6VGlsZUNhY2hlOjpU aWxlQ2FjaGUpOgorICAgICAgICBVcGRhdGUgbWVtYmVyIGluaXRpYWxpemVycy4KKworICAgICAg ICAoV2ViQ29yZTo6VGlsZUNhY2hlOjpzZXROZWVkc0Rpc3BsYXlJblJlY3QpOgorICAgICAgICBD YWxsIHRpbGVMYXllckF0SW5kZXggaW5zdGVhZCBvZiB0aWxlTGF5ZXJBdFBvc2l0aW9uLgorCisg ICAgICAgIChXZWJDb3JlOjpUaWxlQ2FjaGU6OnNldEFjY2VsZXJhdGVzRHJhd2luZyk6CisgICAg ICAgIChXZWJDb3JlOjpUaWxlQ2FjaGU6OnNldFRpbGVEZWJ1Z0JvcmRlcldpZHRoKToKKyAgICAg ICAgKFdlYkNvcmU6OlRpbGVDYWNoZTo6c2V0VGlsZURlYnVnQm9yZGVyQ29sb3IpOgorICAgICAg ICBJdGVyYXRlIG92ZXIgdGhlIGhhc2ggbWFwIGluc3RlYWQgb2YgdGhlIHN1YmxheWVycy4KKwor ICAgICAgICAoV2ViQ29yZTo6VGlsZUNhY2hlOjpyZXNpemVUaWxlR3JpZCk6CisgICAgICAgIEFk ZCB0aGUgY3JlYXRlZCBsYXllcnMgdG8gdGhlIG1hcC4KKworICAgICAgICAoV2ViQ29yZTo6VGls ZUNhY2hlOjp0aWxlTGF5ZXJBdEluZGV4KToKKyAgICAgICAgUmVuYW1lIGZyb20gdGlsZUxheWVy QXRQb2ludCB0byBiZXR0ZXIgcmVmbGVjdCB0aGF0IHRoaXMgbWVtYmVyIGZ1bmN0aW9uCisgICAg ICAgIHJldHVybnMgYSB0aWxlIGxheWVyIGF0IHRoZSBnaXZlbiBpbmRleCBhbmQgbm90IHRoZSBn aXZlbiBwb2ludC4KKworMjAxMi0wMS0zMSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBw bGUuY29tPgorCiAgICAgICAgIEluZm9ybSB0aGUgdGlsZSBjYWNoZSB3aGVuZXZlciB0aGUgdmlz aWJsZSByZWN0IGNoYW5nZXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTc3NDcwCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhL21hYy9UaWxlQ2FjaGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NhL21hYy9UaWxlQ2FjaGUuaAppbmRleCBkZDk2NzBiNzZjZGIzYjBhZjQ2NjQ3M2RiYWY2 NTljMzQ3NTg3N2QxLi45YmM2Njc2Zjc2ZjJmNGRiNDNjOGQxYzI3NGFhZjU3NmMzOWI2NGEyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUNh Y2hlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVD YWNoZS5oCkBAIC0yNiw3ICsyNiw5IEBACiAjaWZuZGVmIFRpbGVDYWNoZV9oCiAjZGVmaW5lIFRp bGVDYWNoZV9oCiAKKyNpbmNsdWRlICJJbnRQb2ludEhhc2guaCIKICNpbmNsdWRlICJJbnRTaXpl LmgiCisjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUu aD4KICNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIu aD4KQEAgLTY2LDYgKzY4LDggQEAgcHVibGljOgogICAgIHZvaWQgc2V0VGlsZURlYnVnQm9yZGVy Q29sb3IoQ0dDb2xvclJlZik7CiAKIHByaXZhdGU6CisgICAgdHlwZWRlZiBJbnRQb2ludCBUaWxl SW5kZXg7CisKICAgICBUaWxlQ2FjaGUoV2ViVGlsZUNhY2hlTGF5ZXIqLCBjb25zdCBJbnRTaXpl JiB0aWxlU2l6ZSk7CiAKICAgICBGbG9hdFJlY3QgdmlzaWJsZVJlY3QoKSBjb25zdDsKQEAgLTc2 LDIzICs4MCwyNSBAQCBwcml2YXRlOgogICAgIEludFNpemUgbnVtVGlsZXNGb3JHcmlkU2l6ZShj b25zdCBJbnRTaXplJikgY29uc3Q7CiAgICAgdm9pZCByZXNpemVUaWxlR3JpZChjb25zdCBJbnRT aXplJiBudW1UaWxlcyk7CiAKLSAgICBXZWJUaWxlTGF5ZXIqIHRpbGVMYXllckF0UG9zaXRpb24o Y29uc3QgSW50UG9pbnQmKSBjb25zdDsKKyAgICBXZWJUaWxlTGF5ZXIqIHRpbGVMYXllckF0SW5k ZXgoY29uc3QgVGlsZUluZGV4JikgY29uc3Q7CiAgICAgUmV0YWluUHRyPFdlYlRpbGVMYXllcj4g Y3JlYXRlVGlsZUxheWVyKCk7CiAKICAgICBib29sIHNob3VsZFNob3dSZXBhaW50Q291bnRlcnMo KSBjb25zdDsKIAogICAgIFdlYlRpbGVDYWNoZUxheWVyKiBtX3RpbGVDYWNoZUxheWVyOwotICAg IGNvbnN0IEludFNpemUgbV90aWxlU2l6ZTsKLQogICAgIFJldGFpblB0cjxDQUxheWVyPiBtX3Rp bGVDb250YWluZXJMYXllcjsKLQotICAgIFJldGFpblB0cjxDR0NvbG9yUmVmPiBtX3RpbGVEZWJ1 Z0JvcmRlckNvbG9yOwotICAgIGZsb2F0IG1fdGlsZURlYnVnQm9yZGVyV2lkdGg7CisgICAgY29u c3QgSW50U2l6ZSBtX3RpbGVTaXplOwogCiAgICAgLy8gTnVtYmVyIG9mIHRpbGVzIGluIGVhY2gg ZGltZW5zaW9uLgogICAgIEludFNpemUgbV9udW1UaWxlc0luR3JpZDsKIAorICAgIHR5cGVkZWYg SGFzaE1hcDxUaWxlSW5kZXgsIFJldGFpblB0cjxXZWJUaWxlTGF5ZXI+ID4gVGlsZU1hcDsKKyAg ICBUaWxlTWFwIG1fdGlsZXM7CisKICAgICBib29sIG1fYWNjZWxlcmF0ZXNEcmF3aW5nOworCisg ICAgUmV0YWluUHRyPENHQ29sb3JSZWY+IG1fdGlsZURlYnVnQm9yZGVyQ29sb3I7CisgICAgZmxv YXQgbV90aWxlRGVidWdCb3JkZXJXaWR0aDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxl Q2FjaGUubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUNh Y2hlLm1tCmluZGV4IGU5ODdjZWQyOTdmYjU5MWRhYzlhYTI3MjU0YTQ2NGJhMmMzMmE2NzguLjQx MjBiMjljZmMwNTk4MDhkMTM0NzdhYzg4ZGFkZmM2MGNiNGFlNzYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ2FjaGUubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVDYWNoZS5tbQpAQCAtNTAs MTAgKzUwLDEwIEBAIFBhc3NPd25QdHI8VGlsZUNhY2hlPiBUaWxlQ2FjaGU6OmNyZWF0ZShXZWJU aWxlQ2FjaGVMYXllciogdGlsZUNhY2hlTGF5ZXIsIGNvbnN0CiAKIFRpbGVDYWNoZTo6VGlsZUNh Y2hlKFdlYlRpbGVDYWNoZUxheWVyKiB0aWxlQ2FjaGVMYXllciwgY29uc3QgSW50U2l6ZSYgdGls ZVNpemUpCiAgICAgOiBtX3RpbGVDYWNoZUxheWVyKHRpbGVDYWNoZUxheWVyKQotICAgICwgbV90 aWxlU2l6ZSh0aWxlU2l6ZSkKICAgICAsIG1fdGlsZUNvbnRhaW5lckxheWVyKGFkb3B0Q0YoW1tD QUxheWVyIGFsbG9jXSBpbml0XSkpCi0gICAgLCBtX3RpbGVEZWJ1Z0JvcmRlcldpZHRoKDApCisg ICAgLCBtX3RpbGVTaXplKHRpbGVTaXplKQogICAgICwgbV9hY2NlbGVyYXRlc0RyYXdpbmcoZmFs c2UpCisgICAgLCBtX3RpbGVEZWJ1Z0JvcmRlcldpZHRoKDApCiB7CiAgICAgW0NBVHJhbnNhY3Rp b24gYmVnaW5dOwogICAgIFtDQVRyYW5zYWN0aW9uIHNldERpc2FibGVBY3Rpb25zOllFU107CkBA IC04Nyw3ICs4Nyw3IEBAIHZvaWQgVGlsZUNhY2hlOjpzZXROZWVkc0Rpc3BsYXlJblJlY3QoY29u c3QgSW50UmVjdCYgcmVjdCkKIAogICAgIGZvciAoaW50IHkgPSB0b3BMZWZ0LnkoKTsgeSA8PSBi b3R0b21SaWdodC55KCk7ICsreSkgewogICAgICAgICBmb3IgKGludCB4ID0gdG9wTGVmdC54KCk7 IHggPD0gYm90dG9tUmlnaHQueCgpOyArK3gpIHsKLSAgICAgICAgICAgIFdlYlRpbGVMYXllciog dGlsZUxheWVyID0gdGlsZUxheWVyQXRQb3NpdGlvbihJbnRQb2ludCh4LCB5KSk7CisgICAgICAg ICAgICBXZWJUaWxlTGF5ZXIqIHRpbGVMYXllciA9IHRpbGVMYXllckF0SW5kZXgoSW50UG9pbnQo eCwgeSkpOwogCiAgICAgICAgICAgICBDR1JlY3QgdGlsZVJlY3QgPSBbbV90aWxlQ2FjaGVMYXll ciBjb252ZXJ0UmVjdDpyZWN0IHRvTGF5ZXI6dGlsZUxheWVyXTsKIApAQCAtMTU4LDggKzE1OCw4 IEBAIHZvaWQgVGlsZUNhY2hlOjpzZXRBY2NlbGVyYXRlc0RyYXdpbmcoYm9vbCBhY2NlbGVyYXRl c0RyYXdpbmcpCiAKICAgICBtX2FjY2VsZXJhdGVzRHJhd2luZyA9IGFjY2VsZXJhdGVzRHJhd2lu ZzsKIAotICAgIGZvciAoV2ViVGlsZUxheWVyKiB0aWxlTGF5ZXIgaW4gW21fdGlsZUNvbnRhaW5l ckxheWVyLmdldCgpIHN1YmxheWVyc10pCi0gICAgICAgIFt0aWxlTGF5ZXIgc2V0QWNjZWxlcmF0 ZXNEcmF3aW5nOm1fYWNjZWxlcmF0ZXNEcmF3aW5nXTsKKyAgICBmb3IgKFRpbGVNYXA6OmNvbnN0 X2l0ZXJhdG9yIGl0ID0gbV90aWxlcy5iZWdpbigpLCBlbmQgPSBtX3RpbGVzLmVuZCgpOyBpdCAh PSBlbmQ7ICsraXQpCisgICAgICAgIFtpdC0+c2Vjb25kLmdldCgpIHNldEFjY2VsZXJhdGVzRHJh d2luZzptX2FjY2VsZXJhdGVzRHJhd2luZ107CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShhY2Nl bGVyYXRlc0RyYXdpbmcpOwogI2VuZGlmCkBAIC0xNzYsOCArMTc2LDggQEAgdm9pZCBUaWxlQ2Fj aGU6OnNldFRpbGVEZWJ1Z0JvcmRlcldpZHRoKGZsb2F0IGJvcmRlcldpZHRoKQogICAgICAgICBy ZXR1cm47CiAKICAgICBtX3RpbGVEZWJ1Z0JvcmRlcldpZHRoID0gYm9yZGVyV2lkdGg7Ci0gICAg Zm9yIChXZWJUaWxlTGF5ZXIqIHRpbGVMYXllciBpbiBbbV90aWxlQ29udGFpbmVyTGF5ZXIuZ2V0 KCkgc3VibGF5ZXJzXSkKLSAgICAgICAgW3RpbGVMYXllciBzZXRCb3JkZXJXaWR0aDptX3RpbGVE ZWJ1Z0JvcmRlcldpZHRoXTsKKyAgICBmb3IgKFRpbGVNYXA6OmNvbnN0X2l0ZXJhdG9yIGl0ID0g bV90aWxlcy5iZWdpbigpLCBlbmQgPSBtX3RpbGVzLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpCisg ICAgICAgIFtpdC0+c2Vjb25kLmdldCgpIHNldEJvcmRlcldpZHRoOm1fdGlsZURlYnVnQm9yZGVy V2lkdGhdOwogfQogCiB2b2lkIFRpbGVDYWNoZTo6c2V0VGlsZURlYnVnQm9yZGVyQ29sb3IoQ0dD b2xvclJlZiBib3JkZXJDb2xvcikKQEAgLTE4Niw4ICsxODYsOCBAQCB2b2lkIFRpbGVDYWNoZTo6 c2V0VGlsZURlYnVnQm9yZGVyQ29sb3IoQ0dDb2xvclJlZiBib3JkZXJDb2xvcikKICAgICAgICAg cmV0dXJuOwogCiAgICAgbV90aWxlRGVidWdCb3JkZXJDb2xvciA9IGJvcmRlckNvbG9yOwotICAg IGZvciAoV2ViVGlsZUxheWVyKiB0aWxlTGF5ZXIgaW4gW21fdGlsZUNvbnRhaW5lckxheWVyLmdl dCgpIHN1YmxheWVyc10pCi0gICAgICAgIFt0aWxlTGF5ZXIgc2V0Qm9yZGVyQ29sb3I6bV90aWxl RGVidWdCb3JkZXJDb2xvci5nZXQoKV07CisgICAgZm9yIChUaWxlTWFwOjpjb25zdF9pdGVyYXRv ciBpdCA9IG1fdGlsZXMuYmVnaW4oKSwgZW5kID0gbV90aWxlcy5lbmQoKTsgaXQgIT0gZW5kOyAr K2l0KQorICAgICAgICBbaXQtPnNlY29uZC5nZXQoKSBzZXRCb3JkZXJDb2xvcjptX3RpbGVEZWJ1 Z0JvcmRlckNvbG9yLmdldCgpXTsKIH0KIAogRmxvYXRSZWN0IFRpbGVDYWNoZTo6dmlzaWJsZVJl Y3QoKSBjb25zdApAQCAtMjQ1LDEwICsyNDUsMTEgQEAgdm9pZCBUaWxlQ2FjaGU6OnJlc2l6ZVRp bGVHcmlkKGNvbnN0IEludFNpemUmIG51bVRpbGVzSW5HcmlkKQogICAgICAgICAgICAgUmV0YWlu UHRyPFdlYlRpbGVMYXllcj4gdGlsZUxheWVyOwogCiAgICAgICAgICAgICBpZiAoeCA8IG1fbnVt VGlsZXNJbkdyaWQud2lkdGgoKSAmJiB5IDwgbV9udW1UaWxlc0luR3JpZC5oZWlnaHQoKSkgewot ICAgICAgICAgICAgICAgIC8vIFdlIGNhbiByZXVzZSB0aGUgdGlsZSBsYXllciBhdCB0aGlzIHBv c2l0aW9uLgotICAgICAgICAgICAgICAgIHRpbGVMYXllciA9IHRpbGVMYXllckF0UG9zaXRpb24o SW50UG9pbnQoeCwgeSkpOworICAgICAgICAgICAgICAgIC8vIFdlIGNhbiByZXVzZSB0aGUgdGls ZSBsYXllciBhdCB0aGlzIGluZGV4LgorICAgICAgICAgICAgICAgIHRpbGVMYXllciA9IHRpbGVM YXllckF0SW5kZXgoSW50UG9pbnQoeCwgeSkpOwogICAgICAgICAgICAgfSBlbHNlIHsKICAgICAg ICAgICAgICAgICB0aWxlTGF5ZXIgPSBjcmVhdGVUaWxlTGF5ZXIoKTsKKyAgICAgICAgICAgICAg ICBtX3RpbGVzLnNldChJbnRQb2ludCh4LCB5KSwgdGlsZUxheWVyLmdldCgpKTsKICAgICAgICAg ICAgIH0KIAogICAgICAgICAgICAgW3RpbGVMYXllci5nZXQoKSBzZXRQb3NpdGlvbjpDR1BvaW50 TWFrZSh4ICogbV90aWxlU2l6ZS53aWR0aCgpLCB5ICogbV90aWxlU2l6ZS5oZWlnaHQoKSldOwpA QCAtMjYzLDE0ICsyNjQsMTQgQEAgdm9pZCBUaWxlQ2FjaGU6OnJlc2l6ZVRpbGVHcmlkKGNvbnN0 IEludFNpemUmIG51bVRpbGVzSW5HcmlkKQogICAgIFtDQVRyYW5zYWN0aW9uIGNvbW1pdF07CiB9 CiAKLVdlYlRpbGVMYXllciogVGlsZUNhY2hlOjp0aWxlTGF5ZXJBdFBvc2l0aW9uKGNvbnN0IElu dFBvaW50JiBwb2ludCkgY29uc3QKK1dlYlRpbGVMYXllciogVGlsZUNhY2hlOjp0aWxlTGF5ZXJB dEluZGV4KGNvbnN0IFRpbGVJbmRleCYgaW5kZXgpIGNvbnN0CiB7Ci0gICAgQVNTRVJUKHBvaW50 LngoKSA+PSAwKTsKLSAgICBBU1NFUlQocG9pbnQueCgpIDw9IG1fbnVtVGlsZXNJbkdyaWQud2lk dGgoKSk7Ci0gICAgQVNTRVJUKHBvaW50LnkoKSA+PSAwKTsKLSAgICBBU1NFUlQocG9pbnQueSgp IDw9IG1fbnVtVGlsZXNJbkdyaWQuaGVpZ2h0KCkpOworICAgIEFTU0VSVChpbmRleC54KCkgPj0g MCk7CisgICAgQVNTRVJUKGluZGV4LngoKSA8PSBtX251bVRpbGVzSW5HcmlkLndpZHRoKCkpOwor ICAgIEFTU0VSVChpbmRleC55KCkgPj0gMCk7CisgICAgQVNTRVJUKGluZGV4LnkoKSA8PSBtX251 bVRpbGVzSW5HcmlkLmhlaWdodCgpKTsKIAotICAgIHJldHVybiBbW21fdGlsZUNvbnRhaW5lckxh eWVyLmdldCgpIHN1YmxheWVyc10gb2JqZWN0QXRJbmRleDpwb2ludC55KCkgKiBtX251bVRpbGVz SW5HcmlkLndpZHRoKCkgKyBwb2ludC54KCldOworICAgIHJldHVybiBtX3RpbGVzLmdldChpbmRl eCkuZ2V0KCk7CiB9CiAKIFJldGFpblB0cjxXZWJUaWxlTGF5ZXI+IFRpbGVDYWNoZTo6Y3JlYXRl VGlsZUxheWVyKCkK