157779 2016-05-16 18:42:52 -0700 BitmapImage::destroyDecodedDataIfNecessary() should only count frames with image data 2016-05-17 14:28:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser dino sabouhallawa simon.fraser thorton oldest_to_newest 1193661 0 simon.fraser 2016-05-16 18:42:52 -0700 BitmapImage::destroyDecodedDataIfNecessary() should only count frames with image data 1193663 1 279080 simon.fraser 2016-05-16 18:51:00 -0700 Created attachment 279080 Patch 1193665 2 279080 sabouhallawa 2016-05-16 19:05:08 -0700 Comment on attachment 279080 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=279080&action=review Unofficial r=me > Source/WebCore/platform/graphics/BitmapImage.h:90 > + unsigned usedFrameBytes() const { return m_image ? m_frameBytes : 0; } Do we need to call it usedFrameBytes()? Should not it be just named frameBytes()? I think it supposed to return the bytes of the image stored in this frame. So if the image is nil the frameBytes should be zero. 1193666 3 simon.fraser 2016-05-16 19:07:09 -0700 (In reply to comment #2) > Comment on attachment 279080 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=279080&action=review > > Unofficial r=me > > > Source/WebCore/platform/graphics/BitmapImage.h:90 > > + unsigned usedFrameBytes() const { return m_image ? m_frameBytes : 0; } > > Do we need to call it usedFrameBytes()? Should not it be just named > frameBytes()? I think it supposed to return the bytes of the image stored in > this frame. So if the image is nil the frameBytes should be zero. I think it needs to be disambiguate from height*width*4 which we get from metadata. In reality, all callers but the one I changed check m_image too. 1193985 4 simon.fraser 2016-05-17 14:28:19 -0700 http://trac.webkit.org/changeset/201043 279080 2016-05-16 18:51:00 -0700 2016-05-17 13:45:36 -0700 Patch bug-157779-20160516185156.patch text/plain 3521 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwOTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmM3ODBmMWM1ZTI0NWE0 OGI5NzlmNDU0ZjdhNTA5ZjNmY2Q0NmQzZi4uYTM3MDZjNTVjZTdlMmM5YzNlODAzZjExZTA3ZTE2 ZmM5Zjk2OTgyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE2LTA1LTE2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEJpdG1hcEltYWdl OjpkZXN0cm95RGVjb2RlZERhdGFJZk5lY2Vzc2FyeSgpIHNob3VsZCBvbmx5IGNvdW50IGZyYW1l cyB3aXRoIGltYWdlIGRhdGEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1Nzc3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEJpdG1hcEltYWdlOjpkZXN0cm95RGVjb2RlZERhdGFJZk5lY2Vzc2FyeSgpIHRo cm93cyBhd2F5IGFsbCBmcmFtZXMgb2YgYW4gaW1hZ2UgaWYgdGhlCisgICAgICAgIGRlY29kZWQg ZnJhbWUgc2l6ZSBleGNlZWRzIGEgdGhyZXNob2xkLiBIb3dldmVyLCBpdCBjb3VudHMgYWxsIGZy YW1lcywgd2hldGhlciBvciBub3QKKyAgICAgICAgdGhleSBoYXZlIGFuIGltYWdlIChzb21lIGZy YW1lcyBtYXkgb25seSBoYXZlIG1ldGFkYXRhLCBidXQgbV9mcmFtZUJ5dGVzIHN0aWxsIHJldHVy bnMKKyAgICAgICAgaGVpZ2h0KndpZHRoKjQpLgorCisgICAgICAgIEZpeCBieSBvbmx5IGNvdW50 IG1fZnJhbWVCeXRlcyBmb3IgZnJhbWVzIHRoYXQgaGF2ZSBhbiBpbWFnZS4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkJp dG1hcEltYWdlOjpkZXN0cm95RGVjb2RlZERhdGFJZk5lY2Vzc2FyeSk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lRGF0 YTo6RnJhbWVEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lRGF0YTo6dXNlZEZyYW1lQnl0 ZXMpOgorCiAyMDE2LTA1LTE2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAg ICAgICAgUmVuZGVyTGF5ZXI6OmhpdFRlc3RMaXN0IGNvdWxkIG11dGF0ZSB0aGUgbGlzdCBvZiBj YW5kaWRhdGUgbGF5ZXJzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvQml0bWFwSW1hZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Qml0bWFwSW1hZ2UuY3BwCmluZGV4IDc3YjMyMWZjZTQ1YWRhYjU1YzJkMzI0ZjJkYTY0MmFlZmUx YzY1Y2IuLjBhMjRiODFhYmJkNGNkYTAxZjM2OTg3MTdhNzliMzdkMmRhMTg1MWIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFnZS5jcHAKQEAgLTE1 Nyw3ICsxNTcsNyBAQCB2b2lkIEJpdG1hcEltYWdlOjpkZXN0cm95RGVjb2RlZERhdGFJZk5lY2Vz c2FyeShib29sIGRlc3Ryb3lBbGwpCiAKICAgICB1bnNpZ25lZCBhbGxGcmFtZUJ5dGVzID0gMDsK ICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fZnJhbWVzLnNpemUoKTsgKytpKQotICAgICAg ICBhbGxGcmFtZUJ5dGVzICs9IG1fZnJhbWVzW2ldLm1fZnJhbWVCeXRlczsKKyAgICAgICAgYWxs RnJhbWVCeXRlcyArPSBtX2ZyYW1lc1tpXS51c2VkRnJhbWVCeXRlcygpOwogCiAgICAgaWYgKGFs bEZyYW1lQnl0ZXMgPiBsYXJnZUFuaW1hdGlvbkN1dG9mZikgewogICAgICAgICBMT0coSW1hZ2Vz LCAiQml0bWFwSW1hZ2UgJXAgZGVzdHJveURlY29kZWREYXRhSWZOZWNlc3NhcnkgZGVzdHJ5aW5n RGF0YTogYWxsRnJhbWVCeXRlcz0ldSBjdXRvZmY9JXUiLCB0aGlzLCBhbGxGcmFtZUJ5dGVzLCBs YXJnZUFuaW1hdGlvbkN1dG9mZik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9CaXRtYXBJbWFnZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvQml0bWFwSW1hZ2UuaAppbmRleCA1MDkzYTY2MWRlYjFlM2U3ZWEwN2FjNDM5NGQxM2I5MzVl OTRjMGY2Li4xNGZhYjY3OWI4ZDYzOTYzM2IwYmQ4MTRjODJkMWM5ZWYzZjc4YTUyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFnZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmgKQEAgLTcyLDEz ICs3Miw5IEBAIG5hbWVzcGFjZSBOYXRpdmVJbWFnZSB7CiBzdHJ1Y3QgRnJhbWVEYXRhIHsKIHB1 YmxpYzoKICAgICBGcmFtZURhdGEoKQotICAgICAgICA6IG1fb3JpZW50YXRpb24oRGVmYXVsdElt YWdlT3JpZW50YXRpb24pCi0gICAgICAgICwgbV9zdWJzYW1wbGluZ0xldmVsKDApCi0gICAgICAg ICwgbV9kdXJhdGlvbigwKQotICAgICAgICAsIG1faGF2ZU1ldGFkYXRhKGZhbHNlKQorICAgICAg ICA6IG1faGF2ZU1ldGFkYXRhKGZhbHNlKQogICAgICAgICAsIG1faXNDb21wbGV0ZShmYWxzZSkK ICAgICAgICAgLCBtX2hhc0FscGhhKHRydWUpCi0gICAgICAgICwgbV9mcmFtZUJ5dGVzKDApCiAg ICAgewogICAgIH0KIApAQCAtOTAsMTUgKzg2LDE3IEBAIHB1YmxpYzoKICAgICAvLyBDbGVhciB0 aGUgY2FjaGVkIGltYWdlIGRhdGEgb24gdGhlIGZyYW1lLCBhbmQgKG9wdGlvbmFsbHkpIHRoZSBt ZXRhZGF0YS4KICAgICAvLyBSZXR1cm5zIHdoZXRoZXIgdGhlcmUgd2FzIGNhY2hlZCBpbWFnZSBk YXRhIHRvIGNsZWFyLgogICAgIGJvb2wgY2xlYXIoYm9vbCBjbGVhck1ldGFkYXRhKTsKKyAgICAK KyAgICB1bnNpZ25lZCB1c2VkRnJhbWVCeXRlcygpIGNvbnN0IHsgcmV0dXJuIG1faW1hZ2UgPyBt X2ZyYW1lQnl0ZXMgOiAwOyB9CiAKICAgICBOYXRpdmVJbWFnZVB0ciBtX2ltYWdlOwotICAgIElt YWdlT3JpZW50YXRpb24gbV9vcmllbnRhdGlvbjsKLSAgICBTdWJzYW1wbGluZ0xldmVsIG1fc3Vi c2FtcGxpbmdMZXZlbDsKLSAgICBmbG9hdCBtX2R1cmF0aW9uOworICAgIEltYWdlT3JpZW50YXRp b24gbV9vcmllbnRhdGlvbiB7IERlZmF1bHRJbWFnZU9yaWVudGF0aW9uIH07CisgICAgU3Vic2Ft cGxpbmdMZXZlbCBtX3N1YnNhbXBsaW5nTGV2ZWwgeyAwIH07CisgICAgZmxvYXQgbV9kdXJhdGlv biB7IDAgfTsKICAgICBib29sIG1faGF2ZU1ldGFkYXRhIDogMTsKICAgICBib29sIG1faXNDb21w bGV0ZSA6IDE7CiAgICAgYm9vbCBtX2hhc0FscGhhIDogMTsKLSAgICB1bnNpZ25lZCBtX2ZyYW1l Qnl0ZXM7CisgICAgdW5zaWduZWQgbV9mcmFtZUJ5dGVzIHsgMCB9OwogfTsKIAogLy8gPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQo=