113272 2013-03-25 21:13:25 -0700 [BlackBerry] Populate the mime type of the WebContext for images 2013-03-27 17:01:18 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 anilsson anilsson anilsson jpetsovits jrogers mifenton rwlbuis staikos tonikitoo webkit.review.bot oldest_to_newest 863330 0 anilsson 2013-03-25 21:13:25 -0700 PR 278967 863332 1 194994 anilsson 2013-03-25 21:20:52 -0700 Created attachment 194994 Patch 863656 2 194994 staikos 2013-03-26 07:30:29 -0700 Comment on attachment 194994 Patch This looks really hacky. Is this the best way to achieve this result? 863658 3 anilsson 2013-03-26 07:32:19 -0700 (In reply to comment #2) > (From update of attachment 194994 [details]) > This looks really hacky. Is this the best way to achieve this result? My thinking is that this is better than using the one in ResourceResponse, because the server could be misconfigured and report broken or no mime type. 863659 4 anilsson 2013-03-26 07:32:59 -0700 So even though context.setMimetype(cachedImage->response().mimeType()) is a lot less code, I'm worried it's less reliable. 863670 5 staikos 2013-03-26 07:58:38 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 194994 [details] [details]) > > This looks really hacky. Is this the best way to achieve this result? > > My thinking is that this is better than using the one in ResourceResponse, because the server could be misconfigured and report broken or no mime type. Shouldn't we take the server-issued one if it is issued, and if not, then try to put our own in? 863847 6 anilsson 2013-03-26 11:08:32 -0700 (In reply to comment #5) > (In reply to comment #3) > > (In reply to comment #2) > > > (From update of attachment 194994 [details] [details] [details]) > > > This looks really hacky. Is this the best way to achieve this result? > > > > My thinking is that this is better than using the one in ResourceResponse, because the server could be misconfigured and report broken or no mime type. > > Shouldn't we take the server-issued one if it is issued, and if not, then try to put our own in? I had it that way originally, let me put it back in =) 863865 7 195125 anilsson 2013-03-26 11:24:42 -0700 Created attachment 195125 Patch 864444 8 195125 anilsson 2013-03-27 05:42:04 -0700 Comment on attachment 195125 Patch Thanks, George =) 865000 9 195125 webkit.review.bot 2013-03-27 17:01:14 -0700 Comment on attachment 195125 Patch Clearing flags on attachment: 195125 Committed r147024: <http://trac.webkit.org/changeset/147024> 865001 10 webkit.review.bot 2013-03-27 17:01:18 -0700 All reviewed patches have been landed. Closing bug. 194994 2013-03-25 21:20:52 -0700 2013-03-26 11:24:39 -0700 Patch bug-113272-20130326051635.patch text/plain 2790 anilsson U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NzI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA5MDE4YmI4MzVhZGFhMzllOGViNGZmNzRjZDdkNTEwZjgxNjk5ZWMxLi5mYmFmYzg4Mjg4 MjRjMmQ0OGRhNGRmZDZkYTRhNzY3ODc0NzU3MTU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsNSArMSwyMSBAQAogMjAxMy0wMy0yNSAgQXJ2aWQgTmlsc3NvbiAgPGFuaWxz c29uQHJpbS5jb20+CiAKKyAgICAgICAgW0JsYWNrQmVycnldIFBvcHVsYXRlIHRoZSBtaW1lIHR5 cGUgb2YgdGhlIFdlYkNvbnRleHQgZm9yIGltYWdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzMjcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUFIgMjc4OTY3CisKKyAgICAgICAgUG9wdWxhdGUgdGhl IG1pbWUgdHlwZSB1c2luZyB0aGUgZmlsZSBleHRlbnNpb24gcmVwb3J0ZWQgYnkgdGhlIGltYWdl CisgICAgICAgIGRlY29kZXIuIFRoaXMgd2F5IHdlIGJlbmVmaXQgZnJvbSBmaWxlIHR5cGUgc25p ZmZpbmcsIGluc3RlYWQgb2YKKyAgICAgICAgcmVseWluZyBvbiB0aGUgbWltZSB0eXBlIHJlcG9y dGVkIGJ5IHRoZSByZXNvdXJjZSByZXNwb25zZS4KKworICAgICAgICAqIEFwaS9XZWJQYWdlLmNw cDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OndlYkNvbnRl eHQpOgorCisyMDEzLTAzLTI1ICBBcnZpZCBOaWxzc29uICA8YW5pbHNzb25AcmltLmNvbT4KKwog ICAgICAgICBbQmxhY2tCZXJyeV0gU2Nyb2xsaW5nIHVwIGFuZCBkb3duIGNhbiBjYXVzZSB0aGUg c2NyZWVuIHRvIGZsYXNoIGJsYWNrCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTMyNjkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFn ZS5jcHAKaW5kZXggM2I3OGNlYTA0ZWM2MjUyNWIzY2E3ZmU1NDI4MjhiMGYwYTVhMWMyMC4uMjZj M2ViOTM2MWMzMDhiMjRjOGVkYmQwMWNkY2VmN2VjODljZjM4NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCkBAIC0yMzE1LDEwICsyMzE1LDIxIEBAIFBsYXRmb3Jt OjpXZWJDb250ZXh0IFdlYlBhZ2VQcml2YXRlOjp3ZWJDb250ZXh0KFRhcmdldERldGVjdGlvblN0 cmF0ZWd5IHN0cmF0ZWd5CiAgICAgICAgIGlmIChpbWFnZUVsZW1lbnQgJiYgaW1hZ2VFbGVtZW50 LT5yZW5kZXJlcigpKSB7CiAgICAgICAgICAgICBjb250ZXh0LnNldEZsYWcoUGxhdGZvcm06Oldl YkNvbnRleHQ6OklzSW1hZ2UpOwogICAgICAgICAgICAgLy8gRklYTUU6IEF0IHRoZSBtZWFuIHRp bWUsIHdlIG9ubHkgc2hvdyAiU2F2ZSBJbWFnZSIgd2hlbiB0aGUgaW1hZ2UgZGF0YSBpcyBhdmFp bGFibGUuCi0gICAgICAgICAgICBpZiAoQ2FjaGVkUmVzb3VyY2UqIGNhY2hlZFJlc291cmNlID0g aW1hZ2VFbGVtZW50LT5jYWNoZWRJbWFnZSgpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGNhY2hl ZFJlc291cmNlLT5pc0xvYWRlZCgpICYmIGNhY2hlZFJlc291cmNlLT5yZXNvdXJjZUJ1ZmZlcigp KSB7CisgICAgICAgICAgICBpZiAoQ2FjaGVkSW1hZ2UqIGNhY2hlZEltYWdlID0gaW1hZ2VFbGVt ZW50LT5jYWNoZWRJbWFnZSgpKSB7CisgICAgICAgICAgICAgICAgaWYgKGNhY2hlZEltYWdlLT5p c0xvYWRlZCgpICYmIGNhY2hlZEltYWdlLT5yZXNvdXJjZUJ1ZmZlcigpKSB7CiAgICAgICAgICAg ICAgICAgICAgIFN0cmluZyB1cmwgPSBzdHJpcExlYWRpbmdBbmRUcmFpbGluZ0hUTUxTcGFjZXMo aW1hZ2VFbGVtZW50LT5nZXRBdHRyaWJ1dGUoSFRNTE5hbWVzOjpzcmNBdHRyKS5zdHJpbmcoKSk7 CiAgICAgICAgICAgICAgICAgICAgIGNvbnRleHQuc2V0U3JjKG5vZGUtPmRvY3VtZW50KCktPmNv bXBsZXRlVVJMKHVybCkuc3RyaW5nKCkpOworCisgICAgICAgICAgICAgICAgICAgIFN0cmluZ0J1 aWxkZXIgYnVpbGRlcjsKKyAgICAgICAgICAgICAgICAgICAgU3RyaW5nIGV4dGVuc2lvbiA9IGNh Y2hlZEltYWdlLT5pbWFnZSgpLT5maWxlbmFtZUV4dGVuc2lvbigpOworICAgICAgICAgICAgICAg ICAgICBidWlsZGVyLmFwcGVuZCgiaW1hZ2UvIik7CisgICAgICAgICAgICAgICAgICAgIGlmIChl eHRlbnNpb24uaXNFbXB0eSgpKQorICAgICAgICAgICAgICAgICAgICAgICAgYnVpbGRlci5hcHBl bmQoInVua25vd24iKTsKKyAgICAgICAgICAgICAgICAgICAgZWxzZSBpZiAoZXh0ZW5zaW9uID09 ICJqcGciKQorICAgICAgICAgICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoImpwZWciKTsK KyAgICAgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICAgICAgYnVpbGRl ci5hcHBlbmQoZXh0ZW5zaW9uKTsKKyAgICAgICAgICAgICAgICAgICAgY29udGV4dC5zZXRNaW1l VHlwZShidWlsZGVyLnRvU3RyaW5nKCkpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAg IH0KICAgICAgICAgICAgIFN0cmluZyBhbHQgPSBpbWFnZUVsZW1lbnQtPmFsdFRleHQoKTsK 195125 2013-03-26 11:24:42 -0700 2013-03-27 17:01:13 -0700 Patch bug-113272-20130326192024.patch text/plain 3434 anilsson U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NzI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA5MDE4YmI4MzVhZGFhMzllOGViNGZmNzRjZDdkNTEwZjgxNjk5ZWMxLi5mYmFmYzg4Mjg4 MjRjMmQ0OGRhNGRmZDZkYTRhNzY3ODc0NzU3MTU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsNSArMSwyMSBAQAogMjAxMy0wMy0yNSAgQXJ2aWQgTmlsc3NvbiAgPGFuaWxz c29uQHJpbS5jb20+CiAKKyAgICAgICAgW0JsYWNrQmVycnldIFBvcHVsYXRlIHRoZSBtaW1lIHR5 cGUgb2YgdGhlIFdlYkNvbnRleHQgZm9yIGltYWdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzMjcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUFIgMjc4OTY3CisKKyAgICAgICAgUG9wdWxhdGUgdGhl IG1pbWUgdHlwZSB1c2luZyB0aGUgZmlsZSBleHRlbnNpb24gcmVwb3J0ZWQgYnkgdGhlIGltYWdl CisgICAgICAgIGRlY29kZXIuIFRoaXMgd2F5IHdlIGJlbmVmaXQgZnJvbSBmaWxlIHR5cGUgc25p ZmZpbmcsIGluc3RlYWQgb2YKKyAgICAgICAgcmVseWluZyBvbiB0aGUgbWltZSB0eXBlIHJlcG9y dGVkIGJ5IHRoZSByZXNvdXJjZSByZXNwb25zZS4KKworICAgICAgICAqIEFwaS9XZWJQYWdlLmNw cDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OndlYkNvbnRl eHQpOgorCisyMDEzLTAzLTI1ICBBcnZpZCBOaWxzc29uICA8YW5pbHNzb25AcmltLmNvbT4KKwog ICAgICAgICBbQmxhY2tCZXJyeV0gU2Nyb2xsaW5nIHVwIGFuZCBkb3duIGNhbiBjYXVzZSB0aGUg c2NyZWVuIHRvIGZsYXNoIGJsYWNrCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTMyNjkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFn ZS5jcHAKaW5kZXggM2I3OGNlYTA0ZWM2MjUyNWIzY2E3ZmU1NDI4MjhiMGYwYTVhMWMyMC4uZWZj YzA2MDRkMDg2ZmNhYWQ1NTdmMTNiNDM1ZDhiY2QxYTk3OWZjNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCkBAIC0yMzE1LDEwICsyMzE1LDI1IEBAIFBsYXRmb3Jt OjpXZWJDb250ZXh0IFdlYlBhZ2VQcml2YXRlOjp3ZWJDb250ZXh0KFRhcmdldERldGVjdGlvblN0 cmF0ZWd5IHN0cmF0ZWd5CiAgICAgICAgIGlmIChpbWFnZUVsZW1lbnQgJiYgaW1hZ2VFbGVtZW50 LT5yZW5kZXJlcigpKSB7CiAgICAgICAgICAgICBjb250ZXh0LnNldEZsYWcoUGxhdGZvcm06Oldl YkNvbnRleHQ6OklzSW1hZ2UpOwogICAgICAgICAgICAgLy8gRklYTUU6IEF0IHRoZSBtZWFuIHRp bWUsIHdlIG9ubHkgc2hvdyAiU2F2ZSBJbWFnZSIgd2hlbiB0aGUgaW1hZ2UgZGF0YSBpcyBhdmFp bGFibGUuCi0gICAgICAgICAgICBpZiAoQ2FjaGVkUmVzb3VyY2UqIGNhY2hlZFJlc291cmNlID0g aW1hZ2VFbGVtZW50LT5jYWNoZWRJbWFnZSgpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGNhY2hl ZFJlc291cmNlLT5pc0xvYWRlZCgpICYmIGNhY2hlZFJlc291cmNlLT5yZXNvdXJjZUJ1ZmZlcigp KSB7CisgICAgICAgICAgICBpZiAoQ2FjaGVkSW1hZ2UqIGNhY2hlZEltYWdlID0gaW1hZ2VFbGVt ZW50LT5jYWNoZWRJbWFnZSgpKSB7CisgICAgICAgICAgICAgICAgaWYgKGNhY2hlZEltYWdlLT5p c0xvYWRlZCgpICYmIGNhY2hlZEltYWdlLT5yZXNvdXJjZUJ1ZmZlcigpKSB7CiAgICAgICAgICAg ICAgICAgICAgIFN0cmluZyB1cmwgPSBzdHJpcExlYWRpbmdBbmRUcmFpbGluZ0hUTUxTcGFjZXMo aW1hZ2VFbGVtZW50LT5nZXRBdHRyaWJ1dGUoSFRNTE5hbWVzOjpzcmNBdHRyKS5zdHJpbmcoKSk7 CiAgICAgICAgICAgICAgICAgICAgIGNvbnRleHQuc2V0U3JjKG5vZGUtPmRvY3VtZW50KCktPmNv bXBsZXRlVVJMKHVybCkuc3RyaW5nKCkpOworCisgICAgICAgICAgICAgICAgICAgIFN0cmluZyBt aW1lVHlwZSA9IGNhY2hlZEltYWdlLT5yZXNwb25zZSgpLm1pbWVUeXBlKCk7CisgICAgICAgICAg ICAgICAgICAgIGlmIChtaW1lVHlwZS5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgICAgICAgICAg ICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKKyAgICAgICAgICAgICAgICAgICAgICAgIFN0cmlu ZyBleHRlbnNpb24gPSBjYWNoZWRJbWFnZS0+aW1hZ2UoKS0+ZmlsZW5hbWVFeHRlbnNpb24oKTsK KyAgICAgICAgICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKCJpbWFnZS8iKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIGlmIChleHRlbnNpb24uaXNFbXB0eSgpKQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKCJ1bmtub3duIik7CisgICAgICAgICAgICAg ICAgICAgICAgICBlbHNlIGlmIChleHRlbnNpb24gPT0gImpwZyIpCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoImpwZWciKTsKKyAgICAgICAgICAgICAgICAgICAg ICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBidWlsZGVyLmFwcGVuZChleHRl bnNpb24pOworICAgICAgICAgICAgICAgICAgICAgICAgbWltZVR5cGUgPSBidWlsZGVyLnRvU3Ry aW5nKCk7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgY29udGV4 dC5zZXRNaW1lVHlwZShtaW1lVHlwZSk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAg fQogICAgICAgICAgICAgU3RyaW5nIGFsdCA9IGltYWdlRWxlbWVudC0+YWx0VGV4dCgpOwpAQCAt NTE2Myw3ICs1MTc4LDcgQEAgdm9pZCBXZWJQYWdlOjpzZXRFeHRyYVBsdWdpbkRpcmVjdG9yeShj b25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiBwYXRoKQogICAgIFBsdWdpbkRhdGFi YXNlKiBkYXRhYmFzZSA9IFBsdWdpbkRhdGFiYXNlOjppbnN0YWxsZWRQbHVnaW5zKHRydWUgLyog dHJ1ZSBmb3IgbG9hZGluZyBkZWZhdWx0IGRpcmVjdG9yaWVzICovKTsKICAgICBpZiAoIWRhdGFi YXNlKQogICAgICAgICByZXR1cm47Ci0gICAgCisKICAgICBWZWN0b3I8U3RyaW5nPiBwbHVnaW5E aXJlY3RvcmllcyA9IGRhdGFiYXNlLT5wbHVnaW5EaXJlY3RvcmllcygpOwogICAgIGlmIChwYXRo LmVtcHR5KCkgfHwgcGx1Z2luRGlyZWN0b3JpZXMuY29udGFpbnMoU3RyaW5nKHBhdGgpKSkKICAg ICAgICAgcmV0dXJuOwo=