112864 2013-03-20 18:22:08 -0700 Make GraphicsLayerCA::backingStoreMemoryEstimate() give a better estimate for tiled layers 2013-03-20 23:02:05 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser simon.fraser thorton oldest_to_newest 859915 0 simon.fraser 2013-03-20 18:22:08 -0700 backingStoreMemoryEstimate() should actually ask the TiledBacking how much memory it's using in parented tiles. 860032 1 194184 simon.fraser 2013-03-20 22:30:43 -0700 Created attachment 194184 Patch 860047 2 simon.fraser 2013-03-20 23:02:05 -0700 http://trac.webkit.org/changeset/146438 194184 2013-03-20 22:30:43 -0700 2013-03-20 22:43:47 -0700 Patch bug-112864-20130320222631.patch text/plain 5197 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmVmMmNlMTA1YWJlMmNl ZDc2ZTRiYTE1MTBmNGEwZTlmYmEzN2JiNy4uNmUxMWY0ZmM5NTcyNDg3NzZlNTY5MzQyYjI0ZGQ2 MmRiMmI4OGJiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAzLTIwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgR3JhcGhp Y3NMYXllckNBOjpiYWNraW5nU3RvcmVNZW1vcnlFc3RpbWF0ZSgpIGdpdmUgYSBiZXR0ZXIgZXN0 aW1hdGUgZm9yIHRpbGVkIGxheWVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTEyODY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisgICAgICAgIAorICAgICAgICBJZiBhIEdyYXBoaWNzTGF5ZXJDQSBoYXMgVGlsZWRCYWNr aW5nLCBhc2sgdGhlIFRpbGVkQmFja2luZyBob3cKKyAgICAgICAgbXVjaCBtZW1vcnkgaXQncyB1 c2luZyBmb3IgdGlsZXMsIHJhdGhlciB0aGFuIGp1c3QgdXNpbmcgCisgICAgICAgIGhlaWdodCAq IHdpZHRoICogNC4KKyAgICAgICAgCisgICAgICAgIEltcGxlbWVudCByZXRhaW5lZFRpbGVCYWNr aW5nU3RvcmVNZW1vcnkoKSBpbiB0aGUgVGlsZUNvbnRyb2xsZXIsCisgICAgICAgIHN1bW1pbmcg dGhlIG1lbW9yeSB1c2VkIGJ5IHBhcmVudGVkIHRpbGVzLgorCisgICAgICAgIFRoZSBvcmlnaW5h bCBjb2RlIHdhcyBpbmNvcnJlY3RseSBtdWx0aXBseWluZyBieSBjb250ZW50c1NjYWxlCisgICAg ICAgIG9ubHkgb25jZSByYXRoZXIgdGhhbiB0d2ljZSAoMnggY29udGVudHMgc2NhbGUgdXNlcyA0 eCBhcyBtdWNoIG1lbW9yeSkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJh Y2tpbmcuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0Eu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNBOjpiYWNraW5nU3RvcmVNZW1v cnlFc3RpbWF0ZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVDb250 cm9sbGVyLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVDb250cm9s bGVyLm1tOgorICAgICAgICAoV2ViQ29yZTo6VGlsZUNvbnRyb2xsZXI6OnJldGFpbmVkVGlsZUJh Y2tpbmdTdG9yZU1lbW9yeSk6CisKIDIwMTMtMDMtMjAgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJl dmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIx NDY0MTkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxl ZEJhY2tpbmcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2lu Zy5oCmluZGV4IDVjNWNhNmJlN2FkZGZmOWQyN2UxNmY0MDIzYzFiMGYzOWRlNjlkNjguLmZmYTli YTk1M2U3MDdhODUyYTgxZTEwNjFlNTJmZjY5MDcyY2YyZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2luZy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2luZy5oCkBAIC03OSw2ICs3OSw4IEBAIHB1 YmxpYzoKICAgICAKICAgICB2aXJ0dWFsIHZvaWQgc2V0VW5wYXJlbnRzT2Zmc2NyZWVuVGlsZXMo Ym9vbCkgPSAwOwogICAgIHZpcnR1YWwgYm9vbCB1bnBhcmVudHNPZmZzY3JlZW5UaWxlcygpIGNv bnN0ID0gMDsKKyAgICAKKyAgICB2aXJ0dWFsIGRvdWJsZSByZXRhaW5lZFRpbGVCYWNraW5nU3Rv cmVNZW1vcnkoKSBjb25zdCA9IDA7CiAKICAgICAvLyBFeHBvc2VkIGZvciB0ZXN0aW5nCiAgICAg dmlydHVhbCBJbnRSZWN0IHRpbGVDb3ZlcmFnZVJlY3QoKSBjb25zdCA9IDA7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNw cAppbmRleCAxNmNiOWVjMjk1ZjJjN2Q2OTY0ZTUyOWYzNTIzNTIxY2YwNTQzNjFlLi5lMWZjNTA1 NzRkNGI4ZGZjMmQ1NDMwZjlkZDY1YzY1Y2MyMWRhMTk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAKQEAgLTMw MjcsOSArMzAyNywxNCBAQCBkb3VibGUgR3JhcGhpY3NMYXllckNBOjpiYWNraW5nU3RvcmVNZW1v cnlFc3RpbWF0ZSgpIGNvbnN0CiB7CiAgICAgaWYgKCFkcmF3c0NvbnRlbnQoKSkKICAgICAgICAg cmV0dXJuIDA7Ci0gICAgCisKICAgICAvLyBjb250ZW50c0xheWVyIGlzIGdpdmVuIHRvIHVzLCBz byB3ZSBkb24ndCByZWFsbHkga25vdyBhbnl0aGluZyBhYm91dCBpdHMgY29udGVudHMuCi0gICAg cmV0dXJuIHN0YXRpY19jYXN0PGRvdWJsZT4oNCAqIHNpemUoKS53aWR0aCgpKSAqIHNpemUoKS5o ZWlnaHQoKSAqIG1fbGF5ZXItPmNvbnRlbnRzU2NhbGUoKTsKKyAgICAvLyBGSVhNRTogaWdub3Jl cyBsYXllciBjbG9uZXMuCisgICAgCisgICAgaWYgKFRpbGVkQmFja2luZyogdGlsZWRCYWNraW5n ID0gdGhpcy0+dGlsZWRCYWNraW5nKCkpCisgICAgICAgIHJldHVybiB0aWxlZEJhY2tpbmctPnJl dGFpbmVkVGlsZUJhY2tpbmdTdG9yZU1lbW9yeSgpOworCisgICAgcmV0dXJuIDQuMCAqIHNpemUo KS53aWR0aCgpICogbV9sYXllci0+Y29udGVudHNTY2FsZSgpICogc2l6ZSgpLmhlaWdodCgpICog bV9sYXllci0+Y29udGVudHNTY2FsZSgpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUNv bnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxl Q29udHJvbGxlci5oCmluZGV4IDNjODNkY2Y5N2RmMzkyZmFkYThjNTFlMDdjMDVjODdjOWJiMTVi MmUuLjdhZDdhNDYyNGU2ZjZlMzA3ZDg4ZDIxNDY1ZWIwOGVjZTY0ZjM3YTYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ29udHJvbGxlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ29udHJv bGxlci5oCkBAIC0xMjMsNiArMTIzLDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgYWdn cmVzc2l2ZWx5UmV0YWluc1RpbGVzKCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gbV9hZ2dyZXNz aXZlbHlSZXRhaW5zVGlsZXM7IH0KICAgICB2aXJ0dWFsIHZvaWQgc2V0VW5wYXJlbnRzT2Zmc2Ny ZWVuVGlsZXMoYm9vbCBmbGFnKSBPVkVSUklERSB7IG1fdW5wYXJlbnRzT2Zmc2NyZWVuVGlsZXMg PSBmbGFnOyB9CiAgICAgdmlydHVhbCBib29sIHVucGFyZW50c09mZnNjcmVlblRpbGVzKCkgY29u c3QgT1ZFUlJJREUgeyByZXR1cm4gbV91bnBhcmVudHNPZmZzY3JlZW5UaWxlczsgfQorICAgIHZp cnR1YWwgZG91YmxlIHJldGFpbmVkVGlsZUJhY2tpbmdTdG9yZU1lbW9yeSgpIGNvbnN0IE9WRVJS SURFOwogICAgIHZpcnR1YWwgSW50UmVjdCB0aWxlQ292ZXJhZ2VSZWN0KCkgY29uc3QgT1ZFUlJJ REU7CiAgICAgdmlydHVhbCBDQUxheWVyICp0aWxlZFNjcm9sbGluZ0luZGljYXRvckxheWVyKCkg T1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHNldFNjcm9sbGluZ01vZGVJbmRpY2F0aW9uKFNj cm9sbGluZ01vZGVJbmRpY2F0aW9uKSBPVkVSUklERTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ29udHJvbGxlci5tbSBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ29udHJvbGxlci5tbQppbmRleCA5 YWY4YTg3MDNjZjhiZDZiODNlNjMzYWU3M2Y5MmYwZmUxNzVlMzAzLi44NjQzYzllMjg2OTUyNWFm YmQ0NDM3MWVkZWZkMDNkY2FhMDRlN2RmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUNvbnRyb2xsZXIubW0KKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVDb250cm9sbGVyLm1tCkBAIC04NzgsNiAr ODc4LDIyIEBAIEludFJlY3QgVGlsZUNvbnRyb2xsZXI6OnRpbGVHcmlkRXh0ZW50KCkgY29uc3QK ICAgICByZXR1cm4gSW50UmVjdCh0b3BMZWZ0LngoKSwgdG9wTGVmdC55KCksIGJvdHRvbVJpZ2h0 LngoKSAtIHRvcExlZnQueCgpICsgMSwgYm90dG9tUmlnaHQueSgpIC0gdG9wTGVmdC55KCkgKyAx KTsKIH0KIAorZG91YmxlIFRpbGVDb250cm9sbGVyOjpyZXRhaW5lZFRpbGVCYWNraW5nU3RvcmVN ZW1vcnkoKSBjb25zdAoreworICAgIGRvdWJsZSB0b3RhbEJ5dGVzID0gMDsKKyAgICAKKyAgICBm b3IgKFRpbGVNYXA6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV90aWxlcy5iZWdpbigpLCBlbmQgPSBt X3RpbGVzLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAgICAgICAgY29uc3QgVGlsZUluZm8m IHRpbGVJbmZvID0gaXQtPnZhbHVlOworICAgICAgICBpZiAoW3RpbGVJbmZvLmxheWVyLmdldCgp IHN1cGVybGF5ZXJdKSB7CisgICAgICAgICAgICBDR1JlY3QgYm91bmRzID0gW3RpbGVJbmZvLmxh eWVyLmdldCgpIGJvdW5kc107CisgICAgICAgICAgICBkb3VibGUgY29udGVudHNTY2FsZSA9IFt0 aWxlSW5mby5sYXllci5nZXQoKSBjb250ZW50c1NjYWxlXTsKKyAgICAgICAgICAgIHRvdGFsQnl0 ZXMgKz0gNCAqIGJvdW5kcy5zaXplLndpZHRoICogY29udGVudHNTY2FsZSAqIGJvdW5kcy5zaXpl LmhlaWdodCAqIGNvbnRlbnRzU2NhbGU7CisgICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4g dG90YWxCeXRlczsKK30KKwogLy8gUmV0dXJuIHRoZSByZWN0IGluIGxheWVyIGNvb3Jkcywgbm90 IHRpbGUgY29vcmRzLgogSW50UmVjdCBUaWxlQ29udHJvbGxlcjo6dGlsZUNvdmVyYWdlUmVjdCgp IGNvbnN0CiB7Cg==