48484 2010-10-27 16:39:35 -0700 Improve memSize calculation in [WebView _setCacheModel] 2010-10-27 17:42:50 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 psolanki webkit-unassigned commit-queue ddkilzer ggaren oldest_to_newest 300698 0 psolanki 2010-10-27 16:39:35 -0700 In [WebView _setCacheModel], we use a fudge factor for the memory size // As a fudge factor, use 1000 instead of 1024, in case the reported byte // count doesn't align exactly to a megabyte boundary. uint64_t memSize = WebMemorySize() / 1024 / 1000; Instead of doing that, we should just round up the memSize to a multiple of 2 and update the code to check for 4MB/2MB/1MB/512KB memory levels. 300723 1 72118 psolanki 2010-10-27 17:16:25 -0700 Created attachment 72118 Patch 300729 2 72118 darin 2010-10-27 17:23:27 -0700 Comment on attachment 72118 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=72118&action=review Changes look fine. I have a comment or two, but nothing we couldn’t tweak later. > WebKit/mac/WebView/WebView.mm:5324 > + static uint64_t memSize = roundUpToPowerOf2(WebMemorySize() / 1024 / 1024); Is it really worthwhile to store this in a global? Paying 8 bytes of global memory to avoid doing this math more than once might be the wrong tradeoff since we do this computation only when the cache model is changed. 300740 3 72118 commit-queue 2010-10-27 17:42:45 -0700 Comment on attachment 72118 Patch Clearing flags on attachment: 72118 Committed r70732: <http://trac.webkit.org/changeset/70732> 300741 4 commit-queue 2010-10-27 17:42:50 -0700 All reviewed patches have been landed. Closing bug. 72118 2010-10-27 17:16:25 -0700 2010-10-27 17:42:45 -0700 Patch bug-48484-20101027171624.patch text/plain 3813 psolanki ZGlmZiAtLWdpdCBhL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvV2ViS2l0L21hYy9DaGFuZ2VMb2cK aW5kZXggNjZlMWIyOTEyY2Q0YzM2Yzg0ZmUwZTg0NGQ3OTk4MTE2ZGMwODZmMS4uOGFiYzc5ZWFk MzZlOTkzZTQxYjljNThmNzhjZjE4NTE0ZjM0NzFmMyAxMDA2NDQKLS0tIGEvV2ViS2l0L21hYy9D aGFuZ2VMb2cKKysrIGIvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAx MC0xMC0yNyAgUHJhdGlrIFNvbGFua2kgIDxwc29sYW5raUBhcHBsZS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wcm92ZSBtZW1TaXplIGNh bGN1bGF0aW9uIGluIFtXZWJWaWV3IF9zZXRDYWNoZU1vZGVsXQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg0ODQKKworICAgICAgICAqIFdlYlZpZXcv V2ViVmlldy5tbToKKyAgICAgICAgKHJvdW5kVXBUb1Bvd2VyT2YyKTogQWRkZWQuIFV0aWxpdHkg ZnVuY3Rpb24gdG8gY2FsY3VsYXRlIHRoZSBuZWFyZXN0IHBvd2VyIG9mIDIuCisgICAgICAgICgr W1dlYlZpZXcgX3NldENhY2hlTW9kZWw6XSk6IFVwZGF0ZSBtZW1TaXplIGNhbGN1bGF0aW9uIHRv IHNldCBpdCB0byB0aGUgbmV4dAorICAgICAgICBiaWdnZXIgcG93ZXIgb2YgMi4gQWxzbyB1cGRh dGUgV2ViQ29yZSBjYWNoZSBzZXR0aW5ncy4KKwogMjAxMC0xMC0yNyAgQmV0aCBEYWtpbiAgPGJk YWtpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYg LS1naXQgYS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbSBiL1dlYktpdC9tYWMvV2ViVmll dy9XZWJWaWV3Lm1tCmluZGV4IGYzYTI0OTk1YmU3Yjc2NjkxYWZiYmFmNjgzNjJiZjI3ZTE1NjEy MTQuLjU3MzA5YWZhNzExZTg5NjM4NzFhZjc5OTgxM2FiMzBmYTRjYTU0NTQgMTAwNjQ0Ci0tLSBh L1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCisrKyBiL1dlYktpdC9tYWMvV2ViVmlldy9X ZWJWaWV3Lm1tCkBAIC01MzA3LDYgKzUzMDcsMTEgQEAgc3RhdGljIFdlYkZyYW1lVmlldyAqY29u dGFpbmluZ0ZyYW1lVmlldyhOU1ZpZXcgKnZpZXcpCiAKIEBpbXBsZW1lbnRhdGlvbiBXZWJWaWV3 IChXZWJGaWxlSW50ZXJuYWwpCiAKK3N0YXRpYyBpbmxpbmUgdWludDY0X3Qgcm91bmRVcFRvUG93 ZXJPZjIodWludDY0X3QgbnVtKQoreworICAgIHJldHVybiBwb3dmKDIuMCwgY2VpbGYobG9nMmYo bnVtKSkpOworfQorCiArICh2b2lkKV9zZXRDYWNoZU1vZGVsOihXZWJDYWNoZU1vZGVsKWNhY2hl TW9kZWwKIHsKICAgICBpZiAoc19kaWRTZXRDYWNoZU1vZGVsICYmIGNhY2hlTW9kZWwgPT0gc19j YWNoZU1vZGVsKQpAQCAtNTMxNiw5ICs1MzIxLDcgQEAgc3RhdGljIFdlYkZyYW1lVmlldyAqY29u dGFpbmluZ0ZyYW1lVmlldyhOU1ZpZXcgKnZpZXcpCiAgICAgaWYgKCFuc3VybENhY2hlRGlyZWN0 b3J5KQogICAgICAgICBuc3VybENhY2hlRGlyZWN0b3J5ID0gTlNIb21lRGlyZWN0b3J5KCk7CiAK LSAgICAvLyBBcyBhIGZ1ZGdlIGZhY3RvciwgdXNlIDEwMDAgaW5zdGVhZCBvZiAxMDI0LCBpbiBj YXNlIHRoZSByZXBvcnRlZCBieXRlIAotICAgIC8vIGNvdW50IGRvZXNuJ3QgYWxpZ24gZXhhY3Rs eSB0byBhIG1lZ2FieXRlIGJvdW5kYXJ5LgotICAgIHVpbnQ2NF90IG1lbVNpemUgPSBXZWJNZW1v cnlTaXplKCkgLyAxMDI0IC8gMTAwMDsKKyAgICBzdGF0aWMgdWludDY0X3QgbWVtU2l6ZSA9IHJv dW5kVXBUb1Bvd2VyT2YyKFdlYk1lbW9yeVNpemUoKSAvIDEwMjQgLyAxMDI0KTsKICAgICB1bnNp Z25lZCBsb25nIGxvbmcgZGlza0ZyZWVTaXplID0gV2ViVm9sdW1lRnJlZVNpemUobnN1cmxDYWNo ZURpcmVjdG9yeSkgLyAxMDI0IC8gMTAwMDsKICAgICBOU1VSTENhY2hlICpuc3VybENhY2hlID0g W05TVVJMQ2FjaGUgc2hhcmVkVVJMQ2FjaGVdOwogCkBAIC01MzM4LDEwICs1MzQxLDEwIEBAIHN0 YXRpYyBXZWJGcmFtZVZpZXcgKmNvbnRhaW5pbmdGcmFtZVZpZXcoTlNWaWV3ICp2aWV3KQogICAg ICAgICBwYWdlQ2FjaGVDYXBhY2l0eSA9IDA7CiAKICAgICAgICAgLy8gT2JqZWN0IGNhY2hlIGNh cGFjaXRpZXMgKGluIGJ5dGVzKQotICAgICAgICBpZiAobWVtU2l6ZSA+PSAyMDQ4KQorICAgICAg ICBpZiAobWVtU2l6ZSA+PSA0MDk2KQorICAgICAgICAgICAgY2FjaGVUb3RhbENhcGFjaXR5ID0g MTI4ICogMTAyNCAqIDEwMjQ7CisgICAgICAgIGVsc2UgaWYgKG1lbVNpemUgPj0gMjA0OCkKICAg ICAgICAgICAgIGNhY2hlVG90YWxDYXBhY2l0eSA9IDk2ICogMTAyNCAqIDEwMjQ7Ci0gICAgICAg IGVsc2UgaWYgKG1lbVNpemUgPj0gMTUzNikKLSAgICAgICAgICAgIGNhY2hlVG90YWxDYXBhY2l0 eSA9IDY0ICogMTAyNCAqIDEwMjQ7CiAgICAgICAgIGVsc2UgaWYgKG1lbVNpemUgPj0gMTAyNCkK ICAgICAgICAgICAgIGNhY2hlVG90YWxDYXBhY2l0eSA9IDMyICogMTAyNCAqIDEwMjQ7CiAgICAg ICAgIGVsc2UgaWYgKG1lbVNpemUgPj0gNTEyKQpAQCAtNTM3MCwxMCArNTM3MywxMCBAQCBzdGF0 aWMgV2ViRnJhbWVWaWV3ICpjb250YWluaW5nRnJhbWVWaWV3KE5TVmlldyAqdmlldykKICAgICAg ICAgICAgIHBhZ2VDYWNoZUNhcGFjaXR5ID0gMDsKIAogICAgICAgICAvLyBPYmplY3QgY2FjaGUg Y2FwYWNpdGllcyAoaW4gYnl0ZXMpCi0gICAgICAgIGlmIChtZW1TaXplID49IDIwNDgpCisgICAg ICAgIGlmIChtZW1TaXplID49IDQwOTYpCisgICAgICAgICAgICBjYWNoZVRvdGFsQ2FwYWNpdHkg PSAxMjggKiAxMDI0ICogMTAyNDsKKyAgICAgICAgZWxzZSBpZiAobWVtU2l6ZSA+PSAyMDQ4KQog ICAgICAgICAgICAgY2FjaGVUb3RhbENhcGFjaXR5ID0gOTYgKiAxMDI0ICogMTAyNDsKLSAgICAg ICAgZWxzZSBpZiAobWVtU2l6ZSA+PSAxNTM2KQotICAgICAgICAgICAgY2FjaGVUb3RhbENhcGFj aXR5ID0gNjQgKiAxMDI0ICogMTAyNDsKICAgICAgICAgZWxzZSBpZiAobWVtU2l6ZSA+PSAxMDI0 KQogICAgICAgICAgICAgY2FjaGVUb3RhbENhcGFjaXR5ID0gMzIgKiAxMDI0ICogMTAyNDsKICAg ICAgICAgZWxzZSBpZiAobWVtU2l6ZSA+PSA1MTIpCkBAIC01NDIyLDEwICs1NDI1LDEwIEBAIHN0 YXRpYyBXZWJGcmFtZVZpZXcgKmNvbnRhaW5pbmdGcmFtZVZpZXcoTlNWaWV3ICp2aWV3KQogICAg ICAgICAvLyAoVGVzdGluZyBpbmRpY2F0ZXMgdGhhdCB2YWx1ZSAvIE1CIGRlcGVuZHMgaGVhdmls eSBvbiBjb250ZW50IGFuZAogICAgICAgICAvLyBicm93c2luZyBwYXR0ZXJuLiBFdmVuIGdyb3d0 aCBhYm92ZSAxMjhNQiBjYW4gaGF2ZSBzdWJzdGFudGlhbCAKICAgICAgICAgLy8gdmFsdWUgLyBN QiBmb3Igc29tZSBjb250ZW50IC8gYnJvd3NpbmcgcGF0dGVybnMuKQotICAgICAgICBpZiAobWVt U2l6ZSA+PSAyMDQ4KQorICAgICAgICBpZiAobWVtU2l6ZSA+PSA0MDk2KQorICAgICAgICAgICAg Y2FjaGVUb3RhbENhcGFjaXR5ID0gMTkyICogMTAyNCAqIDEwMjQ7CisgICAgICAgIGVsc2UgaWYg KG1lbVNpemUgPj0gMjA0OCkKICAgICAgICAgICAgIGNhY2hlVG90YWxDYXBhY2l0eSA9IDEyOCAq IDEwMjQgKiAxMDI0OwotICAgICAgICBlbHNlIGlmIChtZW1TaXplID49IDE1MzYpCi0gICAgICAg ICAgICBjYWNoZVRvdGFsQ2FwYWNpdHkgPSA5NiAqIDEwMjQgKiAxMDI0OwogICAgICAgICBlbHNl IGlmIChtZW1TaXplID49IDEwMjQpCiAgICAgICAgICAgICBjYWNoZVRvdGFsQ2FwYWNpdHkgPSA2 NCAqIDEwMjQgKiAxMDI0OwogICAgICAgICBlbHNlIGlmIChtZW1TaXplID49IDUxMikK