61478 2011-05-25 15:47:21 -0700 Cleanup of commented items from https://bugs.webkit.org/show_bug.cgi?id=61222 2011-05-25 16:05:46 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 msaboff msaboff oldest_to_newest 409981 0 msaboff 2011-05-25 15:47:21 -0700 There were some comments made to https://bugs.webkit.org/show_bug.cgi?id=61222 that didn't make it into the landed patch. This includes using /2 instead of >>1, adding a blank line after class include,making method names start with lower case and adding clarifying comments. - - void pruneDeadResources(); // Flush decoded and encoded data from resources not referenced by Web pages. - void pruneLiveResources(); // Flush decoded data from resources still referenced by Web pages. + // pruneDead*() - Flush decoded and encoded data from resources not referenced by Web pages. + // pruneLive*() - Flush decoded data from resources still referenced by Web pages. + void pruneDeadResources(); // Automatically decide how much to prune. + void pruneLiveResources(); + void PruneDeadResourcesToPercentage(float prunePercentage); + void PruneLiveResourcesToPercentage(float prunePercentage); Functions should not start with capital letters. Added: trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm (0 => 87228) --- trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm (rev 0) +++ trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2011-05-24 23:43:15 UTC (rev 87228) ... + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#import "config.h" +#import "MemoryPressureHandler.h" +#import <WebCore/GCController.h> +#import <WebCore/MemoryCache.h> +#import <WebCore/PageCache.h> +#import <wtf/FastMalloc.h> There should be a newline after MemoryPressureHandler.h, and this should not be using <WebCore/*> style includes for files in WebCore. 409982 1 94874 msaboff 2011-05-25 15:48:32 -0700 Created attachment 94874 Patch with requested style changes. 409994 2 msaboff 2011-05-25 16:05:46 -0700 Committed r87330: <http://trac.webkit.org/changeset/87330> 94874 2011-05-25 15:48:32 -0700 2011-05-25 15:48:32 -0700 Patch with requested style changes. 61478.patch text/plain 4785 msaboff SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3MzI1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDUtMjUgIE1pY2hhZWwg U2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdl aW5pZy4KKworICAgICAgICBDbGVhbnVwIG9mIGNvbW1lbnRlZCBpdGVtcyBmcm9tIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTIyMgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE0NzgKKworICAgICAgICBDbGVhbnVwIG9m IGZ1cnRoZXIgY29tbWVudHMgYWZ0ZXIgcGF0Y2ggd2FzIGxhbmRlZC4gIENoYW5nZXMgaW5jbHVk ZQorICAgICAgICB1c2luZyAvMiBpbnN0ZWFkIG9mID4+MSwgYWRkaW5nIGEgYmxhbmsgbGluZSBh ZnRlciBjbGFzcyBpbmNsdWRlLAorICAgICAgICBtYWtpbmcgbWV0aG9kIG5hbWVzIHN0YXJ0IHdp dGggbG93ZXIgY2FzZSBhbmQgYWRkaW5nIGNsYXJpZnlpbmcKKyAgICAgICAgY29tbWVudHMuCisK KyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIHRoZSBjaGFuZ2VzIGFyZSBzdHlsaXN0aWMgYW5kIG5v dCBmdW5jdGlvbmFsLgorCisgICAgICAgICogbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeUNhY2hlOjpwcnVuZUxpdmVSZXNvdXJjZXNUb1BlcmNl bnRhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6TWVtb3J5Q2FjaGU6OnBydW5lRGVhZFJlc291cmNl c1RvUGVyY2VudGFnZSk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmg6Cisg ICAgICAgIChXZWJDb3JlOjpNZW1vcnlDYWNoZTo6cHJ1bmVUb1BlcmNlbnRhZ2UpOgorICAgICAg ICAqIHBsYXRmb3JtL21hYy9NZW1vcnlQcmVzc3VyZUhhbmRsZXJNYWMubW06CisgICAgICAgIChX ZWJDb3JlOjpNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnJlc3BvbmRUb01lbW9yeVByZXNzdXJlKToK KwogMjAxMS0wNS0yNSAgQW5kcmV3IFNjaGVya3VzICA8c2NoZXJrdXNAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcAkocmV2aXNpb24gODczMjUpCisrKyBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xNzYsNyArMTc2LDcgQEAgdm9pZCBNZW1vcnlDYWNoZTo6cHJ1bmVMaXZlUmVzb3VyY2VzKCkK ICAgICBwcnVuZUxpdmVSZXNvdXJjZXNUb1NpemUodGFyZ2V0U2l6ZSk7CiB9CiAKLXZvaWQgTWVt b3J5Q2FjaGU6OlBydW5lTGl2ZVJlc291cmNlc1RvUGVyY2VudGFnZShmbG9hdCBwcnVuZVBlcmNl bnRhZ2UpCit2b2lkIE1lbW9yeUNhY2hlOjpwcnVuZUxpdmVSZXNvdXJjZXNUb1BlcmNlbnRhZ2Uo ZmxvYXQgcHJ1bmVQZXJjZW50YWdlKQogewogICAgIGlmICghbV9wcnVuZUVuYWJsZWQpCiAgICAg ICAgIHJldHVybjsKQEAgLTIzOSw3ICsyMzksNyBAQCB2b2lkIE1lbW9yeUNhY2hlOjpwcnVuZURl YWRSZXNvdXJjZXMoKQogICAgIHBydW5lRGVhZFJlc291cmNlc1RvU2l6ZSh0YXJnZXRTaXplKTsK IH0KIAotdm9pZCBNZW1vcnlDYWNoZTo6UHJ1bmVEZWFkUmVzb3VyY2VzVG9QZXJjZW50YWdlKGZs b2F0IHBydW5lUGVyY2VudGFnZSkKK3ZvaWQgTWVtb3J5Q2FjaGU6OnBydW5lRGVhZFJlc291cmNl c1RvUGVyY2VudGFnZShmbG9hdCBwcnVuZVBlcmNlbnRhZ2UpCiB7CiAgICAgaWYgKCFtX3BydW5l RW5hYmxlZCkKICAgICAgICAgcmV0dXJuOwpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL01lbW9yeUNhY2hlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL01lbW9yeUNhY2hlLmgJKHJldmlzaW9uIDg3MzI1KQorKysgU291cmNlL1dlYkNvcmUvbG9h ZGVyL2NhY2hlL01lbW9yeUNhY2hlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE0MSw4ICsxNDEsOCBA QCBwdWJsaWM6CiAKICAgICB2b2lkIHBydW5lVG9QZXJjZW50YWdlKGZsb2F0IHRhcmdldFBlcmNl bnRMaXZlKQogICAgIHsKLSAgICAgICAgUHJ1bmVEZWFkUmVzb3VyY2VzVG9QZXJjZW50YWdlKHRh cmdldFBlcmNlbnRMaXZlKTsgLy8gUHJ1bmUgZGVhZCBmaXJzdCwgaW4gY2FzZSBpdCB3YXMgImJv cnJvd2luZyIgY2FwYWNpdHkgZnJvbSBsaXZlLgotICAgICAgICBQcnVuZUxpdmVSZXNvdXJjZXNU b1BlcmNlbnRhZ2UodGFyZ2V0UGVyY2VudExpdmUpOworICAgICAgICBwcnVuZURlYWRSZXNvdXJj ZXNUb1BlcmNlbnRhZ2UodGFyZ2V0UGVyY2VudExpdmUpOyAvLyBQcnVuZSBkZWFkIGZpcnN0LCBp biBjYXNlIGl0IHdhcyAiYm9ycm93aW5nIiBjYXBhY2l0eSBmcm9tIGxpdmUuCisgICAgICAgIHBy dW5lTGl2ZVJlc291cmNlc1RvUGVyY2VudGFnZSh0YXJnZXRQZXJjZW50TGl2ZSk7CiAgICAgfQog CiAgICAgdm9pZCBzZXREZWFkRGVjb2RlZERhdGFEZWxldGlvbkludGVydmFsKGRvdWJsZSBpbnRl cnZhbCkgeyBtX2RlYWREZWNvZGVkRGF0YURlbGV0aW9uSW50ZXJ2YWwgPSBpbnRlcnZhbDsgfQpA QCAtMTkzLDggKzE5Myw4IEBAIHByaXZhdGU6CiAgICAgLy8gcHJ1bmVMaXZlKigpIC0gRmx1c2gg ZGVjb2RlZCBkYXRhIGZyb20gcmVzb3VyY2VzIHN0aWxsIHJlZmVyZW5jZWQgYnkgV2ViIHBhZ2Vz LgogICAgIHZvaWQgcHJ1bmVEZWFkUmVzb3VyY2VzKCk7IC8vIEF1dG9tYXRpY2FsbHkgZGVjaWRl IGhvdyBtdWNoIHRvIHBydW5lLgogICAgIHZvaWQgcHJ1bmVMaXZlUmVzb3VyY2VzKCk7Ci0gICAg dm9pZCBQcnVuZURlYWRSZXNvdXJjZXNUb1BlcmNlbnRhZ2UoZmxvYXQgcHJ1bmVQZXJjZW50YWdl KTsKLSAgICB2b2lkIFBydW5lTGl2ZVJlc291cmNlc1RvUGVyY2VudGFnZShmbG9hdCBwcnVuZVBl cmNlbnRhZ2UpOworICAgIHZvaWQgcHJ1bmVEZWFkUmVzb3VyY2VzVG9QZXJjZW50YWdlKGZsb2F0 IHBydW5lUGVyY2VudGFnZSk7IC8vIFBydW5lIHRvICUgY3VycmVudCBzaXplCisgICAgdm9pZCBw cnVuZUxpdmVSZXNvdXJjZXNUb1BlcmNlbnRhZ2UoZmxvYXQgcHJ1bmVQZXJjZW50YWdlKTsKICAg ICB2b2lkIHBydW5lRGVhZFJlc291cmNlc1RvU2l6ZSh1bnNpZ25lZCB0YXJnZXRTaXplKTsKICAg ICB2b2lkIHBydW5lTGl2ZVJlc291cmNlc1RvU2l6ZSh1bnNpZ25lZCB0YXJnZXRTaXplKTsKIApJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL01lbW9yeVByZXNzdXJlSGFuZGxlck1h Yy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvTWVtb3J5UHJl c3N1cmVIYW5kbGVyTWFjLm1tCShyZXZpc2lvbiA4NzMyNSkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21hYy9NZW1vcnlQcmVzc3VyZUhhbmRsZXJNYWMubW0JKHdvcmtpbmcgY29weSkKQEAg LTI1LDYgKzI1LDcgQEAKIAogI2ltcG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0ICJNZW1vcnlQcmVz c3VyZUhhbmRsZXIuaCIKKwogI2ltcG9ydCA8V2ViQ29yZS9HQ0NvbnRyb2xsZXIuaD4KICNpbXBv cnQgPFdlYkNvcmUvTWVtb3J5Q2FjaGUuaD4KICNpbXBvcnQgPFdlYkNvcmUvUGFnZUNhY2hlLmg+ CkBAIC04NiwxMyArODcsMTMgQEAgdm9pZCBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6Omluc3RhbGwo KQogdm9pZCBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnJlc3BvbmRUb01lbW9yeVByZXNzdXJlKCkK IHsKICAgICBpbnQgc2F2ZWRQYWdlQ2FjaGVDYXBhY2l0eSA9IHBhZ2VDYWNoZSgpLT5jYXBhY2l0 eSgpOwotICAgIHBhZ2VDYWNoZSgpLT5zZXRDYXBhY2l0eShwYWdlQ2FjaGUoKS0+cGFnZUNvdW50 KCk+PjEpOworICAgIHBhZ2VDYWNoZSgpLT5zZXRDYXBhY2l0eShwYWdlQ2FjaGUoKS0+cGFnZUNv dW50KCkvMik7CiAgICAgcGFnZUNhY2hlKCktPnNldENhcGFjaXR5KHNhdmVkUGFnZUNhY2hlQ2Fw YWNpdHkpOwogICAgIHBhZ2VDYWNoZSgpLT5yZWxlYXNlQXV0b3JlbGVhc2VkUGFnZXNOb3coKTsK IAogICAgIE5TVVJMQ2FjaGUgKm5zdXJsQ2FjaGUgPSBbTlNVUkxDYWNoZSBzaGFyZWRVUkxDYWNo ZV07CiAgICAgTlNVSW50ZWdlciBzYXZlZE5zdXJsQ2FjaGVNZW1vcnlDYXBhY2l0eSA9IFtuc3Vy bENhY2hlIG1lbW9yeUNhcGFjaXR5XTsKLSAgICBbbnN1cmxDYWNoZSBzZXRNZW1vcnlDYXBhY2l0 eTpbbnN1cmxDYWNoZSBjdXJyZW50TWVtb3J5VXNhZ2VdPj4xXTsKKyAgICBbbnN1cmxDYWNoZSBz ZXRNZW1vcnlDYXBhY2l0eTpbbnN1cmxDYWNoZSBjdXJyZW50TWVtb3J5VXNhZ2VdLzJdOwogICAg IFtuc3VybENhY2hlIHNldE1lbW9yeUNhcGFjaXR5OnNhdmVkTnN1cmxDYWNoZU1lbW9yeUNhcGFj aXR5XTsKICAKICAgICBtZW1vcnlDYWNoZSgpLT5wcnVuZVRvUGVyY2VudGFnZSgwLjVmKTsK