90755 2012-07-08 23:56:43 -0700 Remove down-casting to BitmapImage in GraphicsContext::drawImage. 2012-10-22 20:52:29 -0700 1 1 1 Unclassified WebKit Images 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 90935 90375 0 dongseong.hwang webkit-unassigned gram koivisto simon.fraser skyul thakis oldest_to_newest 664683 0 dongseong.hwang 2012-07-08 23:56:43 -0700 Add a BitmapImage draw method which takes RespectImageOrientationEnum enum as the last argument for CG. Then we can remove the conditional down-casting in GraphicsContext::drawImage. This change is needed for parallel image decoders. Because parallel image decoders use a Bitmap image wrapper class which extends Image (not Bitmap), the down-casting above causes the loss of RespectImageOrientationEnum which must be passed to BitmapImage. 664725 1 151211 dongseong.hwang 2012-07-09 01:24:59 -0700 Created attachment 151211 Patch 668477 2 skyul 2012-07-12 18:27:10 -0700 Simon, this is a simple refactoring patch which removes a CG-specific conditional down-casting in GraphicsContext::drawImage. Because GraphicsContext already has a draw method with RespectImageOrientationEnum, there is no reason not to put the corresponding Image::draw method with RespectImageOrientationEnum in Image. 669173 3 151211 skyul 2012-07-13 10:19:37 -0700 Comment on attachment 151211 Patch Clearing flags on attachment: 151211 Committed r122598: <http://trac.webkit.org/changeset/122598> 669174 4 skyul 2012-07-13 10:19:42 -0700 All reviewed patches have been landed. Closing bug. 748005 5 thakis 2012-10-22 15:50:55 -0700 How does this patch work? Before this patch, BitmapImage::draw would be called from GraphicsContext.cpp, which had an implementation that honored the image orientation in ImageCG.cpp (BitmapImage::draw()). Now GraphicsContext calls Image::draw() on all platforms, which always throws away the orientation parameter. How does this patch not break image orientation on mac? 748191 6 dongseong.hwang 2012-10-22 19:35:54 -0700 (In reply to comment #5) > How does this patch work? Before this patch, BitmapImage::draw would be called from GraphicsContext.cpp, which had an implementation that honored the image orientation in ImageCG.cpp (BitmapImage::draw()). > > Now GraphicsContext calls Image::draw() on all platforms, which always throws away the orientation parameter. How does this patch not break image orientation on mac? That's good question. BitmapImage of mac only overrides Image::draw(). BitmapImage of other ports does not overrides Image::draw(). #if USE(CG) virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, RespectImageOrientationEnum); #endif It means in mac if you call draw() of BitmapImage, Image::draw() is not called and BitmapImage::draw() of mac is called, which does not throw away the orientation parameter. Please let me know if you have questions anymore :) 748237 7 thakis 2012-10-22 20:52:29 -0700 Thanks for explaining! I missed the inheritance relationship. 151211 2012-07-09 01:24:59 -0700 2012-07-13 10:19:36 -0700 Patch bug-90755-20120709172458.patch text/plain 6553 dongseong.hwang U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTk0NTEwNjIwZDdlNzg4 NWQ0MDY2YWM1NGVkOWE3YzFkNTEyZTYwNi4uMTIxZGY4MGQyYTRiNDRmZDlmYTg0YzMwNjI4Mjkw ZmJmOWMyNzQ4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA3LTA5ICBIdWFu ZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgorCisgICAgICAgIFJlbW92ZSBk b3duLWNhc3RpbmcgdG8gQml0bWFwSW1hZ2UgaW4gR3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2Uu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDc1NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIEJp dG1hcEltYWdlIGRyYXcgbWV0aG9kIHdoaWNoIHRha2VzIFJlc3BlY3RJbWFnZU9yaWVudGF0aW9u RW51bSBlbnVtIGFzCisgICAgICAgIHRoZSBsYXN0IGFyZ3VtZW50IGZvciBDRy4gVGhlbiB3ZSBj YW4gcmVtb3ZlIHRoZSBjb25kaXRpb25hbCBkb3duLWNhc3RpbmcgaW4KKyAgICAgICAgR3JhcGhp Y3NDb250ZXh0OjpkcmF3SW1hZ2UuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgaXMgbmVlZGVkIGZv ciBwYXJhbGxlbCBpbWFnZSBkZWNvZGVycy4gQmVjYXVzZSBwYXJhbGxlbCBpbWFnZQorICAgICAg ICBkZWNvZGVycyB1c2UgYSBCaXRtYXAgaW1hZ2Ugd3JhcHBlciBjbGFzcyB3aGljaCBleHRlbmRz IEltYWdlIChub3QgQml0bWFwKSwgdGhlCisgICAgICAgIGRvd24tY2FzdGluZyBhYm92ZSBjYXVz ZXMgdGhlIGxvc3Mgb2YgUmVzcGVjdEltYWdlT3JpZW50YXRpb25FbnVtIHdoaWNoIG11c3QgYmUK KyAgICAgICAgcGFzc2VkIHRvIEJpdG1hcEltYWdlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywg bm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFw SW1hZ2UuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmg6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9JbWFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZTo6ZHJhdyk6Cisg ICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9JbWFnZS5oOgor ICAgICAgICAoSW1hZ2UpOgorCiAyMDEyLTA3LTA2ICBMYXVybyBOZXRvICA8bGF1cm8ubmV0b0Bv cGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFtRdF0gQXZvaWQgZGVlcCBjb3B5IG9mIFFJbWFnZSBp biBHcmFwaGljc0NvbnRleHQzRDo6Z2V0SW1hZ2VEYXRhKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmNwcAppbmRleCAyYzc1NDA0MjhjOWVmNjZl NWE2NzYyYjg4NzQ5NDVjYTQ4NTI2ZmY0Li5lYzIxN2Y2NTEzY2NlYmU3YThjYjE4ZDc5MDU1MzEw NzJmYzk5ZTFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9C aXRtYXBJbWFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQml0 bWFwSW1hZ2UuY3BwCkBAIC01NjAsMTEgKzU2MCw0IEBAIENvbG9yIEJpdG1hcEltYWdlOjpzb2xp ZENvbG9yKCkgY29uc3QKICAgICByZXR1cm4gbV9zb2xpZENvbG9yOwogfQogCi0jaWYgIVVTRShD RykKLXZvaWQgQml0bWFwSW1hZ2U6OmRyYXcoR3JhcGhpY3NDb250ZXh0KiBjdHgsIGNvbnN0IEZs b2F0UmVjdCYgZHN0UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBDb2xvclNwYWNlIHN0 eWxlQ29sb3JTcGFjZSwgQ29tcG9zaXRlT3BlcmF0b3Igb3AsIFJlc3BlY3RJbWFnZU9yaWVudGF0 aW9uRW51bSkKLXsKLSAgICBkcmF3KGN0eCwgZHN0UmVjdCwgc3JjUmVjdCwgc3R5bGVDb2xvclNw YWNlLCBvcCk7Ci19Ci0jZW5kaWYKLQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0JpdG1hcEltYWdlLmgKaW5kZXggMjE4ODVjZGQ0ODM4Nzg1MGYxN2MzNDM4OThkZmE1 MWFhMjZlMDJkZS4uZjViZmViMTQ1ZGUwZjZmMTlmYjM5MmExODI4ZmY5YzgyZWY3Y2YzNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFnZS5oCkBAIC0x OTksNyArMTk5LDkgQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9pZCBkcmF3RnJhbWVNYXRj aGluZ1NvdXJjZVNpemUoR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgRmxvYXRSZWN0JiBkc3RSZWN0 LCBjb25zdCBJbnRTaXplJiBzcmNTaXplLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgQ29t cG9zaXRlT3BlcmF0b3IpOwogI2VuZGlmCiAgICAgdmlydHVhbCB2b2lkIGRyYXcoR3JhcGhpY3ND b250ZXh0KiwgY29uc3QgRmxvYXRSZWN0JiBkc3RSZWN0LCBjb25zdCBGbG9hdFJlY3QmIHNyY1Jl Y3QsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBDb21wb3NpdGVPcGVyYXRvcik7Ci0gICAg dm9pZCBkcmF3KEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEZsb2F0UmVjdCYgZHN0UmVjdCwgY29u c3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgQ29tcG9z aXRlT3BlcmF0b3IsIFJlc3BlY3RJbWFnZU9yaWVudGF0aW9uRW51bSk7CisjaWYgVVNFKENHKQor ICAgIHZpcnR1YWwgdm9pZCBkcmF3KEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEZsb2F0UmVjdCYg ZHN0UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBDb2xvclNwYWNlIHN0eWxlQ29sb3JT cGFjZSwgQ29tcG9zaXRlT3BlcmF0b3IsIFJlc3BlY3RJbWFnZU9yaWVudGF0aW9uRW51bSk7Cisj ZW5kaWYKIAogI2lmIChPUyhXSU5DRSkgJiYgIVBMQVRGT1JNKFFUKSkKICAgICB2aXJ0dWFsIHZv aWQgZHJhd1BhdHRlcm4oR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0 LCBjb25zdCBBZmZpbmVUcmFuc2Zvcm0mIHBhdHRlcm5UcmFuc2Zvcm0sCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcAppbmRleCBi ZjFmOGMwNTY4MGU4NjNmMmIzY2NhNmNkMDQxZjE3OGMzOTllZTNmLi42NjY0Yjg2NDRjYTJiMTI5 M2MwZGRjMDIyNDFjMDNiMjIwMGFhNDQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAKQEAgLTQ5MCwxMCArNDkwLDcgQEAg dm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdJbWFnZShJbWFnZSogaW1hZ2UsIENvbG9yU3BhY2Ug c3R5bGVDb2xvclNwYWNlLCBjb25zdAogI2VuZGlmCiAgICAgfQogCi0gICAgaWYgKGltYWdlLT5p c0JpdG1hcEltYWdlKCkpCi0gICAgICAgIHN0YXRpY19jYXN0PEJpdG1hcEltYWdlKj4oaW1hZ2Up LT5kcmF3KHRoaXMsIEZsb2F0UmVjdChkZXN0LmxvY2F0aW9uKCksIEZsb2F0U2l6ZSh0dywgdGgp KSwgRmxvYXRSZWN0KHNyYy5sb2NhdGlvbigpLCBGbG9hdFNpemUodHN3LCB0c2gpKSwgc3R5bGVD b2xvclNwYWNlLCBvcCwgc2hvdWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb24pOwotICAgIGVsc2UK LSAgICAgICAgaW1hZ2UtPmRyYXcodGhpcywgRmxvYXRSZWN0KGRlc3QubG9jYXRpb24oKSwgRmxv YXRTaXplKHR3LCB0aCkpLCBGbG9hdFJlY3Qoc3JjLmxvY2F0aW9uKCksIEZsb2F0U2l6ZSh0c3cs IHRzaCkpLCBzdHlsZUNvbG9yU3BhY2UsIG9wKTsKKyAgICBpbWFnZS0+ZHJhdyh0aGlzLCBGbG9h dFJlY3QoZGVzdC5sb2NhdGlvbigpLCBGbG9hdFNpemUodHcsIHRoKSksIEZsb2F0UmVjdChzcmMu bG9jYXRpb24oKSwgRmxvYXRTaXplKHRzdywgdHNoKSksIHN0eWxlQ29sb3JTcGFjZSwgb3AsIHNo b3VsZFJlc3BlY3RJbWFnZU9yaWVudGF0aW9uKTsKIAogICAgIGlmICh1c2VMb3dRdWFsaXR5U2Nh bGUpCiAgICAgICAgIHNldEltYWdlSW50ZXJwb2xhdGlvblF1YWxpdHkocHJldmlvdXNJbnRlcnBv bGF0aW9uUXVhbGl0eSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9JbWFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbWFnZS5j cHAKaW5kZXggMGFjZTdhYzIwNzVkMDZhMzA3YWIwM2Y3NDEzODI2ODg3YzVkYjhkMy4uMmIxOWYx MzQ5ZmViMDA3M2VjYmM1ZDBjNzY4ZTNmOGYyYTYyZmZmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ltYWdlLmNwcApAQCAtODksNiArODksMTEgQEAgdm9pZCBJbWFnZTo6 ZmlsbFdpdGhTb2xpZENvbG9yKEdyYXBoaWNzQ29udGV4dCogY3R4dCwgY29uc3QgRmxvYXRSZWN0 JiBkc3RSZWN0LAogICAgIGN0eHQtPnNldENvbXBvc2l0ZU9wZXJhdGlvbihwcmV2aW91c09wZXJh dG9yKTsKIH0KIAordm9pZCBJbWFnZTo6ZHJhdyhHcmFwaGljc0NvbnRleHQqIGN0eCwgY29uc3Qg RmxvYXRSZWN0JiBkc3RSZWN0LCBjb25zdCBGbG9hdFJlY3QmIHNyY1JlY3QsIENvbG9yU3BhY2Ug c3R5bGVDb2xvclNwYWNlLCBDb21wb3NpdGVPcGVyYXRvciBvcCwgUmVzcGVjdEltYWdlT3JpZW50 YXRpb25FbnVtKQoreworICAgIGRyYXcoY3R4LCBkc3RSZWN0LCBzcmNSZWN0LCBzdHlsZUNvbG9y U3BhY2UsIG9wKTsKK30KKwogdm9pZCBJbWFnZTo6ZHJhd1RpbGVkKEdyYXBoaWNzQ29udGV4dCog Y3R4dCwgY29uc3QgRmxvYXRSZWN0JiBkZXN0UmVjdCwgY29uc3QgRmxvYXRQb2ludCYgc3JjUG9p bnQsIGNvbnN0IEZsb2F0U2l6ZSYgc2NhbGVkVGlsZVNpemUsIENvbG9yU3BhY2Ugc3R5bGVDb2xv clNwYWNlLCBDb21wb3NpdGVPcGVyYXRvciBvcCkKIHsgICAgCiAgICAgaWYgKG1heUZpbGxXaXRo U29saWRDb2xvcigpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9JbWFnZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2UuaApp bmRleCAzZmY0ODIzNmEwMmY4YjllNWVmODk3ZTMwNjI3YTRmNTc0ZmFiZDlmLi5hNmI5NDkwNDdj ZmRiMTY0MjQ4MDNiZDYwZmUwYTE1N2YwYWY2NjE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9JbWFnZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0ltYWdlLmgKQEAgLTE4MSw2ICsxODEsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgdmly dHVhbCB2b2lkIGRyYXdGcmFtZU1hdGNoaW5nU291cmNlU2l6ZShHcmFwaGljc0NvbnRleHQqLCBj b25zdCBGbG9hdFJlY3QmIGRzdFJlY3QsIGNvbnN0IEludFNpemUmIHNyY1NpemUsIENvbG9yU3Bh Y2Ugc3R5bGVDb2xvclNwYWNlLCBDb21wb3NpdGVPcGVyYXRvcikgeyB9CiAjZW5kaWYKICAgICB2 aXJ0dWFsIHZvaWQgZHJhdyhHcmFwaGljc0NvbnRleHQqLCBjb25zdCBGbG9hdFJlY3QmIGRzdFJl Y3QsIGNvbnN0IEZsb2F0UmVjdCYgc3JjUmVjdCwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2Us IENvbXBvc2l0ZU9wZXJhdG9yKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGRyYXcoR3JhcGhpY3ND b250ZXh0KiwgY29uc3QgRmxvYXRSZWN0JiBkc3RSZWN0LCBjb25zdCBGbG9hdFJlY3QmIHNyY1Jl Y3QsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBDb21wb3NpdGVPcGVyYXRvciwgUmVzcGVj dEltYWdlT3JpZW50YXRpb25FbnVtKTsKICAgICB2b2lkIGRyYXdUaWxlZChHcmFwaGljc0NvbnRl eHQqLCBjb25zdCBGbG9hdFJlY3QmIGRzdFJlY3QsIGNvbnN0IEZsb2F0UG9pbnQmIHNyY1BvaW50 LCBjb25zdCBGbG9hdFNpemUmIHRpbGVTaXplLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwg Q29tcG9zaXRlT3BlcmF0b3IpOwogICAgIHZvaWQgZHJhd1RpbGVkKEdyYXBoaWNzQ29udGV4dCos IGNvbnN0IEZsb2F0UmVjdCYgZHN0UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBjb25z dCBGbG9hdFNpemUmIHRpbGVTY2FsZUZhY3RvciwgVGlsZVJ1bGUgaFJ1bGUsIFRpbGVSdWxlIHZS dWxlLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgQ29tcG9zaXRlT3BlcmF0b3IpOwogCg==