151407 2015-11-18 14:17:33 -0800 ResourceUsageOverlay should have better accounting for reclaimable memory. 2015-11-18 15:48:55 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue oldest_to_newest 1142977 0 kling 2015-11-18 14:17:33 -0800 We should show how much memory in each category is reclaimable, if any. 1142978 1 265778 kling 2015-11-18 14:18:05 -0800 Created attachment 265778 Patch 1142995 2 265778 andersca 2015-11-18 14:56:02 -0800 Comment on attachment 265778 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=265778&action=review > Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm:435 > + size_t dirty { 0 }; 😐 1143038 3 265778 commit-queue 2015-11-18 15:48:53 -0800 Comment on attachment 265778 Patch Clearing flags on attachment: 265778 Committed r192595: <http://trac.webkit.org/changeset/192595> 1143039 4 commit-queue 2015-11-18 15:48:55 -0800 All reviewed patches have been landed. Closing bug. 265778 2015-11-18 14:18:05 -0800 2015-11-18 15:48:53 -0800 Patch bug-151407.diff text/plain 6413 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyZGNiMWVkLi42MjdjY2ViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTUtMTEtMTggIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFJlc291cmNlVXNhZ2VPdmVybGF5IHNob3VsZCBoYXZlIGJldHRlciBhY2NvdW50aW5nIGZv ciByZWNsYWltYWJsZSBtZW1vcnkuCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xNTE0 MDc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IGNvZGUgdG8gaW5zcGVjdCB0aGUgcHVyZ2VhYmxlIHN0YXRlIG9mIFZNIHJlZ2lvbnMgd2hlbiB0 cmF2ZXJzaW5nIHRoZQorICAgICAgICB3ZWIgcHJvY2VzcyBWTSBtYXAsIGFuZCB0cmFjayByZWNs YWltYWJsZSByZWdpb25zIG9mIG1lbW9yeSBzZXBhcmF0ZWx5LgorCisgICAgICAgIE1lbW9yeSBj YXRlZ29yaWVzIHRoYXQgaGF2ZSBzb21lIGFtb3VudCBvZiByZWNsYWltYWJsZSBtZW1vcnkgYXJl IG5vdworICAgICAgICBkaXNwbGF5ZWQgd2l0aCB0aGUgcmVjbGFpbWFibGUgYW1vdW50IGluIGJy YWNrZXRzLCBlLmcgIjEyMy40NSBNQiBbNTYuNzhNQl0iCisKKyAgICAgICAgKiBwYWdlL1Jlc291 cmNlVXNhZ2VPdmVybGF5Lmg6CisgICAgICAgICogcGFnZS9jb2NvYS9SZXNvdXJjZVVzYWdlT3Zl cmxheUNvY29hLm1tOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VVc2FnZU92ZXJsYXk6OnBs YXRmb3JtRHJhdyk6CisgICAgICAgIChXZWJDb3JlOjpUYWdJbmZvOjpUYWdJbmZvKToKKyAgICAg ICAgKFdlYkNvcmU6OnBhZ2VzUGVyVk1UYWcpOgorICAgICAgICAoV2ViQ29yZTo6cnVuU2FtcGxl clRocmVhZCk6CisgICAgICAgIChXZWJDb3JlOjpkaXJ0eVBhZ2VzUGVyVk1UYWcpOiBEZWxldGVk LgorCiAyMDE1LTExLTE4ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogVGltZWxpbmUgUmVjb3JkaW5nIGFjcm9zcyBwYWdlIG5h dmlnYXRpb25zIGJlaGF2ZXMgcG9vcmx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L1Jlc291cmNlVXNhZ2VPdmVybGF5LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Jlc291cmNlVXNh Z2VPdmVybGF5LmgKaW5kZXggZTUyYzJkNy4uN2QyZjVkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9SZXNvdXJjZVVzYWdlT3ZlcmxheS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvUmVzb3VyY2VVc2FnZU92ZXJsYXkuaApAQCAtODEsNyArODEsNyBAQCBwcml2YXRlOgogICAg IFJldGFpblB0cjxDQUxheWVyPiBtX2xheWVyOwogI2VuZGlmCiAKLSAgICBzdGF0aWMgY29uc3Qg aW50IG5vcm1hbFdpZHRoID0gNTUwOworICAgIHN0YXRpYyBjb25zdCBpbnQgbm9ybWFsV2lkdGgg PSA1NzA7CiAgICAgc3RhdGljIGNvbnN0IGludCBub3JtYWxIZWlnaHQgPSAxMzA7CiB9OwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NvY29hL1Jlc291cmNlVXNhZ2VPdmVybGF5 Q29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NvY29hL1Jlc291cmNlVXNhZ2VPdmVybGF5 Q29jb2EubW0KaW5kZXggMDY0ZmFjMS4uMmMwNzg3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9jb2NvYS9SZXNvdXJjZVVzYWdlT3ZlcmxheUNvY29hLm1tCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvY29jb2EvUmVzb3VyY2VVc2FnZU92ZXJsYXlDb2NvYS5tbQpAQCAtMTQ2LDYg KzE0Niw3IEBAIHN0cnVjdCBNZW1vcnlDYXRlZ29yeUluZm8gewogICAgIFN0cmluZyBuYW1lOwog ICAgIFJldGFpblB0cjxDR0NvbG9yUmVmPiBjb2xvcjsKICAgICBSaW5nQnVmZmVyPHNpemVfdD4g aGlzdG9yeTsKKyAgICBSaW5nQnVmZmVyPHNpemVfdD4gcmVjbGFpbWFibGVIaXN0b3J5OwogICAg IGJvb2wgaXNTdWJjYXRlZ29yeSB7IGZhbHNlIH07CiAgICAgdW5zaWduZWQgdHlwZSB7IE1lbW9y eUNhdGVnb3J5OjpOdW1iZXJPZkNhdGVnb3JpZXMgfTsKIH07CkBAIC00MTEsOCArNDEyLDEzIEBA IHZvaWQgUmVzb3VyY2VVc2FnZU92ZXJsYXk6OnBsYXRmb3JtRHJhdyhDR0NvbnRleHRSZWYgY29u dGV4dCkKIAogICAgIGZsb2F0IHkgPSA1MDsKICAgICBmb3IgKGF1dG8mIGNhdGVnb3J5IDogZGF0 YS5jYXRlZ29yaWVzKSB7CisgICAgICAgIFN0cmluZyBsYWJlbCA9IFN0cmluZzo6Zm9ybWF0KCIl IDExczogJXMiLCBjYXRlZ29yeS5uYW1lLmFzY2lpKCkuZGF0YSgpLCBmb3JtYXRCeXRlTnVtYmVy KGNhdGVnb3J5Lmhpc3RvcnkubGFzdCgpKS5hc2NpaSgpLmRhdGEoKSk7CisgICAgICAgIHNpemVf dCByZWNsYWltYWJsZSA9IGNhdGVnb3J5LnJlY2xhaW1hYmxlSGlzdG9yeS5sYXN0KCk7CisgICAg ICAgIGlmIChyZWNsYWltYWJsZSkKKyAgICAgICAgICAgIGxhYmVsID0gbGFiZWwgKyBTdHJpbmc6 OmZvcm1hdCgiIFslc10iLCBmb3JtYXRCeXRlTnVtYmVyKHJlY2xhaW1hYmxlKS5hc2NpaSgpLmRh dGEoKSk7CisKICAgICAgICAgLy8gRklYTUU6IFNob3cgc2l6ZS9jYXBhY2l0eSBvZiBHQyBoZWFw LgotICAgICAgICBzaG93VGV4dChjb250ZXh0LCAxMCwgeSwgY2F0ZWdvcnkuY29sb3IuZ2V0KCks IFN0cmluZzo6Zm9ybWF0KCIlIDExczogJXMiLCBjYXRlZ29yeS5uYW1lLmFzY2lpKCkuZGF0YSgp LCBmb3JtYXRCeXRlTnVtYmVyKGNhdGVnb3J5Lmhpc3RvcnkubGFzdCgpKS5hc2NpaSgpLmRhdGEo KSkpOworICAgICAgICBzaG93VGV4dChjb250ZXh0LCAxMCwgeSwgY2F0ZWdvcnkuY29sb3IuZ2V0 KCksIGxhYmVsKTsKICAgICAgICAgeSArPSAxMDsKICAgICB9CiAKQEAgLTQyNCwyMiArNDMwLDQ5 IEBAIHZvaWQgUmVzb3VyY2VVc2FnZU92ZXJsYXk6OnBsYXRmb3JtRHJhdyhDR0NvbnRleHRSZWYg Y29udGV4dCkKICAgICBkcmF3TWVtb3J5UGllKGNvbnRleHQsIHBpZVJlY3QsIGRhdGEpOwogfQog Ci1zdGF0aWMgc3RkOjphcnJheTxzaXplX3QsIDI1Nj4gZGlydHlQYWdlc1BlclZNVGFnKCkKK3N0 cnVjdCBUYWdJbmZvIHsKKyAgICBUYWdJbmZvKCkgeyB9CisgICAgc2l6ZV90IGRpcnR5IHsgMCB9 OworICAgIHNpemVfdCByZWNsYWltYWJsZSB7IDAgfTsKK307CisKK3N0YXRpYyBzdGQ6OmFycmF5 PFRhZ0luZm8sIDI1Nj4gcGFnZXNQZXJWTVRhZygpCiB7Ci0gICAgc3RkOjphcnJheTxzaXplX3Qs IDI1Nj4gZGlydHk7Ci0gICAgZGlydHkuZmlsbCgwKTsKKyAgICBzdGQ6OmFycmF5PFRhZ0luZm8s IDI1Nj4gdGFnczsKICAgICB0YXNrX3QgdGFzayA9IG1hY2hfdGFza19zZWxmKCk7CiAgICAgbWFj aF92bV9zaXplX3Qgc2l6ZTsKICAgICB1aW50MzJfdCBkZXB0aCA9IDA7CiAgICAgc3RydWN0IHZt X3JlZ2lvbl9zdWJtYXBfaW5mb182NCBpbmZvID0geyB9OwogICAgIG1hY2hfbXNnX3R5cGVfbnVt YmVyX3QgY291bnQgPSBWTV9SRUdJT05fU1VCTUFQX0lORk9fQ09VTlRfNjQ7CiAgICAgZm9yICht YWNoX3ZtX2FkZHJlc3NfdCBhZGRyID0gMDsgOyBhZGRyICs9IHNpemUpIHsKKyAgICAgICAgaW50 IHB1cmdlYWJsZVN0YXRlOworICAgICAgICBpZiAobWFjaF92bV9wdXJnYWJsZV9jb250cm9sKHRh c2ssIGFkZHIsIFZNX1BVUkdBQkxFX0dFVF9TVEFURSwgJnB1cmdlYWJsZVN0YXRlKSAhPSBLRVJO X1NVQ0NFU1MpCisgICAgICAgICAgICBwdXJnZWFibGVTdGF0ZSA9IFZNX1BVUkdBQkxFX0RFTlk7 CisKICAgICAgICAga2Vybl9yZXR1cm5fdCBrciA9IG1hY2hfdm1fcmVnaW9uX3JlY3Vyc2UodGFz aywgJmFkZHIsICZzaXplLCAmZGVwdGgsICh2bV9yZWdpb25faW5mb190KSZpbmZvLCAmY291bnQp OwogICAgICAgICBpZiAoa3IgIT0gS0VSTl9TVUNDRVNTKQogICAgICAgICAgICAgYnJlYWs7Ci0g ICAgICAgIGRpcnR5W2luZm8udXNlcl90YWddICs9IGluZm8ucGFnZXNfZGlydGllZDsKKworICAg ICAgICBpZiAocHVyZ2VhYmxlU3RhdGUgPT0gVk1fUFVSR0FCTEVfVk9MQVRJTEUpIHsKKyAgICAg ICAgICAgIHRhZ3NbaW5mby51c2VyX3RhZ10ucmVjbGFpbWFibGUgKz0gaW5mby5wYWdlc19yZXNp ZGVudDsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisKKyAgICAgICAgaWYgKHB1 cmdlYWJsZVN0YXRlID09IFZNX1BVUkdBQkxFX0VNUFRZKSB7CisgICAgICAgICAgICBzdGF0aWMg c2l6ZV90IHZtUGFnZVNpemUgPSBnZXRwYWdlc2l6ZSgpOworICAgICAgICAgICAgdGFnc1tpbmZv LnVzZXJfdGFnXS5yZWNsYWltYWJsZSArPSBzaXplIC8gdm1QYWdlU2l6ZTsKKyAgICAgICAgICAg IGNvbnRpbnVlOworICAgICAgICB9CisKKyAgICAgICAgYm9vbCBhbm9ueW1vdXMgPSAhaW5mby5l eHRlcm5hbF9wYWdlcjsKKyAgICAgICAgaWYgKGFub255bW91cykgeworICAgICAgICAgICAgdGFn c1tpbmZvLnVzZXJfdGFnXS5kaXJ0eSArPSBpbmZvLnBhZ2VzX3Jlc2lkZW50IC0gaW5mby5wYWdl c19yZXVzYWJsZTsKKyAgICAgICAgICAgIHRhZ3NbaW5mby51c2VyX3RhZ10ucmVjbGFpbWFibGUg Kz0gaW5mby5wYWdlc19yZXVzYWJsZTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICB0YWdz W2luZm8udXNlcl90YWddLmRpcnR5ICs9IGluZm8ucGFnZXNfZGlydGllZDsKICAgICB9Ci0gICAg cmV0dXJuIGRpcnR5OworCisgICAgcmV0dXJuIHRhZ3M7CiB9CiAKIHN0YXRpYyBmbG9hdCBjcHVV c2FnZSgpCkBAIC01MDQsMjYgKzUzNywyNyBAQCBOT19SRVRVUk4gdm9pZCBydW5TYW1wbGVyVGhy ZWFkKHZvaWQqKQogICAgIGF1dG8mIGRhdGEgPSBzaGFyZWREYXRhKCk7CiAgICAgd2hpbGUgKDEp IHsKICAgICAgICAgZmxvYXQgY3B1ID0gY3B1VXNhZ2UoKTsKLSAgICAgICAgYXV0byBkaXJ0eVBh Z2VzID0gZGlydHlQYWdlc1BlclZNVGFnKCk7CisgICAgICAgIGF1dG8gdGFncyA9IHBhZ2VzUGVy Vk1UYWcoKTsKICAgICAgICAgVmVjdG9yPENBTGF5ZXIgKiwgOD4gbGF5ZXJzOwogCiAgICAgICAg IHsKICAgICAgICAgICAgIExvY2tIb2xkZXIgbG9ja2VyKGRhdGEubG9jayk7CiAgICAgICAgICAg ICBkYXRhLmNwdUhpc3RvcnkuYXBwZW5kKGNwdSk7CiAKLSAgICAgICAgICAgIHN0ZDo6YXJyYXk8 c2l6ZV90LCBNZW1vcnlDYXRlZ29yeTo6TnVtYmVyT2ZDYXRlZ29yaWVzPiBkaXJ0eVBhZ2VzUGVy Q2F0ZWdvcnk7Ci0gICAgICAgICAgICBkaXJ0eVBhZ2VzUGVyQ2F0ZWdvcnkuZmlsbCgwKTsKKyAg ICAgICAgICAgIHN0ZDo6YXJyYXk8VGFnSW5mbywgTWVtb3J5Q2F0ZWdvcnk6Ok51bWJlck9mQ2F0 ZWdvcmllcz4gcGFnZXNQZXJDYXRlZ29yeTsKIAogICAgICAgICAgICAgc2l6ZV90IHRvdGFsRGly dHlQYWdlcyA9IDA7CiAgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgMjU2OyAr K2kpIHsKLSAgICAgICAgICAgICAgICBkaXJ0eVBhZ2VzUGVyQ2F0ZWdvcnlbY2F0ZWdvcnlGb3JW TVRhZyhpKV0gKz0gZGlydHlQYWdlc1tpXTsKLSAgICAgICAgICAgICAgICB0b3RhbERpcnR5UGFn ZXMgKz0gZGlydHlQYWdlc1tpXTsKKyAgICAgICAgICAgICAgICBwYWdlc1BlckNhdGVnb3J5W2Nh dGVnb3J5Rm9yVk1UYWcoaSldLmRpcnR5ICs9IHRhZ3NbaV0uZGlydHk7CisgICAgICAgICAgICAg ICAgcGFnZXNQZXJDYXRlZ29yeVtjYXRlZ29yeUZvclZNVGFnKGkpXS5yZWNsYWltYWJsZSArPSB0 YWdzW2ldLnJlY2xhaW1hYmxlOworICAgICAgICAgICAgICAgIHRvdGFsRGlydHlQYWdlcyArPSB0 YWdzW2ldLmRpcnR5OwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBmb3IgKGF1dG8mIGNh dGVnb3J5IDogZGF0YS5jYXRlZ29yaWVzKSB7CiAgICAgICAgICAgICAgICAgaWYgKGNhdGVnb3J5 LmlzU3ViY2F0ZWdvcnkpIC8vIE9ubHkgZG8gYXV0b21hdGljIHRhbGx5aW5nIGZvciB0b3AtbGV2 ZWwgY2F0ZWdvcmllcy4KICAgICAgICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAg ICAgICAgY2F0ZWdvcnkuaGlzdG9yeS5hcHBlbmQoZGlydHlQYWdlc1BlckNhdGVnb3J5W2NhdGVn b3J5LnR5cGVdICogdm1QYWdlU2l6ZSk7CisgICAgICAgICAgICAgICAgY2F0ZWdvcnkuaGlzdG9y eS5hcHBlbmQocGFnZXNQZXJDYXRlZ29yeVtjYXRlZ29yeS50eXBlXS5kaXJ0eSAqIHZtUGFnZVNp emUpOworICAgICAgICAgICAgICAgIGNhdGVnb3J5LnJlY2xhaW1hYmxlSGlzdG9yeS5hcHBlbmQo cGFnZXNQZXJDYXRlZ29yeVtjYXRlZ29yeS50eXBlXS5yZWNsYWltYWJsZSAqIHZtUGFnZVNpemUp OwogICAgICAgICAgICAgfQogICAgICAgICAgICAgZGF0YS50b3RhbERpcnR5LmFwcGVuZCh0b3Rh bERpcnR5UGFnZXMgKiB2bVBhZ2VTaXplKTsKIAo=