6155 2005-12-19 19:56:51 -0800 DumpRenderTree should set a consistent color profile while running 2005-12-29 22:38:10 -0800 1 1 1 Unclassified WebKit Tools / Tests 420+ Mac OS X 10.4 RESOLVED FIXED P4 Normal --- 1 eric eric ap oldest_to_newest 26225 0 eric 2005-12-19 19:56:51 -0800 DumpRenderTree should set a consistant color profile while running Right now any content which is drawn color matched (images which contain an embedded color profile, certain SVG content) will cause DumpRenderTree pixel tests to produce inconsitent results on differnet machines. I haven't been able to find any particularlly elegent solution to this problem. But I have been able to find a solution. The attached patch makes DumpRenderTree set the system color profile to "Generic RGB" on launch (when --pixel is enabled) and then resets it to whatever the user had set on process exit. There may yet be a more elegent (per process!) solution. 26226 1 5167 eric 2005-12-19 19:59:35 -0800 Created attachment 5167 Proposed patch. This patch also contains changes to make DumpRenderTree change it's WebKit size while in the SVG W3C tests directory (which require being run at a specific size). You can ignore those if you wish. 26227 2 5167 eric 2005-12-19 20:00:15 -0800 Comment on attachment 5167 Proposed patch. You can ignore the (small) SVG related changes in this bug. Darin and mjs will likely have opinions on this patch. I'm certainly open to other options, if we find them. 26231 3 5167 darin 2005-12-19 20:20:43 -0800 Comment on attachment 5167 Proposed patch. Since this is a plain C file, functions with no parameters need to be declared with (void) rather than (). The fprintf call needs a "\n" at the end, otherwise it will be smushed together with the next line. Also, no need to put two spaces after those periods. These messages are so long I think the sentences should go on separate lines. It's amazing, I'd never heard of %i before, but it turns out to be a synonym for %d. No need for the redundant & in the atexit call. One of the fprintf calls is missing a space after the "stderr,". The changes to width and height are separate -- not sure why they're here in this same patch. There must be some way of generating bitmaps with the appropriate color profile without changing the system color profile -- we're not even rendering to the screen! r=me 26232 4 eric 2005-12-19 20:54:06 -0800 Maciej and I are in the midst of conversation with the CoreGraphics folks about just that topic... I'll wait to commit this until we have a more definative answer from them. 26344 5 ap 2005-12-21 23:17:30 -0800 Is it the same as bug 5962? 26352 6 eric 2005-12-22 01:39:59 -0800 *** Bug 5962 has been marked as a duplicate of this bug. *** 27211 7 eric 2005-12-29 22:38:10 -0800 We need to find a nicer way to do this. But at least this is a step forward for now. Landed after replacing atexit with the appropriate signal handlers (to better handle failure cases) and addressing darin's concerns. 5167 2005-12-19 19:59:35 -0800 2005-12-19 20:20:43 -0800 Proposed patch. color.patch text/plain 5900 eric SW5kZXg6IER1bXBSZW5kZXJUcmVlLm0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLm0sdgpyZXRyaWV2aW5nIHJl dmlzaW9uIDEuMjEKZGlmZiAtcCAtdSAtcjEuMjEgRHVtcFJlbmRlclRyZWUubQotLS0gRHVtcFJl bmRlclRyZWUubQkxOSBEZWMgMjAwNSAxOTo1NjoyNSAtMDAwMAkxLjIxCisrKyBEdW1wUmVuZGVy VHJlZS5tCTIwIERlYyAyMDA1IDAzOjUzOjIwIC0wMDAwCkBAIC0zNSwxMiArMzUsMTIgQEAKICNp bXBvcnQgPFdlYktpdC9XZWJQcmVmZXJlbmNlcy5oPgogI2ltcG9ydCA8V2ViS2l0L1dlYlZpZXcu aD4KIAotI2ltcG9ydCA8Q2FyYm9uL0NhcmJvbi5oPiAvLyBmb3IgR2V0Q3VycmVudEV2ZW50VGlt ZSgpCi0KLSNpbXBvcnQgPG9iamMvb2JqYy1ydW50aW1lLmg+IC8vIGZvciBjbGFzc19wb3NlQXMK KyNpbXBvcnQgPENhcmJvbi9DYXJib24uaD4gICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBm b3IgR2V0Q3VycmVudEV2ZW50VGltZSgpCisjaW1wb3J0IDxBcHBsaWNhdGlvblNlcnZpY2VzL0Fw cGxpY2F0aW9uU2VydmljZXMuaD4gLy8gZm9yIENNU2V0RGVmYXVsdFByb2ZpbGVCeVNwYWNlCisj aW1wb3J0IDxvYmpjL29iamMtcnVudGltZS5oPiAgICAgICAgICAgICAgICAgICAgICAgLy8gZm9y IGNsYXNzX3Bvc2VBcwogCiAjZGVmaW5lIENPTU1PTl9ESUdFU1RfRk9SX09QRU5TU0wKLSNpbXBv cnQgPENvbW1vbkNyeXB0by9Db21tb25EaWdlc3QuaD4gLy8gZm9yIE1ENSBmdW5jdGlvbnMKKyNp bXBvcnQgPENvbW1vbkNyeXB0by9Db21tb25EaWdlc3QuaD4gICAgICAgICAgICAgICAvLyBmb3Ig TUQ1IGZ1bmN0aW9ucwogCiAjaW1wb3J0IDxnZXRvcHQuaD4KIApAQCAtODMsMTggKzgzLDUwIEBA IHN0YXRpYyBCT09MIHByaW50U2VwYXJhdG9yczsKIHN0YXRpYyBOU1N0cmluZyAqY3VycmVudFRl c3QgPSBuaWw7CiBzdGF0aWMgTlNQYXN0ZWJvYXJkICpsb2NhbFBhc3RlYm9hcmQ7CiAKK3N0YXRp YyBDTVByb2ZpbGVSZWYgY3VycmVudENvbG9yUHJvZmlsZSA9IDA7CitzdGF0aWMgdm9pZCByZXN0 b3JlQ29sb3JTcGFjZSgpCit7CisgICAgaWYgKGN1cnJlbnRDb2xvclByb2ZpbGUpIHsKKyAgICAg ICAgaW50IGVycm9yID0gQ01TZXREZWZhdWx0UHJvZmlsZUJ5VXNlKGNtRGlzcGxheVVzZSwgY3Vy cmVudENvbG9yUHJvZmlsZSk7CisgICAgICAgIGlmIChlcnJvcikKKyAgICAgICAgICAgIGZwcmlu dGYoc3RkZXJyLCAiRmFpbGVkIHRvIHJldG9yZSBwcmV2aW91cyBjb2xvciBwcm9maWxlISAgWW91 IG1heSBuZWVkIHRvIG9wZW4gU3lzdGVtIFByZWZlcmVuY2VzIDogRGlzcGxheXMgOiBDb2xvciBh bmQgbWFudWFsbHkgcmVzdG9yZSB5b3VyIGNvbG9yIHNldHRpbmdzLiAgKEVycm9yOiAlaSkiLCBl cnJvcik7CisgICAgfQorfQorCitzdGF0aWMgdm9pZCBzZXREZWZhdWx0Q29sb3JQcm9maWxlVG9S R0IoKQoreworICAgIENNUHJvZmlsZVJlZiBnZW5lcmljUHJvZmlsZSA9IFtbTlNDb2xvclNwYWNl IGdlbmVyaWNSR0JDb2xvclNwYWNlXSBjb2xvclN5bmNQcm9maWxlXTsKKyAgICBDTVByb2ZpbGVS ZWYgcHJldmlvdXNQcm9maWxlOworICAgIGludCBlcnJvciA9IENNR2V0RGVmYXVsdFByb2ZpbGVC eVVzZShjbURpc3BsYXlVc2UsICZwcmV2aW91c1Byb2ZpbGUpOworICAgIGlmIChlcnJvcikgewor ICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIkZhaWxlZCB0byBnZXQgY3VycmVudCBjb2xvciBwcm9m aWxlLiAgSSB3aWxsIG5vdCBiZSBhYmxlIHRvIHJlc3RvcmUgeW91ciBjdXJyZW50IHByb2ZpbGUs IHRodXMgSSdtIG5vdCBjaGFuZ2luZyBpdC4gIE1hbnkgcGl4ZWwgdGVzdHMgbWF5IGZhaWwgYXMg YSByZXN1bHQuICAoRXJyb3I6ICVpKSIsIGVycm9yKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KyAgICBpZiAocHJldmlvdXNQcm9maWxlID09IGdlbmVyaWNQcm9maWxlKQorICAgICAgICByZXR1 cm47CisgICAgQ0ZTdHJpbmdSZWYgcHJldmlvdXNQcm9maWxlTmFtZTsKKyAgICBDRlN0cmluZ1Jl ZiBnZW5lcmljUHJvZmlsZU5hbWU7CisgICAgQ01Db3B5UHJvZmlsZURlc2NyaXB0aW9uU3RyaW5n KHByZXZpb3VzUHJvZmlsZSwgJnByZXZpb3VzUHJvZmlsZU5hbWUpOworICAgIENNQ29weVByb2Zp bGVEZXNjcmlwdGlvblN0cmluZyhnZW5lcmljUHJvZmlsZSwgJmdlbmVyaWNQcm9maWxlTmFtZSk7 CisgICAgZnByaW50ZihzdGRlcnIsICJcblxuV0FSTklORzogVGVtcG9yYXJpbHkgY2hhbmdpbmcg eW91ciBkZWZhdWx0IGNvbG9yIHByb2ZpbGUgZnJvbSBcIiVzXCIgdG8gXCIlc1wiIHRvIGFsbG93 IHJ1bm5pbmcgdGhlIFdlYktpdCBwaXhlbC1iYXNlZCByZWdyZXNzaW9uIHRlc3RzLlxuVGhlIGNv bG9ycyBvbiB5b3VyIHNjcmVlbiB3aWxsIGNoYW5nZSBmb3IgdGhlIGR1cmF0aW9uIG9mIHRoZSB0 ZXN0aW5nLlxuXG4iLCBDRlN0cmluZ0dldENTdHJpbmdQdHIocHJldmlvdXNQcm9maWxlTmFtZSwg a0NGU3RyaW5nRW5jb2RpbmdNYWNSb21hbiksIENGU3RyaW5nR2V0Q1N0cmluZ1B0cihnZW5lcmlj UHJvZmlsZU5hbWUsIGtDRlN0cmluZ0VuY29kaW5nTWFjUm9tYW4pKTsKKyAgICAKKyAgICBpZiAo KGVycm9yID0gQ01TZXREZWZhdWx0UHJvZmlsZUJ5VXNlKGNtRGlzcGxheVVzZSwgZ2VuZXJpY1By b2ZpbGUpKSkKKyAgICAgICAgZnByaW50ZihzdGRlcnIsIkZhaWxlZCB0byBzZXQgY29sb3IgcHJv ZmlsZSB0byBcIkdlbmVyaWMgUkdCIFByb2ZpbGVcIiEgTWFueSBwaXhlbCB0ZXN0cyB3aWxsIGZh aWwgYXMgYSByZXN1bHQuICAoRXJyb3I6ICVpKSIsIGVycm9yKTsKKyAgICBlbHNlIHsKKyAgICAg ICAgY3VycmVudENvbG9yUHJvZmlsZSA9IHByZXZpb3VzUHJvZmlsZTsKKyAgICAgICAgYXRleGl0 KCZyZXN0b3JlQ29sb3JTcGFjZSk7CisgICAgfQorICAgIENGUmVsZWFzZShnZW5lcmljUHJvZmls ZU5hbWUpOworICAgIENGUmVsZWFzZShwcmV2aW91c1Byb2ZpbGVOYW1lKTsKK30KKwogaW50IG1h aW4oaW50IGFyZ2MsIGNvbnN0IGNoYXIgKmFyZ3ZbXSkKIHsKICAgICBOU0F1dG9yZWxlYXNlUG9v bCAqcG9vbCA9IFtbTlNBdXRvcmVsZWFzZVBvb2wgYWxsb2NdIGluaXRdOwogCiAgICAgY2xhc3Nf cG9zZUFzKG9iamNfZ2V0Q2xhc3MoIkR1bXBSZW5kZXJUcmVlUGFzdGVib2FyZCIpLCBvYmpjX2dl dENsYXNzKCJOU1Bhc3RlYm9hcmQiKSk7Ci0KLSAgICBpbnQgd2lkdGggPSA4MDA7Ci0gICAgaW50 IGhlaWdodCA9IDYwMDsKICAgICAKICAgICBzdHJ1Y3Qgb3B0aW9uIG9wdGlvbnNbXSA9IHsKLSAg ICAgICAgeyJ3aWR0aCIsIHJlcXVpcmVkX2FyZ3VtZW50LCBOVUxMLCAndyd9LAotICAgICAgICB7 ImhlaWdodCIsIHJlcXVpcmVkX2FyZ3VtZW50LCBOVUxMLCAnaCd9LAogICAgICAgICB7InBpeGVs LXRlc3RzIiwgbm9fYXJndW1lbnQsICZkdW1wUGl4ZWxzLCBZRVN9LAogICAgICAgICB7InRyZWUi LCBub19hcmd1bWVudCwgJmR1bXBUcmVlLCBZRVN9LAogICAgICAgICB7Im5vdHJlZSIsIG5vX2Fy Z3VtZW50LCAmZHVtcFRyZWUsIE5PfSwKQEAgLTEyNywyMCArMTU5LDYgQEAgaW50IG1haW4oaW50 IGFyZ2MsIGNvbnN0IGNoYXIgKmFyZ3ZbXSkKICAgICBpbnQgb3B0aW9uOwogICAgIHdoaWxlICgo b3B0aW9uID0gZ2V0b3B0X2xvbmcoYXJnYywgKGNoYXIgKiBjb25zdCAqKWFyZ3YsICIiLCBvcHRp b25zLCBOVUxMKSkgIT0gLTEpCiAgICAgICAgIHN3aXRjaCAob3B0aW9uKSB7Ci0gICAgICAgICAg ICBjYXNlICd3JzoKLSAgICAgICAgICAgICAgICB3aWR0aCA9IHN0cnRvbChvcHRhcmcsIE5VTEws IDApOwotICAgICAgICAgICAgICAgIGlmICh3aWR0aCA8PSAwKSB7Ci0gICAgICAgICAgICAgICAg ICAgIGZwcmludGYoc3RkZXJyLCAiJXM6IGludmFsaWQgd2lkdGhcbiIsIGFyZ3ZbMF0pOwotICAg ICAgICAgICAgICAgICAgICBleGl0KDEpOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAg ICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgJ2gnOgotICAgICAgICAgICAgICAgIGhlaWdo dCA9IHN0cnRvbChvcHRhcmcsIE5VTEwsIDApOwotICAgICAgICAgICAgICAgIGlmIChoZWlnaHQg PD0gMCkgewotICAgICAgICAgICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIiVzOiBpbnZhbGlk IGhlaWdodFxuIiwgYXJndlswXSk7Ci0gICAgICAgICAgICAgICAgICAgIGV4aXQoMSk7Ci0gICAg ICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSAn Pyc6ICAgLy8gdW5rbm93biBvciBhbWJpZ3VvdXMgb3B0aW9uCiAgICAgICAgICAgICBjYXNlICc6 JzogICAvLyBtaXNzaW5nIGFyZ3VtZW50CiAgICAgICAgICAgICAgICAgZXhpdCgxKTsKQEAgLTE1 Miw5ICsxNzAsMTIgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNvbnN0IGNoYXIgKmFyZ3ZbXSkKICAg ICAgICAgZXhpdCgxKTsKICAgICB9CiAgICAgCisgICAgaWYgKGR1bXBQaXhlbHMpCisgICAgICAg IHNldERlZmF1bHRDb2xvclByb2ZpbGVUb1JHQigpOworICAgIAogICAgIGxvY2FsUGFzdGVib2Fy ZCA9IFtOU1Bhc3RlYm9hcmQgcGFzdGVib2FyZFdpdGhVbmlxdWVOYW1lXTsKIAotICAgIFdlYlZp ZXcgKndlYlZpZXcgPSBbW1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgw LCAwLCB3aWR0aCwgaGVpZ2h0KV07CisgICAgV2ViVmlldyAqd2ViVmlldyA9IFtbV2ViVmlldyBh bGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKV07CiAgICAgV2Fp dFVudGlsRG9uZURlbGVnYXRlICpkZWxlZ2F0ZSA9IFtbV2FpdFVudGlsRG9uZURlbGVnYXRlIGFs bG9jXSBpbml0XTsKICAgICBFZGl0aW5nRGVsZWdhdGUgKmVkaXRpbmdEZWxlZ2F0ZSA9IFtbRWRp dGluZ0RlbGVnYXRlIGFsbG9jXSBpbml0XTsKICAgICBbd2ViVmlldyBzZXRGcmFtZUxvYWREZWxl Z2F0ZTpkZWxlZ2F0ZV07CkBAIC0yMTIsOCArMjMzLDE0IEBAIHN0YXRpYyB2b2lkIGR1bXAodm9p ZCkKICAgICAgICAgICAgIERPTUVsZW1lbnQgKmRvY3VtZW50RWxlbWVudCA9IFtbZnJhbWUgRE9N RG9jdW1lbnRdIGRvY3VtZW50RWxlbWVudF07CiAgICAgICAgICAgICBpZiAoW2RvY3VtZW50RWxl bWVudCBpc0tpbmRPZkNsYXNzOltET01IVE1MRWxlbWVudCBjbGFzc11dKQogICAgICAgICAgICAg ICAgIHJlc3VsdCA9IFtbKERPTUhUTUxFbGVtZW50ICopZG9jdW1lbnRFbGVtZW50IGlubmVyVGV4 dF0gc3RyaW5nQnlBcHBlbmRpbmdTdHJpbmc6QCJcbiJdOwotICAgICAgICB9IGVsc2UKKyAgICAg ICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGJvb2wgaXNTVkdXM0NUZXN0ID0gKFtjdXJyZW50VGVz dCByYW5nZU9mU3RyaW5nOkAic3ZnL1czQy1TVkctMS4xIl0ubGVuZ3RoKTsKKyAgICAgICAgICAg IGlmIChpc1NWR1czQ1Rlc3QpCisgICAgICAgICAgICAgICAgW1tmcmFtZSB3ZWJWaWV3XSBzZXRG cmFtZVNpemU6TlNNYWtlU2l6ZSg0ODAsIDM2MCldOworICAgICAgICAgICAgZWxzZSAKKyAgICAg ICAgICAgICAgICBbW2ZyYW1lIHdlYlZpZXddIHNldEZyYW1lU2l6ZTpOU01ha2VTaXplKDgwMCwg NjAwKV07CiAgICAgICAgICAgICByZXN1bHQgPSBbZnJhbWUgcmVuZGVyVHJlZUFzRXh0ZXJuYWxS ZXByZXNlbnRhdGlvbl07CisgICAgICAgIH0KICAgICAgICAgCiAgICAgICAgIGlmICghcmVzdWx0 KQogICAgICAgICAgICAgcHJpbnRmKCJFUlJPUjogbmlsIHJlc3VsdCBmcm9tICVzIiwgZHVtcEFz VGV4dCA/ICJbZG9jdW1lbnRFbGVtZW50IGlubmVyVGV4dF0iIDogIltmcmFtZSByZW5kZXJUcmVl QXNFeHRlcm5hbFJlcHJlc2VudGF0aW9uXSIpOwo=