89728 2012-06-21 18:31:47 -0700 BitmapImage duplicates code to calculate size 2012-06-22 12:14:34 -0700 1 1 1 Unclassified WebKit Images 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino simon.fraser webkit-bug-importer oldest_to_newest 655122 0 dino 2012-06-21 18:31:47 -0700 BitmapImage has some code duplication to ask the source for the size. 655125 1 webkit-bug-importer 2012-06-21 18:32:24 -0700 <rdar://problem/11724321> 655136 2 148938 dino 2012-06-21 18:42:39 -0700 Created attachment 148938 Patch 655153 3 148938 darin 2012-06-21 19:10:55 -0700 Comment on attachment 148938 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=148938&action=review > Source/WebCore/ChangeLog:21 > + * platform/graphics/BitmapImage.cpp: > + (WebCore::BitmapImage::updateSize): > + (WebCore): > + (WebCore::BitmapImage::size): > + (WebCore::BitmapImage::sizeRespectingOrientation): > + * platform/graphics/BitmapImage.h: > + (BitmapImage): I really like per-function comments, and here they would be so easy to write! > Source/WebCore/platform/graphics/BitmapImage.cpp:183 > if (m_sizeAvailable && !m_haveSize) { Might be nice to use early return since this function now is only about updating. > Source/WebCore/platform/graphics/BitmapImage.h:267 > + void updateSize() const; This could be private rather than protected. 655683 4 dino 2012-06-22 12:14:34 -0700 Committed r121048: <http://trac.webkit.org/changeset/121048> 148938 2012-06-21 18:42:39 -0700 2012-06-21 19:10:55 -0700 Patch bug-89728-20120622114238.patch text/plain 2849 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwOTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTFmNGYyMmE5MGQxNDlk ZDhjZDY2YjYwYmExODcwNzI4M2IzMWY3My4uMGU0MWMzZjhjYTRkNTc1NGQ2NDNjNTQzODc3ZDdm ZTU3ZjVjYTQyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA2LTIxICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBCaXRtYXBJbWFnZSBkdXBsaWNh dGVzIGNvZGUgdG8gY2FsY3VsYXRlIHNpemUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTg5NzI4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMTcyNDMy MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQg YSBuZXcgdXBkYXRlU2l6ZSBtZXRob2QgdG8gQml0bWFwSW1hZ2UgdGhhdAorICAgICAgICBhdm9p ZHMgZHVwbGljYXRpb24gaW4gdGhlIHNpemUgYW5kCisgICAgICAgIHNpemVSZXNwZWN0aW5nT3Jp ZW50YXRpb24gbWV0aG9kcy4KKworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Qml0bWFwSW1hZ2U6OnVwZGF0ZVNpemUpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAg IChXZWJDb3JlOjpCaXRtYXBJbWFnZTo6c2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpCaXRtYXBJ bWFnZTo6c2l6ZVJlc3BlY3RpbmdPcmllbnRhdGlvbik6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvQml0bWFwSW1hZ2UuaDoKKyAgICAgICAgKEJpdG1hcEltYWdlKToKKwogMjAxMi0wNi0y MSAgT2xpIExhbiAgPG9saWxhbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWRkIG1ldGhvZHMg dG8gc2VsZWN0IGJldHdlZW4gb2Zmc2V0cyBpbiBhbiBlZGl0YWJsZSBmaWVsZC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmNwcAppbmRleCA0NDgy NDFiODFmYzQxNzY3YTBhNTdiODA1MDlkNGQzMzFhNTgwNWQ2Li42MjkzNDMxNmMzODBiNzcxODI3 NGFkNTkzNWIzMTkyZDliNDIwODc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9CaXRtYXBJbWFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvQml0bWFwSW1hZ2UuY3BwCkBAIC0xNzgsNyArMTc4LDcgQEAgdm9pZCBCaXRtYXBJ bWFnZTo6ZGlkRGVjb2RlUHJvcGVydGllcygpIGNvbnN0CiAgICAgICAgIGltYWdlT2JzZXJ2ZXIo KS0+ZGVjb2RlZFNpemVDaGFuZ2VkKHRoaXMsIGRlbHRhQnl0ZXMpOwogfQogCi1JbnRTaXplIEJp dG1hcEltYWdlOjpzaXplKCkgY29uc3QKK3ZvaWQgQml0bWFwSW1hZ2U6OnVwZGF0ZVNpemUoKSBj b25zdAogewogICAgIGlmIChtX3NpemVBdmFpbGFibGUgJiYgIW1faGF2ZVNpemUpIHsKICAgICAg ICAgbV9zaXplID0gbV9zb3VyY2Uuc2l6ZSgpOwpAQCAtMTg2LDE3ICsxODYsMTcgQEAgSW50U2l6 ZSBCaXRtYXBJbWFnZTo6c2l6ZSgpIGNvbnN0CiAgICAgICAgIG1faGF2ZVNpemUgPSB0cnVlOwog ICAgICAgICBkaWREZWNvZGVQcm9wZXJ0aWVzKCk7CiAgICAgfQorfQorCitJbnRTaXplIEJpdG1h cEltYWdlOjpzaXplKCkgY29uc3QKK3sKKyAgICB1cGRhdGVTaXplKCk7CiAgICAgcmV0dXJuIG1f c2l6ZTsKIH0KIAogSW50U2l6ZSBCaXRtYXBJbWFnZTo6c2l6ZVJlc3BlY3RpbmdPcmllbnRhdGlv bigpIGNvbnN0CiB7Ci0gICAgaWYgKG1fc2l6ZUF2YWlsYWJsZSAmJiAhbV9oYXZlU2l6ZSkgewot ICAgICAgICBtX3NpemUgPSBtX3NvdXJjZS5zaXplKCk7Ci0gICAgICAgIG1fc2l6ZVJlc3BlY3Rp bmdPcmllbnRhdGlvbiA9IG1fc291cmNlLnNpemUoUmVzcGVjdEltYWdlT3JpZW50YXRpb24pOwot ICAgICAgICBtX2hhdmVTaXplID0gdHJ1ZTsKLSAgICAgICAgZGlkRGVjb2RlUHJvcGVydGllcygp OwotICAgIH0KKyAgICB1cGRhdGVTaXplKCk7CiAgICAgcmV0dXJuIG1fc2l6ZVJlc3BlY3RpbmdP cmllbnRhdGlvbjsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvQml0bWFwSW1hZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Jp dG1hcEltYWdlLmgKaW5kZXggYWZiOTgxNjI3MTAxNjlmY2E5Zjk3YjE4NGVlNTcxMmExNWViNjBj YS4uMDM1ZjMyMzA5ZWI1NTM5MGMxYzQ5YTAxNDA2ZmU0ODliNWI5OGQ1ZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFnZS5oCkBAIC0yNjMsNiArMjYz LDggQEAgcHJvdGVjdGVkOgogICAgIAogICAgIHZpcnR1YWwgYm9vbCBtYXlGaWxsV2l0aFNvbGlk Q29sb3IoKTsKICAgICB2aXJ0dWFsIENvbG9yIHNvbGlkQ29sb3IoKSBjb25zdDsKKworICAgIHZv aWQgdXBkYXRlU2l6ZSgpIGNvbnN0OwogICAgIAogICAgIEltYWdlU291cmNlIG1fc291cmNlOwog ICAgIG11dGFibGUgSW50U2l6ZSBtX3NpemU7IC8vIFRoZSBzaXplIHRvIHVzZSBmb3IgdGhlIG92 ZXJhbGwgaW1hZ2UgKHdpbGwganVzdCBiZSB0aGUgc2l6ZSBvZiB0aGUgZmlyc3QgaW1hZ2UpLgo=