76968 2012-01-24 17:45:08 -0800 JPEGDecoder should use imageDecoder colorProfile helpers 2012-01-25 03:24:43 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 76804 1 noel.gordon noel.gordon abarth webkit.review.bot oldest_to_newest 541904 0 noel.gordon 2012-01-24 17:45:08 -0800 ICC colorProfile classification helpers were added in http://trac.webkit.org/changeset/105709. Adjust JPEGDecoder to use them. 541929 1 123866 noel.gordon 2012-01-24 18:07:39 -0800 Created attachment 123866 Patch 541989 2 123866 abarth 2012-01-24 21:14:05 -0800 Comment on attachment 123866 Patch Thanks! 542142 3 123866 webkit.review.bot 2012-01-25 03:24:39 -0800 Comment on attachment 123866 Patch Clearing flags on attachment: 123866 Committed r105859: <http://trac.webkit.org/changeset/105859> 542143 4 webkit.review.bot 2012-01-25 03:24:43 -0800 All reviewed patches have been landed. Closing bug. 123866 2012-01-24 18:07:39 -0800 2012-01-25 03:24:39 -0800 Patch bug-76968-20120125130737.patch text/plain 4641 noel.gordon U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1ODQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmMwYjE1MGI0OWRjMjA0 MzMzZmUzOGFiZjVkY2U2MzNkZjY1YjQ2My4uOTA3MjczMGZhYWQwNDVmNTI3MjE3NGU1MGNkY2I5 MzBhNGNkMWNhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTAxLTI0ICBOb2Vs IEdvcmRvbiAgPG5vZWwuZ29yZG9uQGdtYWlsLmNvbT4KKworICAgICAgICBKUEVHRGVjb2RlciBz aG91bGQgdXNlIGltYWdlRGVjb2RlciBjb2xvclByb2ZpbGUgaGVscGVycworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzY5NjgKKyAgICAgICAgCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4g Q292ZXIgYnkgZXhpc3RpbmcgdGVzdHMsIGluIHBhcnRpY3VsYXI6CisgICAgICAgICAgZmFzdC9p bWFnZXMveWNiY3Itd2l0aC1jbXlrLWNvbG9yLXByb2ZpbGUuaHRtbAorICAgICAgICAgIGZhc3Qv aW1hZ2VzL2dyYXktc2NhbGUtanBlZy13aXRoLWNvbG9yLXByb2ZpbGUuaHRtbAorICAgICAgICAg IGZhc3QvaW1hZ2VzL2NteWstanBlZy13aXRoLWNvbG9yLXByb2ZpbGUuaHRtbAorICAgICAgICAg IGZhc3QvaW1hZ2VzL2NvbG9yLWpwZWctd2l0aC1jb2xvci1wcm9maWxlLmh0bWwKKworICAgICAg ICAqIHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2pwZWcvSlBFR0ltYWdlRGVjb2Rlci5jcHA6IHdo aXRlLXNwYWNlIHJlbW92YWxzIHZpYSBYY29kZS4KKyAgICAgICAgKFdlYkNvcmU6OnJlYWRDb2xv clByb2ZpbGUpOiAgVXNlIEltYWdlRGVjb2Rlci5oIGNvbG9yIHByb2ZpbGUgaGVscGVyIHJvdXRp bmVzLgorICAgICAgICAoV2ViQ29yZTo6SlBFR0ltYWdlUmVhZGVyOjpKUEVHSW1hZ2VSZWFkZXIp OgorICAgICAgICAoV2ViQ29yZTo6SlBFR0ltYWdlUmVhZGVyOjpkZWNvZGUpOgorCiAyMDEyLTAx LTI0ICBLZW4gQnVjaGFuYW4gIDxrZW5yYkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQ3Jhc2gg aW4gdXBkYXRlRmlyc3RMZXR0ZXIoKSBmcm9tIHVubmVjZXNzYXJ5IGFub255bW91cyBibG9jawpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZy9K UEVHSW1hZ2VEZWNvZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29k ZXJzL2pwZWcvSlBFR0ltYWdlRGVjb2Rlci5jcHAKaW5kZXggMGNiZGQwNDUzYzRkYjJlYWYwODA3 NTllMmU2YTlkZWM0YjEwYzUyMi4uYWIyODVhZWNlOGJjYzU5NmI4Y2EyMzUyOTUwMGY3ZmJkNWE1 NWZlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMv anBlZy9KUEVHSW1hZ2VEZWNvZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9p bWFnZS1kZWNvZGVycy9qcGVnL0pQRUdJbWFnZURlY29kZXIuY3BwCkBAIC05OCw3ICs5OCw3IEBA IGVudW0ganN0YXRlIHsKICAgICBKUEVHX0RFQ09NUFJFU1NfUFJPR1JFU1NJVkUsIC8vIE91dHB1 dCBwcm9ncmVzc2l2ZSBwaXhlbHMKICAgICBKUEVHX0RFQ09NUFJFU1NfU0VRVUVOVElBTCwgIC8v IE91dHB1dCBzZXF1ZW50aWFsIHBpeGVscwogICAgIEpQRUdfRE9ORSwKLSAgICBKUEVHX0VSUk9S ICAgIAorICAgIEpQRUdfRVJST1IKIH07CiAKIHZvaWQgaW5pdF9zb3VyY2Uoal9kZWNvbXByZXNz X3B0ciBqZCk7CkBAIC0xMTUsMzIgKzExNSw2IEBAIHN0cnVjdCBkZWNvZGVyX3NvdXJjZV9tZ3Ig ewogICAgIEpQRUdJbWFnZVJlYWRlciogZGVjb2RlcjsKIH07CiAKLSNpZiBVU0UoSUNDSlBFRykK LQotI2RlZmluZSBpY2NQcm9maWxlSGVhZGVyU2l6ZSAxMjgKLQotc3RhdGljIGJvb2wgcmdiQ29s b3JQcm9maWxlKGNvbnN0IGNoYXIqIHByb2ZpbGVEYXRhLCB1bnNpZ25lZCBwcm9maWxlTGVuZ3Ro KQotewotICAgIEFTU0VSVChwcm9maWxlTGVuZ3RoID49IGljY1Byb2ZpbGVIZWFkZXJTaXplKTsK LQotICAgIGlmICghbWVtY21wKCZwcm9maWxlRGF0YVsxNl0sICJSR0IgIiwgNCkpCi0gICAgICAg IHJldHVybiB0cnVlOwotICAgIHJldHVybiBmYWxzZTsKLX0KLQotc3RhdGljIGJvb2wgaW5wdXRE ZXZpY2VDb2xvclByb2ZpbGUoY29uc3QgY2hhciogcHJvZmlsZURhdGEsIHVuc2lnbmVkIHByb2Zp bGVMZW5ndGgpCi17Ci0gICAgQVNTRVJUKHByb2ZpbGVMZW5ndGggPj0gaWNjUHJvZmlsZUhlYWRl clNpemUpOwotCi0gICAgaWYgKCFtZW1jbXAoJnByb2ZpbGVEYXRhWzEyXSwgIm1udHIiLCA0KSkK LSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgaWYgKCFtZW1jbXAoJnByb2ZpbGVEYXRhWzEyXSwg InNjbnIiLCA0KSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgcmV0dXJuIGZhbHNlOwotfQot Ci0jZW5kaWYKLQogc3RhdGljIENvbG9yUHJvZmlsZSByZWFkQ29sb3JQcm9maWxlKGpwZWdfZGVj b21wcmVzc19zdHJ1Y3QqIGluZm8pCiB7CiAjaWYgVVNFKElDQ0pQRUcpCkBAIC0xNTMsMTEgKzEy NywxMSBAQCBzdGF0aWMgQ29sb3JQcm9maWxlIHJlYWRDb2xvclByb2ZpbGUoanBlZ19kZWNvbXBy ZXNzX3N0cnVjdCogaW5mbykKICAgICAvLyBPbmx5IGFjY2VwdCBSR0IgY29sb3IgcHJvZmlsZXMg ZnJvbSBpbnB1dCBjbGFzcyBkZXZpY2VzLgogICAgIGJvb2wgaWdub3JlUHJvZmlsZSA9IGZhbHNl OwogICAgIGNoYXIqIHByb2ZpbGVEYXRhID0gcmVpbnRlcnByZXRfY2FzdDxjaGFyKj4ocHJvZmls ZSk7Ci0gICAgaWYgKHByb2ZpbGVMZW5ndGggPCBpY2NQcm9maWxlSGVhZGVyU2l6ZSkKKyAgICBp ZiAocHJvZmlsZUxlbmd0aCA8IEltYWdlRGVjb2Rlcjo6aWNjQ29sb3JQcm9maWxlSGVhZGVyTGVu Z3RoKQogICAgICAgICBpZ25vcmVQcm9maWxlID0gdHJ1ZTsKLSAgICBlbHNlIGlmICghcmdiQ29s b3JQcm9maWxlKHByb2ZpbGVEYXRhLCBwcm9maWxlTGVuZ3RoKSkKKyAgICBlbHNlIGlmICghSW1h Z2VEZWNvZGVyOjpyZ2JDb2xvclByb2ZpbGUocHJvZmlsZURhdGEsIHByb2ZpbGVMZW5ndGgpKQog ICAgICAgICBpZ25vcmVQcm9maWxlID0gdHJ1ZTsKLSAgICBlbHNlIGlmICghaW5wdXREZXZpY2VD b2xvclByb2ZpbGUocHJvZmlsZURhdGEsIHByb2ZpbGVMZW5ndGgpKQorICAgIGVsc2UgaWYgKCFJ bWFnZURlY29kZXI6OmlucHV0RGV2aWNlQ29sb3JQcm9maWxlKHByb2ZpbGVEYXRhLCBwcm9maWxl TGVuZ3RoKSkKICAgICAgICAgaWdub3JlUHJvZmlsZSA9IHRydWU7CiAKICAgICBDb2xvclByb2Zp bGUgY29sb3JQcm9maWxlOwpAQCAtMTgxLDE0ICsxNTUsMTQgQEAgcHVibGljOgogICAgICAgICAs IG1fc2FtcGxlcygwKQogICAgIHsKICAgICAgICAgbWVtc2V0KCZtX2luZm8sIDAsIHNpemVvZihq cGVnX2RlY29tcHJlc3Nfc3RydWN0KSk7Ci0gCisKICAgICAgICAgLy8gV2Ugc2V0IHVwIHRoZSBu b3JtYWwgSlBFRyBlcnJvciByb3V0aW5lcywgdGhlbiBvdmVycmlkZSBlcnJvcl9leGl0LgogICAg ICAgICBtX2luZm8uZXJyID0ganBlZ19zdGRfZXJyb3IoJm1fZXJyLnB1Yik7CiAgICAgICAgIG1f ZXJyLnB1Yi5lcnJvcl9leGl0ID0gZXJyb3JfZXhpdDsKIAogICAgICAgICAvLyBBbGxvY2F0ZSBh bmQgaW5pdGlhbGl6ZSBKUEVHIGRlY29tcHJlc3Npb24gb2JqZWN0LgogICAgICAgICBqcGVnX2Ny ZWF0ZV9kZWNvbXByZXNzKCZtX2luZm8pOwotICAKKwogICAgICAgICBkZWNvZGVyX3NvdXJjZV9t Z3IqIHNyYyA9IDA7CiAgICAgICAgIGlmICghbV9pbmZvLnNyYykgewogICAgICAgICAgICAgc3Jj ID0gKGRlY29kZXJfc291cmNlX21nciopZmFzdENhbGxvYyhzaXplb2YoZGVjb2Rlcl9zb3VyY2Vf bWdyKSwgMSk7CkBAIC0yNTQsNyArMjI4LDcgQEAgcHVibGljOgogICAgICAgICAgICAgc2tpcEJ5 dGVzKG1fYnl0ZXNUb1NraXApOwogCiAgICAgICAgIG1fYnVmZmVyTGVuZ3RoID0gZGF0YS5zaXpl KCk7Ci0gICAgICAgIAorCiAgICAgICAgIC8vIFdlIG5lZWQgdG8gZG8gdGhlIHNldGptcCBoZXJl LiBPdGhlcndpc2UgYmFkIHRoaW5ncyB3aWxsIGhhcHBlbgogICAgICAgICBpZiAoc2V0am1wKG1f ZXJyLnNldGptcF9idWZmZXIpKQogICAgICAgICAgICAgcmV0dXJuIG1fZGVjb2Rlci0+c2V0RmFp bGVkKCk7CkBAIC0zMzcsMTAgKzMxMSwxMCBAQCBwdWJsaWM6CiAKICAgICAgICAgY2FzZSBKUEVH X0RFQ09NUFJFU1NfU0VRVUVOVElBTDoKICAgICAgICAgICAgIGlmIChtX3N0YXRlID09IEpQRUdf REVDT01QUkVTU19TRVFVRU5USUFMKSB7Ci0gIAorCiAgICAgICAgICAgICAgICAgaWYgKCFtX2Rl Y29kZXItPm91dHB1dFNjYW5saW5lcygpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFs c2U7IC8vIEkvTyBzdXNwZW5zaW9uLgotICAKKwogICAgICAgICAgICAgICAgIC8vIElmIHdlJ3Zl IGNvbXBsZXRlZCBpbWFnZSBvdXRwdXQuLi4KICAgICAgICAgICAgICAgICBBU1NFUlQobV9pbmZv Lm91dHB1dF9zY2FubGluZSA9PSBtX2luZm8ub3V0cHV0X2hlaWdodCk7CiAgICAgICAgICAgICAg ICAgbV9zdGF0ZSA9IEpQRUdfRE9ORTsK