110042 2013-02-16 16:52:11 -0800 Make a few style tweaks to StringHasher.h 2013-02-18 17:46:42 -0800 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 darin darin benjamin cmarcelo ojan.autocc webkit.review.bot oldest_to_newest 834895 0 darin 2013-02-16 16:52:11 -0800 Reduce use of abbreviations in StringHasher.h 834900 1 188744 darin 2013-02-16 17:11:26 -0800 Created attachment 188744 Patch 835024 2 188744 ap 2013-02-17 13:07:54 -0800 Comment on attachment 188744 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188744&action=review > Source/WTF/wtf/StringHasher.h:210 > + // FIXME: Why does this function use the version of the hash that drops the top 8 bits? I don't really know the answer, but it's probably somewhere between these two comments in this file: // Reserving space from the high bits for flags preserves most of the hash's // value, since hash lookup typically masks out the high bits anyway. and // NOTE: This class must stay in sync with the create_hash_table script in // JavaScriptCore and the CodeGeneratorJS.pm script in WebCore. I also suspect that these reasons don't apply to callers of hashMemory, and this behavior is a result of a series of careless past refactorings. 835858 3 darin 2013-02-18 17:46:42 -0800 Committed r143280: <http://trac.webkit.org/changeset/143280> 188744 2013-02-16 17:11:26 -0800 2013-02-17 13:07:53 -0800 Patch bug-110042-20130216170751.patch text/plain 6514 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDFkYWI5MzE0MjUwZjZlNmEzMWU3OWIw YTY3NmM4ZDFkNzViOTk5ZWQuLmUxMDE4YTZiNDJjODZkZTZhZGUwNGFiMzVmY2JhYzdlNzJhMjI0 ZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMjkgQEAKIDIwMTMtMDItMTYgIERhcmluIEFkbGVyICA8ZGFyaW5A YXBwbGUuY29tPgogCisgICAgICAgIFN0eWxlIHR3ZWFrcyB0byBTdHJpbmdIYXNoZXIuaAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMDQyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSSBoYXZlIGEgYnVn IGZpeCBjb21pbmcgc29vbiwgYnV0IGZpZ3VyZWQgSSdkIHNlcGFyYXRlIG91dCBzdHlsZSB0d2Vh a3MgYW5kIGxhbmQgdGhlbQorICAgICAgICBmaXJzdCB0byBtYWtlIHRoYXQgcGF0Y2ggZWFzaWVy IHRvIHVuZHJlc3RhbmQuCisKKyAgICAgICAgKiB3dGYvU3RyaW5nSGFzaGVyLmg6IFR3ZWFrIGFu ZCByZWFycmFuZ2UgY29tbWVudHMgYSBiaXQuCisgICAgICAgIChXVEY6OlN0cmluZ0hhc2hlcjo6 YWRkQ2hhcmFjdGVyKTogVXNlIGNoYXJhY3RlciBpbnN0ZWFkIG9mIGNoLgorICAgICAgICAoV1RG OjpTdHJpbmdIYXNoZXI6OmFkZENoYXJhY3RlcnMpOiBVc2UgcmVtYWluZGVyIGluc3RlYWQgb2Yg cmVtLiBBbHNvIGNhcGl0YWxpemUgdGhlIFUKKyAgICAgICAgdGhhdCB3ZSB1c2UgdG8gbWFrZSBh biB1bnNpZ25lZCAxIGNvbnN0YW50LgorICAgICAgICAoV1RGOjpTdHJpbmdIYXNoZXI6OmNvbXB1 dGVIYXNoQW5kTWFza1RvcDhCaXRzKTogRGl0dG8uCisgICAgICAgIChXVEY6OlN0cmluZ0hhc2hl cjo6aGFzaE1lbW9yeSk6IENoYW5nZSB2ZXJzaW9uIHRoYXQgdGFrZXMgc2l6ZSBhcyBhIHRlbXBs YXRlIGFyZ3VtZW50CisgICAgICAgIHRvIGNhbGwgdGhlIHZlcnNpb24gdGhhdCB0YWtlcyB0aGUg c2l6ZSBhdCBydW50aW1lLCBzaW5jZSBib3RoIGdlbmVyYXRlIHRoZSBzYW1lIGNvZGUKKyAgICAg ICAgYW55d2F5LiBBZGRlZCBhIEZJWE1FIHF1ZXN0aW9uaW5nIHdoeSB0aGlzIGZ1bmN0aW9uIHVz ZXMgdGhlICJtYXNrIHRvcCA4IGJpdHMiIHZlcnNpb24KKyAgICAgICAgb2YgdGhlIGhhc2guIEZp eCBpbmNvcnJlY3QgY29tcGlsZSBhc3NlcnRpb24gdGhhdCByZXF1aXJlZCBzaXplcyB0aGF0IGFy ZSBtdWx0aXBsZXMKKyAgICAgICAgb2YgZm91ci4gVGhpcyBmdW5jdGlvbiB3b3JrcyBvbiBzaXpl cyB0aGF0IGFyZSBtdWx0aXBsZXMgb2YgdHdvLiBBbHNvIGZpeGVkIGEgc3BlbGxpbmcKKyAgICAg ICAgZXJyb3Igd2hlcmUgd2UgY2FsbGVkIGl0IGEgIm11bHRpYmxlIi4KKyAgICAgICAgKFdURjo6 U3RyaW5nSGFzaGVyOjpkZWZhdWx0Q29udmVydGVyKTogVXNlIGNoYXJhY3RlciBpbnN0ZWFkIG9m IGNoLgorICAgICAgICAoV1RGOjpTdHJpbmdIYXNoZXI6OmFkZENoYXJhY3RlcnNUb0hhc2gpOiBF bGltaW5hdGVkIHVubmVjZXNzYXJ5IGxvY2FsIHZhcmlhYmxlLgorCisyMDEzLTAyLTE2ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKwogICAgICAgICBSZW1vdmUgcmVkdW5kYW50IHVz ZSBvZiBpbmxpbmUga2V5d29yZCBpbiBTdHJpbmdIYXNoZXIuaAogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMDM2CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XVEYvd3RmL1N0cmluZ0hhc2hlci5oIGIvU291cmNlL1dURi93dGYvU3RyaW5nSGFzaGVyLmgK aW5kZXggOTJmNmZjM2NkNzg0OGViOGE5MzEwZGQ4N2VkNmVhYTk5YjVmYmQ4MC4uZTk5NzRjZjFh MjdjYjMwNDE2ZjVjNjlhNTMzZWU0ZGRiZTY4MjAxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93 dGYvU3RyaW5nSGFzaGVyLmgKKysrIGIvU291cmNlL1dURi93dGYvU3RyaW5nSGFzaGVyLmgKQEAg LTE4LDYgKzE4LDcgQEAKICAqIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgogICoKICAqLwor CiAjaWZuZGVmIFdURl9TdHJpbmdIYXNoZXJfaAogI2RlZmluZSBXVEZfU3RyaW5nSGFzaGVyX2gK IApAQCAtMjUsMTUgKzI2LDE3IEBACiAKIG5hbWVzcGFjZSBXVEYgewogCi0vLyBHb2xkZW4gcmF0 aW8gLSBhcmJpdHJhcnkgc3RhcnQgdmFsdWUgdG8gYXZvaWQgbWFwcGluZyBhbGwgMCdzIHRvIGFs bCAwJ3MKLXN0YXRpYyBjb25zdCB1bnNpZ25lZCBzdHJpbmdIYXNoaW5nU3RhcnRWYWx1ZSA9IDB4 OWUzNzc5YjlVOwotCiAvLyBQYXVsIEhzaWVoJ3MgU3VwZXJGYXN0SGFzaAogLy8gaHR0cDovL3d3 dy5hemlsbGlvbm1vbmtleXMuY29tL3FlZC9oYXNoLmh0bWwKLS8vIGNoYXIqIGRhdGEgaXMgaW50 ZXJwcmV0ZWQgYXMgbGF0aW4tZW5jb2RlZCAoemVybyBleHRlbmRlZCB0byAxNiBiaXRzKS4KIAot Ly8gTk9URTogVGhpcyBjbGFzcyBtdXN0IHN0YXkgaW4gc3luYyB3aXRoIHRoZSBjcmVhdGVfaGFz aF90YWJsZSBzY3JpcHQgaW4KKy8vIExDaGFyIGRhdGEgaXMgaW50ZXJwcmV0ZWQgYXMgTGF0aW4t MS1lbmNvZGVkICh6ZXJvIGV4dGVuZGVkIHRvIDE2IGJpdHMpLgorCisvLyBOT1RFOiBUaGUgaGFz aCBjb21wdXRhdGlvbiBoZXJlIG11c3Qgc3RheSBpbiBzeW5jIHdpdGggdGhlIGNyZWF0ZV9oYXNo X3RhYmxlIHNjcmlwdCBpbgogLy8gSmF2YVNjcmlwdENvcmUgYW5kIHRoZSBDb2RlR2VuZXJhdG9y SlMucG0gc2NyaXB0IGluIFdlYkNvcmUuCisKKy8vIEdvbGRlbiByYXRpby4gQXJiaXRyYXJ5IHN0 YXJ0IHZhbHVlIHRvIGF2b2lkIG1hcHBpbmcgYWxsIHplcm9zIHRvIGEgaGFzaCB2YWx1ZSBvZiB6 ZXJvLgorc3RhdGljIGNvbnN0IHVuc2lnbmVkIHN0cmluZ0hhc2hpbmdTdGFydFZhbHVlID0gMHg5 RTM3NzlCOVU7CisKIGNsYXNzIFN0cmluZ0hhc2hlciB7CiBwdWJsaWM6CiAgICAgc3RhdGljIGNv bnN0IHVuc2lnbmVkIGZsYWdDb3VudCA9IDg7IC8vIFNhdmUgOCBiaXRzIGZvciBTdHJpbmdJbXBs IHRvIHVzZSBhcyBmbGFncy4KQEAgLTUxLDE1ICs1NCwxNSBAQCBwdWJsaWM6CiAgICAgICAgIGFk ZENoYXJhY3RlcnNUb0hhc2goYSwgYik7CiAgICAgfQogCi0gICAgdm9pZCBhZGRDaGFyYWN0ZXIo VUNoYXIgY2gpCisgICAgdm9pZCBhZGRDaGFyYWN0ZXIoVUNoYXIgY2hhcmFjdGVyKQogICAgIHsK ICAgICAgICAgaWYgKG1faGFzUGVuZGluZ0NoYXJhY3RlcikgewotICAgICAgICAgICAgYWRkQ2hh cmFjdGVyc1RvSGFzaChtX3BlbmRpbmdDaGFyYWN0ZXIsIGNoKTsKKyAgICAgICAgICAgIGFkZENo YXJhY3RlcnNUb0hhc2gobV9wZW5kaW5nQ2hhcmFjdGVyLCBjaGFyYWN0ZXIpOwogICAgICAgICAg ICAgbV9oYXNQZW5kaW5nQ2hhcmFjdGVyID0gZmFsc2U7CiAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIH0KIAotICAgICAgICBtX3BlbmRpbmdDaGFyYWN0ZXIgPSBjaDsKKyAgICAgICAgbV9w ZW5kaW5nQ2hhcmFjdGVyID0gY2hhcmFjdGVyOwogICAgICAgICBtX2hhc1BlbmRpbmdDaGFyYWN0 ZXIgPSB0cnVlOwogICAgIH0KIApAQCAtNzQsNyArNzcsNyBAQCBwdWJsaWM6CiAgICAgICAgICAg ICAtLWxlbmd0aDsKICAgICAgICAgfQogCi0gICAgICAgIGJvb2wgcmVtID0gbGVuZ3RoICYgMTsK KyAgICAgICAgYm9vbCByZW1haW5kZXIgPSBsZW5ndGggJiAxOwogICAgICAgICBsZW5ndGggPj49 IDE7CiAKICAgICAgICAgd2hpbGUgKGxlbmd0aC0tKSB7CkBAIC04Miw3ICs4NSw3IEBAIHB1Ymxp YzoKICAgICAgICAgICAgIGRhdGEgKz0gMjsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChyZW0p CisgICAgICAgIGlmIChyZW1haW5kZXIpCiAgICAgICAgICAgICBhZGRDaGFyYWN0ZXIoQ29udmVy dGVyKCpkYXRhKSk7CiAgICAgfQogCkBAIC05Miw3ICs5NSw3IEBAIHB1YmxpYzoKIAogICAgICAg ICAvLyBSZXNlcnZpbmcgc3BhY2UgZnJvbSB0aGUgaGlnaCBiaXRzIGZvciBmbGFncyBwcmVzZXJ2 ZXMgbW9zdCBvZiB0aGUgaGFzaCdzCiAgICAgICAgIC8vIHZhbHVlLCBzaW5jZSBoYXNoIGxvb2t1 cCB0eXBpY2FsbHkgbWFza3Mgb3V0IHRoZSBoaWdoIGJpdHMgYW55d2F5LgotICAgICAgICByZXN1 bHQgJj0gKDF1IDw8IChzaXplb2YocmVzdWx0KSAqIDggLSBmbGFnQ291bnQpKSAtIDE7CisgICAg ICAgIHJlc3VsdCAmPSAoMVUgPDwgKHNpemVvZihyZXN1bHQpICogOCAtIGZsYWdDb3VudCkpIC0g MTsKIAogICAgICAgICAvLyBUaGlzIGF2b2lkcyBldmVyIHJldHVybmluZyBhIGhhc2ggY29kZSBv ZiAwLCBzaW5jZSB0aGF0IGlzIHVzZWQgdG8KICAgICAgICAgLy8gc2lnbmFsICJoYXNoIG5vdCBj b21wdXRlZCB5ZXQiLiBTZXR0aW5nIHRoZSBoaWdoIGJpdCBtYWludGFpbnMKQEAgLTEyMSw3ICsx MjQsNyBAQCBwdWJsaWM6CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgVUNoYXIgQ29udmVydGVy KFQpPiBzdGF0aWMgdW5zaWduZWQgY29tcHV0ZUhhc2hBbmRNYXNrVG9wOEJpdHMoY29uc3QgVCog ZGF0YSwgdW5zaWduZWQgbGVuZ3RoKQogICAgIHsKICAgICAgICAgU3RyaW5nSGFzaGVyIGhhc2hl cjsKLSAgICAgICAgYm9vbCByZW0gPSBsZW5ndGggJiAxOworICAgICAgICBib29sIHJlbWFpbmRl ciA9IGxlbmd0aCAmIDE7CiAgICAgICAgIGxlbmd0aCA+Pj0gMTsKIAogICAgICAgICB3aGlsZSAo bGVuZ3RoLS0pIHsKQEAgLTEyOSw3ICsxMzIsNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICBkYXRh ICs9IDI7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAocmVtKQorICAgICAgICBpZiAocmVtYWlu ZGVyKQogICAgICAgICAgICAgaGFzaGVyLmFkZENoYXJhY3RlcihDb252ZXJ0ZXIoKmRhdGEpKTsK IAogICAgICAgICByZXR1cm4gaGFzaGVyLmhhc2hXaXRoVG9wOEJpdHNNYXNrZWQoKTsKQEAgLTIw MiwzNCArMjA1LDM0IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIGNvbXB1dGVIYXNoPFQsIGRl ZmF1bHRDb252ZXJ0ZXI+KGRhdGEpOwogICAgIH0KIAotICAgIHRlbXBsYXRlPHNpemVfdCBsZW5n dGg+IHN0YXRpYyB1bnNpZ25lZCBoYXNoTWVtb3J5KGNvbnN0IHZvaWQqIGRhdGEpCisgICAgc3Rh dGljIHVuc2lnbmVkIGhhc2hNZW1vcnkoY29uc3Qgdm9pZCogZGF0YSwgdW5zaWduZWQgbGVuZ3Ro KQogICAgIHsKLSAgICAgICAgQ09NUElMRV9BU1NFUlQoIShsZW5ndGggJSA0KSwgbGVuZ3RoX211 c3RfYmVfYV9tdWx0aWJsZV9vZl9mb3VyKTsKKyAgICAgICAgLy8gRklYTUU6IFdoeSBkb2VzIHRo aXMgZnVuY3Rpb24gdXNlIHRoZSB2ZXJzaW9uIG9mIHRoZSBoYXNoIHRoYXQgZHJvcHMgdGhlIHRv cCA4IGJpdHM/CisgICAgICAgIEFTU0VSVCghKGxlbmd0aCAlIDIpKTsKICAgICAgICAgcmV0dXJu IGNvbXB1dGVIYXNoQW5kTWFza1RvcDhCaXRzPFVDaGFyPihzdGF0aWNfY2FzdDxjb25zdCBVQ2hh cio+KGRhdGEpLCBsZW5ndGggLyBzaXplb2YoVUNoYXIpKTsKICAgICB9CiAKLSAgICBzdGF0aWMg dW5zaWduZWQgaGFzaE1lbW9yeShjb25zdCB2b2lkKiBkYXRhLCB1bnNpZ25lZCBzaXplKQorICAg IHRlbXBsYXRlPHNpemVfdCBsZW5ndGg+IHN0YXRpYyB1bnNpZ25lZCBoYXNoTWVtb3J5KGNvbnN0 IHZvaWQqIGRhdGEpCiAgICAgewotICAgICAgICBBU1NFUlQoIShzaXplICUgMikpOwotICAgICAg ICByZXR1cm4gY29tcHV0ZUhhc2hBbmRNYXNrVG9wOEJpdHM8VUNoYXI+KHN0YXRpY19jYXN0PGNv bnN0IFVDaGFyKj4oZGF0YSksIHNpemUgLyBzaXplb2YoVUNoYXIpKTsKKyAgICAgICAgQ09NUElM RV9BU1NFUlQoIShsZW5ndGggJSAyKSwgbGVuZ3RoX211c3RfYmVfYV9tdWx0aXBsZV9vZl90d28p OworICAgICAgICByZXR1cm4gaGFzaE1lbW9yeShkYXRhLCBsZW5ndGgpOwogICAgIH0KIAogcHJp dmF0ZToKLSAgICBzdGF0aWMgVUNoYXIgZGVmYXVsdENvbnZlcnRlcihVQ2hhciBjaCkKKyAgICBz dGF0aWMgVUNoYXIgZGVmYXVsdENvbnZlcnRlcihVQ2hhciBjaGFyYWN0ZXIpCiAgICAgewotICAg ICAgICByZXR1cm4gY2g7CisgICAgICAgIHJldHVybiBjaGFyYWN0ZXI7CiAgICAgfQogCi0gICAg c3RhdGljIFVDaGFyIGRlZmF1bHRDb252ZXJ0ZXIoTENoYXIgY2gpCisgICAgc3RhdGljIFVDaGFy IGRlZmF1bHRDb252ZXJ0ZXIoTENoYXIgY2hhcmFjdGVyKQogICAgIHsKLSAgICAgICAgcmV0dXJu IGNoOworICAgICAgICByZXR1cm4gY2hhcmFjdGVyOwogICAgIH0KIAogICAgIHZvaWQgYWRkQ2hh cmFjdGVyc1RvSGFzaChVQ2hhciBhLCBVQ2hhciBiKQogICAgIHsKICAgICAgICAgbV9oYXNoICs9 IGE7Ci0gICAgICAgIHVuc2lnbmVkIHRtcCA9IChiIDw8IDExKSBeIG1faGFzaDsKLSAgICAgICAg bV9oYXNoID0gKG1faGFzaCA8PCAxNikgXiB0bXA7CisgICAgICAgIG1faGFzaCA9IChtX2hhc2gg PDwgMTYpIF4gKChiIDw8IDExKSBeIG1faGFzaCk7CiAgICAgICAgIG1faGFzaCArPSBtX2hhc2gg Pj4gMTE7CiAgICAgfQogCg==