134811 2014-07-10 13:07:03 -0700 [iOS WebKit2] Some memory pressure relief tweaks. 2014-07-10 13:26:27 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling barraclough benjamin kling oldest_to_newest 1021688 0 kling 2014-07-10 13:07:03 -0700 [iOS WebKit2] Some memory pressure relief tweaks. 1021689 1 234722 kling 2014-07-10 13:07:34 -0700 Created attachment 234722 Patch 1021690 2 234722 ggaren 2014-07-10 13:12:52 -0700 Comment on attachment 234722 Patch r=me 1021692 3 kling 2014-07-10 13:26:27 -0700 Committed r170973: <http://trac.webkit.org/changeset/170973> 234722 2014-07-10 13:07:34 -0700 2014-07-10 13:12:52 -0700 Patch bug-134811.diff text/plain 6096 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3NDFmMDYxLi5jNzI4NmY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTQtMDctMTAgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFtpT1MgV2ViS2l0Ml0gU29tZSBtZW1vcnkgcHJlc3N1cmUgcmVsaWVmIHR3ZWFrcy4KKyAg ICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEzNDgxMT4KKworICAgICAgICBTcGxpdCBtZW1v cnkgcHJlc3N1cmUgcmVsaWVmIGludG8gY3JpdGljYWwgYW5kIG5vbi1jcml0aWNhbCBzZWN0aW9u cy4KKyAgICAgICAgTm9uLWNyaXRpY2FsIHJlbGllZiBpcyBmb3IgY2xlYXJpbmcgb3V0IHRoaW5n cyB0aGF0IGFyZSByZWFsbHkgbm90CisgICAgICAgIGVzc2VudGlhbCwgZS5nIHVudXNlZCBmb250 IGRhdGEsIHRleHQgbWVhc3VyZW1lbnQgY2FjaGVzLCBldGMuCisKKyAgICAgICAgT24gaU9TLCBv bmx5IGZsaXAgdGhlICJXZWJLaXQgaXMgdW5kZXIgbWVtb3J5IHByZXNzdXJlIiBmbGFnIHdoZW4g d2UKKyAgICAgICAgYXJlIHVuZGVyICpjcml0aWNhbCogbWVtcm95IHByZXNzdXJlLCByYXRoZXIg dGhhbiBkb2luZyBpdCBlYXJseSBvbgorICAgICAgICBhbmQgZ2ltcGluZyBvdXJzZWx2ZXMgYmVj YXVzZSBvdGhlciBwcm9jZXNzZXMgYXJlIHRvbyBiaWcuCisKKyAgICAgICAgQWxzbyBhZGRlZCBs b2dnaW5nIGZvciB3aGVuIHdlIHRyYW5zaXRpb24gaW4vb3V0IG9mIHN5c3RlbSBwcmVzc3VyZS4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRm b3JtL01lbW9yeVByZXNzdXJlSGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlQ cmVzc3VyZUhhbmRsZXI6OnJlbGVhc2VOb25jcml0aWNhbE1lbW9yeSk6CisgICAgICAgIChXZWJD b3JlOjpNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnJlbGVhc2VDcml0aWNhbE1lbW9yeSk6CisgICAg ICAgIChXZWJDb3JlOjpNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnJlbGVhc2VNZW1vcnkpOgorICAg ICAgICAqIHBsYXRmb3JtL01lbW9yeVByZXNzdXJlSGFuZGxlci5oOgorICAgICAgICAoV2ViQ29y ZTo6TWVtb3J5UHJlc3N1cmVIYW5kbGVyOjpSZWxpZWZMb2dnZXI6OmxvZ2dpbmdFbmFibGVkKToK KyAgICAgICAgKiBwbGF0Zm9ybS9jb2NvYS9NZW1vcnlQcmVzc3VyZUhhbmRsZXJDb2NvYS5tbToK KyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeVByZXNzdXJlSGFuZGxlcjo6aW5zdGFsbCk6CisKIDIw MTQtMDctMTAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFBo b25lIG51bWJlciBoaWdobGlnaHRzIHNob3VsZCBhbHdheXMgYmUgdmlzaWJsZSBpZiB0aGUgbW91 c2UgaG92ZXJzIG92ZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NZW1v cnlQcmVzc3VyZUhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5UHJl c3N1cmVIYW5kbGVyLmNwcAppbmRleCBkNTIwMmRiLi5jZDc1NzVlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL01lbW9yeVByZXNzdXJlSGFuZGxlci5jcHAKQEAgLTY4LDcgKzY4 LDMxIEBAIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6TWVtb3J5UHJlc3N1cmVIYW5kbGVyKCkKIHsK IH0KIAotdm9pZCBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnJlbGVhc2VNZW1vcnkoYm9vbCBjcml0 aWNhbCkKK3ZvaWQgTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjpyZWxlYXNlTm9uY3JpdGljYWxNZW1v cnkoKQoreworICAgIHsKKyAgICAgICAgUmVsaWVmTG9nZ2VyIGxvZygiUHVyZ2UgaW5hY3RpdmUg Rm9udERhdGEiKTsKKyAgICAgICAgZm9udENhY2hlKCkucHVyZ2VJbmFjdGl2ZUZvbnREYXRhKCk7 CisgICAgfQorCisgICAgeworICAgICAgICBSZWxpZWZMb2dnZXIgbG9nKCJDbGVhciBXaWR0aENh Y2hlcyIpOworICAgICAgICBjbGVhcldpZHRoQ2FjaGVzKCk7CisgICAgfQorCisgICAgeworICAg ICAgICBSZWxpZWZMb2dnZXIgbG9nKCJEaXNjYXJkIFNlbGVjdG9yIFF1ZXJ5IENhY2hlIik7Cisg ICAgICAgIGZvciAoYXV0byogZG9jdW1lbnQgOiBEb2N1bWVudDo6YWxsRG9jdW1lbnRzKCkpCisg ICAgICAgICAgICBkb2N1bWVudC0+Y2xlYXJTZWxlY3RvclF1ZXJ5Q2FjaGUoKTsKKyAgICB9CisK KyAgICB7CisgICAgICAgIFJlbGllZkxvZ2dlciBsb2coIkNsZWFyaW5nIEpTIHN0cmluZyBjYWNo ZSIpOworICAgICAgICBKU0RPTVdpbmRvdzo6Y29tbW9uVk0oKS5zdHJpbmdDYWNoZS5jbGVhcigp OworICAgIH0KK30KKwordm9pZCBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnJlbGVhc2VDcml0aWNh bE1lbW9yeSgpCiB7CiAgICAgewogICAgICAgICBSZWxpZWZMb2dnZXIgbG9nKCJFbXB0eSB0aGUg UGFnZUNhY2hlIik7CkBAIC03OCwxMSArMTAyLDYgQEAgdm9pZCBNZW1vcnlQcmVzc3VyZUhhbmRs ZXI6OnJlbGVhc2VNZW1vcnkoYm9vbCBjcml0aWNhbCkKICAgICB9CiAKICAgICB7Ci0gICAgICAg IFJlbGllZkxvZ2dlciBsb2coIlB1cmdlIGluYWN0aXZlIEZvbnREYXRhIik7Ci0gICAgICAgIGZv bnRDYWNoZSgpLnB1cmdlSW5hY3RpdmVGb250RGF0YSgpOwotICAgIH0KLQotICAgIHsKICAgICAg ICAgUmVsaWVmTG9nZ2VyIGxvZygiUHJ1bmUgTWVtb3J5Q2FjaGUiKTsKICAgICAgICAgbWVtb3J5 Q2FjaGUoKS0+cHJ1bmVUb1BlcmNlbnRhZ2UoMCk7CiAgICAgfQpAQCAtOTMsMzEgKzExMiwyMyBA QCB2b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6cmVsZWFzZU1lbW9yeShib29sIGNyaXRpY2Fs KQogICAgIH0KIAogICAgIHsKLSAgICAgICAgUmVsaWVmTG9nZ2VyIGxvZygiQ2xlYXIgV2lkdGhD YWNoZXMiKTsKLSAgICAgICAgY2xlYXJXaWR0aENhY2hlcygpOwotICAgIH0KLQotICAgIHsKICAg ICAgICAgUmVsaWVmTG9nZ2VyIGxvZygiRGlzY2FyZCBTdHlsZVJlc29sdmVycyIpOwogICAgICAg ICBmb3IgKGF1dG8qIGRvY3VtZW50IDogRG9jdW1lbnQ6OmFsbERvY3VtZW50cygpKQogICAgICAg ICAgICAgZG9jdW1lbnQtPmNsZWFyU3R5bGVSZXNvbHZlcigpOwogICAgIH0KIAogICAgIHsKLSAg ICAgICAgUmVsaWVmTG9nZ2VyIGxvZygiRGlzY2FyZCBTZWxlY3RvciBRdWVyeSBDYWNoZSIpOwot ICAgICAgICBmb3IgKGF1dG8qIGRvY3VtZW50IDogRG9jdW1lbnQ6OmFsbERvY3VtZW50cygpKQot ICAgICAgICAgICAgZG9jdW1lbnQtPmNsZWFyU2VsZWN0b3JRdWVyeUNhY2hlKCk7Ci0gICAgfQot Ci0gICAgewogICAgICAgICBSZWxpZWZMb2dnZXIgbG9nKCJEaXNjYXJkIGFsbCBKSVQtY29tcGls ZWQgY29kZSIpOwogICAgICAgICBnY0NvbnRyb2xsZXIoKS5kaXNjYXJkQWxsQ29tcGlsZWRDb2Rl KCk7CiAgICAgfQorfQogCi0gICAgewotICAgICAgICBSZWxpZWZMb2dnZXIgbG9nKCJDbGVhcmlu ZyBKUyBzdHJpbmcgY2FjaGUiKTsKLSAgICAgICAgSlNET01XaW5kb3c6OmNvbW1vblZNKCkuc3Ry aW5nQ2FjaGUuY2xlYXIoKTsKLSAgICB9Cit2b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6cmVs ZWFzZU1lbW9yeShib29sIGNyaXRpY2FsKQoreworICAgIHJlbGVhc2VOb25jcml0aWNhbE1lbW9y eSgpOworCisgICAgaWYgKGNyaXRpY2FsKQorICAgICAgICByZWxlYXNlQ3JpdGljYWxNZW1vcnko KTsKIAogICAgIHBsYXRmb3JtUmVsZWFzZU1lbW9yeShjcml0aWNhbCk7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL01lbW9yeVByZXNzdXJlSGFuZGxlci5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5UHJlc3N1cmVIYW5kbGVyLmgKaW5kZXggODNjODEyZi4u Mjc2ZDk1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5UHJlc3N1 cmVIYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5UHJlc3N1cmVI YW5kbGVyLmgKQEAgLTg3LDYgKzg3LDcgQEAgcHVibGljOgogCiAgICAgICAgIGNvbnN0IGNoYXIq IGxvZ1N0cmluZygpIGNvbnN0IHsgcmV0dXJuIG1fbG9nU3RyaW5nOyB9CiAgICAgICAgIHN0YXRp YyB2b2lkIHNldExvZ2dpbmdFbmFibGVkKGJvb2wgZW5hYmxlZCkgeyBzX2xvZ2dpbmdFbmFibGVk ID0gZW5hYmxlZDsgfQorICAgICAgICBzdGF0aWMgYm9vbCBsb2dnaW5nRW5hYmxlZCgpIHsgcmV0 dXJuIHNfbG9nZ2luZ0VuYWJsZWQ7IH0KIAogICAgIHByaXZhdGU6CiAgICAgICAgIHNpemVfdCBw bGF0Zm9ybU1lbW9yeVVzYWdlKCk7CkBAIC0xMDEsNiArMTAyLDkgQEAgcHVibGljOgogICAgIHN0 YXRpYyB2b2lkIHJlbGVhc2VNZW1vcnkoYm9vbCBjcml0aWNhbCk7CiAKIHByaXZhdGU6CisgICAg c3RhdGljIHZvaWQgcmVsZWFzZU5vbmNyaXRpY2FsTWVtb3J5KCk7CisgICAgc3RhdGljIHZvaWQg cmVsZWFzZUNyaXRpY2FsTWVtb3J5KCk7CisKICAgICB2b2lkIHVuaW5zdGFsbCgpOwogCiAgICAg dm9pZCBob2xkT2ZmKHVuc2lnbmVkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2NvY29hL01lbW9yeVByZXNzdXJlSGFuZGxlckNvY29hLm1tIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vY29jb2EvTWVtb3J5UHJlc3N1cmVIYW5kbGVyQ29jb2EubW0KaW5kZXggZTdkZGQz NS4uYTczM2VhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvTWVt b3J5UHJlc3N1cmVIYW5kbGVyQ29jb2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Y29jb2EvTWVtb3J5UHJlc3N1cmVIYW5kbGVyQ29jb2EubW0KQEAgLTk2LDExICs5NiwxNiBAQCB2 b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6aW5zdGFsbCgpCiAjaWYgUExBVEZPUk0oSU9TKSAm JiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSA4MDAwMAogICAgICAgICAgICAg ICAgIHVuc2lnbmVkIGxvbmcgc3RhdHVzID0gZGlzcGF0Y2hfc291cmNlX2dldF9kYXRhKF9jYWNo ZV9ldmVudF9zb3VyY2UpOwogICAgICAgICAgICAgICAgIGNyaXRpY2FsID0gc3RhdHVzID09IERJ U1BBVENIX01FTU9SWVBSRVNTVVJFX0NSSVRJQ0FMOworICAgICAgICAgICAgICAgIGJvb2wgd2Fz Q3JpdGljYWwgPSBtZW1vcnlQcmVzc3VyZUhhbmRsZXIoKS5pc1VuZGVyTWVtb3J5UHJlc3N1cmUo KTsKKyAgICAgICAgICAgICAgICBtZW1vcnlQcmVzc3VyZUhhbmRsZXIoKS5zZXRVbmRlck1lbW9y eVByZXNzdXJlKGNyaXRpY2FsKTsKICAgICAgICAgICAgICAgICBpZiAoc3RhdHVzID09IERJU1BB VENIX01FTU9SWVNUQVRVU19QUkVTU1VSRV9OT1JNQUwpIHsKLSAgICAgICAgICAgICAgICAgICAg bWVtb3J5UHJlc3N1cmVIYW5kbGVyKCkuc2V0VW5kZXJNZW1vcnlQcmVzc3VyZShmYWxzZSk7Cisg ICAgICAgICAgICAgICAgICAgIGlmIChSZWxpZWZMb2dnZXI6OmxvZ2dpbmdFbmFibGVkKCkpCisg ICAgICAgICAgICAgICAgICAgICAgICBOU0xvZyhAIlN5c3RlbSBpcyBubyBsb25nZXIgdW5kZXIg KCVzKSBtZW1vcnkgcHJlc3N1cmUuIiwgd2FzQ3JpdGljYWwgPyAiY3JpdGljYWwiIDogIm5vbi1j cml0aWNhbCIpOwogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICAgICAg fQotICAgICAgICAgICAgICAgIG1lbW9yeVByZXNzdXJlSGFuZGxlcigpLnNldFVuZGVyTWVtb3J5 UHJlc3N1cmUodHJ1ZSk7CisKKyAgICAgICAgICAgICAgICBpZiAoUmVsaWVmTG9nZ2VyOjpsb2dn aW5nRW5hYmxlZCgpKQorICAgICAgICAgICAgICAgICAgICBOU0xvZyhAIkdvdCBtZW1vcnkgcHJl c3N1cmUgbm90aWZpY2F0aW9uICglcykiLCBjcml0aWNhbCA/ICJjcml0aWNhbCIgOiAibm9uLWNy aXRpY2FsIik7CiAjZW5kaWYKICAgICAgICAgICAgICAgICBtZW1vcnlQcmVzc3VyZUhhbmRsZXIo KS5yZXNwb25kVG9NZW1vcnlQcmVzc3VyZShjcml0aWNhbCk7CiAgICAgICAgICAgICB9KTsK