90797 2012-07-09 09:45:25 -0700 [GTK] Implement disk cache in WebKit2 2012-07-13 06:47:21 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned danw gustavo mrobinson svillar xan.lopez oldest_to_newest 664920 0 cgarcia 2012-07-09 09:45:25 -0700 We currently set the disk cache size to the soup cache feature if it's present in the SoupSession, but it never happens because we are not adding the feature to the session. 664925 1 151262 cgarcia 2012-07-09 09:49:54 -0700 Created attachment 151262 Patch 664935 2 mrobinson 2012-07-09 10:07:01 -0700 I think it makes sense for Sergio and Dan to look this one over too. 665721 3 danw 2012-07-10 06:32:46 -0700 makes sense to me 668884 4 151262 xan.lopez 2012-07-13 04:54:27 -0700 Comment on attachment 151262 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=151262&action=review > Source/WebKit2/WebProcess/gtk/WebProcessGtk.cpp:92 > + uint64_t diskFreeSize = getCacheDiskFreeSize(cache) / 1024 / 1024; Apparently this was a previously existing bug. Just leave it as it is for this patch and fix it later in another patch, otherwise it's unclear why you are doing this. 668974 5 cgarcia 2012-07-13 06:47:21 -0700 Committed r122571: <http://trac.webkit.org/changeset/122571> 151262 2012-07-09 09:49:54 -0700 2012-07-13 04:54:27 -0700 Patch wk2-disk-cache.diff text/plain 5302 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2NDgzYWRkLi5lMTcxMGZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjYg QEAKIDIwMTItMDctMDkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIEltcGxlbWVudCBkaXNrIGNhY2hlIGluIFdlYktpdDIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkwNzk3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL2d0 ay9XZWJQcm9jZXNzR3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Z2V0Q2FjaGVEaXNrRnJlZVNp emUpOiBVc2UgYW4gQVNTRVJUIGluc3RlYWQgb2YgYW4gZWFybHkKKyAgICAgICAgcmV0dXJuIHNp bmNlIHRoZSBjYWNoZSBmZWF0dXJlIGlzIG5vdyBhbHdheXMgYWRkZWQgdG8gdGhlIHNlc3Npb24u CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnBsYXRmb3JtU2V0Q2FjaGVNb2RlbCk6IEdl dCB0aGUgY2FjaGUgZnJvbQorICAgICAgICB0aGUgc2Vzc2lvbiBhbmQgc2V0IHRoZSBtYXhpbXVt IGNhY2hlIHNpemUgYXMgY29tcHV0ZWQgYnkKKyAgICAgICAgY2FsY3VsYXRlQ2FjaGVTaXplcygp LgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpwbGF0Zm9ybUNsZWFyUmVzb3VyY2VDYWNo ZXMpOiBDYWxsCisgICAgICAgIHNvdXBfY2FjaGVfY2xlYXIoKS4KKyAgICAgICAgKFdlYktpdDo6 V2ViUHJvY2Vzczo6cGxhdGZvcm1UZXJtaW5hdGUpOiBNYWtlIHN1cmUgYWxsIHBlbmRpbmcKKyAg ICAgICAgZGF0YSBpcyBzYXZlZCB0byB0aGUgZGlzayBiZWZvcmUgdGhlIHdlYiBwcm9jZXNzIGZp bmlzaGVzLgorICAgICAgICAqIFdlYlByb2Nlc3MvZ3RrL1dlYlByb2Nlc3NNYWluR3RrLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc01haW5HdGspOiBDcmVhdGUgYSBTb3VwQ2FjaGUg ZmVhdHVyZSBhbmQgYWRkIGl0CisgICAgICAgIHRvIHRoZSBkZWZhdWx0IFNvdXBTZXNzaW9uLgor CisyMDEyLTA3LTA5ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K KwogICAgICAgICBbR1RLXSBGaXggaW5zcGVjdG9yIGRldGFjaCB3aGVuIGluc3BlY3RvciB3YXMg YXR0YWNoZWQgYnkgdGhlIGNsaWVudAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9OTA3NjMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9ndGsvV2ViUHJvY2Vzc0d0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2d0 ay9XZWJQcm9jZXNzR3RrLmNwcAppbmRleCBmNDU2NmQzLi5kOGQwMTY3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2d0ay9XZWJQcm9jZXNzR3RrLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2d0ay9XZWJQcm9jZXNzR3RrLmNwcApAQCAtNDcsOCArNDcs NyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogc3RhdGljIHVpbnQ2NF90IGdldENhY2hlRGlza0Zy ZWVTaXplKFNvdXBDYWNoZSogY2FjaGUpCiB7Ci0gICAgaWYgKCFjYWNoZSkKLSAgICAgICAgcmV0 dXJuIDA7CisgICAgQVNTRVJUKGNhY2hlKTsKIAogICAgIEdPd25QdHI8Y2hhcj4gY2FjaGVEaXI7 CiAgICAgZ19vYmplY3RfZ2V0KEdfT0JKRUNUKGNhY2hlKSwgImNhY2hlLWRpciIsICZjYWNoZURp ci5vdXRQdHIoKSwgTlVMTCk7CkBAIC04OSw4ICs4OCw4IEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxh dGZvcm1TZXRDYWNoZU1vZGVsKENhY2hlTW9kZWwgY2FjaGVNb2RlbCkKICAgICB1bnNpZ25lZCBs b25nIHVybENhY2hlRGlza0NhcGFjaXR5ID0gMDsKIAogICAgIFNvdXBTZXNzaW9uKiBzZXNzaW9u ID0gV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OmRlZmF1bHRTZXNzaW9uKCk7Ci0gICAgU291cENh Y2hlKiBjYWNoZSA9IHJlaW50ZXJwcmV0X2Nhc3Q8U291cENhY2hlKj4oc291cF9zZXNzaW9uX2dl dF9mZWF0dXJlKHNlc3Npb24sIFNPVVBfVFlQRV9DQUNIRSkpOwotICAgIHVpbnQ2NF90IGRpc2tG cmVlU2l6ZSA9IGdldENhY2hlRGlza0ZyZWVTaXplKGNhY2hlKTsKKyAgICBTb3VwQ2FjaGUqIGNh Y2hlID0gU09VUF9DQUNIRShzb3VwX3Nlc3Npb25fZ2V0X2ZlYXR1cmUoc2Vzc2lvbiwgU09VUF9U WVBFX0NBQ0hFKSk7CisgICAgdWludDY0X3QgZGlza0ZyZWVTaXplID0gZ2V0Q2FjaGVEaXNrRnJl ZVNpemUoY2FjaGUpIC8gMTAyNCAvIDEwMjQ7CiAKICAgICB1aW50NjRfdCBtZW1TaXplID0gZ2V0 TWVtb3J5U2l6ZSgpOwogICAgIGNhbGN1bGF0ZUNhY2hlU2l6ZXMoY2FjaGVNb2RlbCwgbWVtU2l6 ZSwgZGlza0ZyZWVTaXplLApAQCAtMTAxLDE1ICsxMDAsMTcgQEAgdm9pZCBXZWJQcm9jZXNzOjpw bGF0Zm9ybVNldENhY2hlTW9kZWwoQ2FjaGVNb2RlbCBjYWNoZU1vZGVsKQogICAgIFdlYkNvcmU6 Om1lbW9yeUNhY2hlKCktPnNldERlYWREZWNvZGVkRGF0YURlbGV0aW9uSW50ZXJ2YWwoZGVhZERl Y29kZWREYXRhRGVsZXRpb25JbnRlcnZhbCk7CiAgICAgV2ViQ29yZTo6cGFnZUNhY2hlKCktPnNl dENhcGFjaXR5KHBhZ2VDYWNoZUNhcGFjaXR5KTsKIAotICAgIGlmIChjYWNoZSkgewotICAgICAg ICBpZiAodXJsQ2FjaGVEaXNrQ2FwYWNpdHkgPiBzb3VwX2NhY2hlX2dldF9tYXhfc2l6ZShjYWNo ZSkpCi0gICAgICAgICAgICBzb3VwX2NhY2hlX3NldF9tYXhfc2l6ZShjYWNoZSwgdXJsQ2FjaGVE aXNrQ2FwYWNpdHkpOwotICAgIH0KKyAgICBpZiAodXJsQ2FjaGVEaXNrQ2FwYWNpdHkgPiBzb3Vw X2NhY2hlX2dldF9tYXhfc2l6ZShjYWNoZSkpCisgICAgICAgIHNvdXBfY2FjaGVfc2V0X21heF9z aXplKGNhY2hlLCB1cmxDYWNoZURpc2tDYXBhY2l0eSk7CiB9CiAKLXZvaWQgV2ViUHJvY2Vzczo6 cGxhdGZvcm1DbGVhclJlc291cmNlQ2FjaGVzKFJlc291cmNlQ2FjaGVzVG9DbGVhcikKK3ZvaWQg V2ViUHJvY2Vzczo6cGxhdGZvcm1DbGVhclJlc291cmNlQ2FjaGVzKFJlc291cmNlQ2FjaGVzVG9D bGVhciBjYWNoZXNUb0NsZWFyKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgaWYgKGNh Y2hlc1RvQ2xlYXIgPT0gSW5NZW1vcnlSZXNvdXJjZUNhY2hlc09ubHkpCisgICAgICAgIHJldHVy bjsKKworICAgIFNvdXBTZXNzaW9uKiBzZXNzaW9uID0gV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6 OmRlZmF1bHRTZXNzaW9uKCk7CisgICAgc291cF9jYWNoZV9jbGVhcihTT1VQX0NBQ0hFKHNvdXBf c2Vzc2lvbl9nZXRfZmVhdHVyZShzZXNzaW9uLCBTT1VQX1RZUEVfQ0FDSEUpKSk7CiB9CiAKIHZv aWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyhjb25zdCBXZWJQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKikKQEAgLTEx OSw2ICsxMjAsMTAgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9j ZXNzKGNvbnN0IFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMKIAogdm9pZCBXZWJQcm9jZXNz OjpwbGF0Zm9ybVRlcm1pbmF0ZSgpCiB7CisgICAgU291cFNlc3Npb24qIHNlc3Npb24gPSBXZWJD b3JlOjpSZXNvdXJjZUhhbmRsZTo6ZGVmYXVsdFNlc3Npb24oKTsKKyAgICBTb3VwQ2FjaGUqIGNh Y2hlID0gU09VUF9DQUNIRShzb3VwX3Nlc3Npb25fZ2V0X2ZlYXR1cmUoc2Vzc2lvbiwgU09VUF9U WVBFX0NBQ0hFKSk7CisgICAgc291cF9jYWNoZV9mbHVzaChjYWNoZSk7CisgICAgc291cF9jYWNo ZV9kdW1wKGNhY2hlKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2d0ay9XZWJQcm9jZXNzTWFpbkd0ay5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2d0ay9XZWJQcm9jZXNzTWFpbkd0ay5jcHAKaW5kZXggNDVi ODU4MS4uMTk5OTU3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9ndGsv V2ViUHJvY2Vzc01haW5HdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvZ3Rr L1dlYlByb2Nlc3NNYWluR3RrLmNwcApAQCAtMjcsNiArMjcsOCBAQAogI2luY2x1ZGUgImNvbmZp Zy5oIgogI2luY2x1ZGUgIldlYlByb2Nlc3NNYWluR3RrLmgiCiAKKyNkZWZpbmUgTElCU09VUF9V U0VfVU5TVEFCTEVfUkVRVUVTVF9BUEkKKwogI2luY2x1ZGUgIldlYkF1dGhEaWFsb2cuaCIKICNp bmNsdWRlICJXS0Jhc2UuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0d0a0F1dGhlbnRpY2F0aW9uRGlh bG9nLmg+CkBAIC0zNCw5ICszNiwxMiBAQAogI2luY2x1ZGUgPFdlYkNvcmUvUnVuTG9vcC5oPgog I2luY2x1ZGUgPFdlYktpdDIvV2ViUHJvY2Vzcy5oPgogI2luY2x1ZGUgPGd0ay9ndGsuaD4KKyNp bmNsdWRlIDxsaWJzb3VwL3NvdXAtY2FjaGUuaD4KICNpbmNsdWRlIDxydW50aW1lL0luaXRpYWxp emVUaHJlYWRpbmcuaD4KICNpbmNsdWRlIDx1bmlzdGQuaD4KICNpbmNsdWRlIDx3dGYvTWFpblRo cmVhZC5oPgorI2luY2x1ZGUgPHd0Zi9nb2JqZWN0L0dPd25QdHIuaD4KKyNpbmNsdWRlIDx3dGYv Z29iamVjdC9HUmVmUHRyLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCkBAIC03MCw2 ICs3NSwxMSBAQCBXS19FWFBPUlQgaW50IFdlYlByb2Nlc3NNYWluR3RrKGludCBhcmdjLCBjaGFy KiBhcmd2W10pCiAgICAgZ19vYmplY3Rfc2V0KHNlc3Npb24sIFNPVVBfU0VTU0lPTl9TU0xfVVNF X1NZU1RFTV9DQV9GSUxFLCBUUlVFLAogICAgICAgICAgICAgICAgICBTT1VQX1NFU1NJT05fU1NM X1NUUklDVCwgRkFMU0UsIE5VTEwpOwogCisgICAgR093blB0cjxjaGFyPiBzb3VwQ2FjaGVEaXJl Y3RvcnkoZ19idWlsZF9maWxlbmFtZShnX2dldF91c2VyX2NhY2hlX2RpcigpLCBnX2dldF9wcmdu YW1lKCksIE5VTEwpKTsKKyAgICBHUmVmUHRyPFNvdXBDYWNoZT4gc291cENhY2hlID0gYWRvcHRH UmVmKHNvdXBfY2FjaGVfbmV3KHNvdXBDYWNoZURpcmVjdG9yeS5nZXQoKSwgU09VUF9DQUNIRV9T SU5HTEVfVVNFUikpOworICAgIHNvdXBfc2Vzc2lvbl9hZGRfZmVhdHVyZShzZXNzaW9uLCBTT1VQ X1NFU1NJT05fRkVBVFVSRShzb3VwQ2FjaGUuZ2V0KCkpKTsKKyAgICBzb3VwX2NhY2hlX2xvYWQo c291cENhY2hlLmdldCgpKTsKKwogICAgIFJ1bkxvb3A6OnJ1bigpOwogCiAgICAgcmV0dXJuIDA7 Cg==