3840 2005-07-03 10:50:22 -0700 Add an option to DumpRenderTree to render into a bitmap file 2005-08-10 22:32:05 -0700 1 1 1 Unclassified WebKit Tools / Tests 412 Mac OS X 10.4 VERIFIED FIXED P3 Enhancement --- 1 mitz darin oldest_to_newest 13814 0 mitz 2005-07-03 10:50:26 -0700 DumpRenderTree (or a separate WebKit tool) should have an option to render into a bitmap image and save it to disk. The user should be able to specify the bitmap's dimensions. 13856 1 joost 2005-07-03 22:47:54 -0700 Sounds reasonable, confirming. Made it an "enhancement" and moved to p3. Mitz: if you have any reason for it to be p2, please comment here on your reasons :). 16342 2 3311 mitz 2005-08-10 08:46:25 -0700 Created attachment 3311 add bitmap functinoality This patch adds --width, --height, --(no)bitmap and --(no)tree options to DumpRenderTree. If you don't specify any of them, it behaves like it currently does. Following the options you can either give a list of filenames or a single "-", in which case the program reads filenames from stdin, one per line. This doesn't include any of the directory scanning, output filename construction and bitmap diffing that svg2png does. I don't think any of that stuff belongs in DumpRenderTree. It can either be left for the test scripts to do (requiring a separate bitmap diffing utility) or a separate tool should be written. 16343 3 3311 mitz 2005-08-10 08:47:42 -0700 Comment on attachment 3311 add bitmap functinoality (See previous comment) 16344 4 3311 eric 2005-08-10 09:15:34 -0700 Comment on attachment 3311 add bitmap functinoality Hum... Ben was just fixing this same bug as part of: http://bugzilla.opendarwin.org/show_bug.cgi?id=4299... He's done with DumpKCanvasTree, and run-webkit-test changes... I had asked him to make corresponding changes to DumpRenderTree before commiting. You two actually took different approaches regarding who should actually dump the files (your change dumps them back over stdout, ben's dump's directly to a file). We should make sure to reconcile the changes and land one singular solution which works the same for DumpKCanvasTree as well as DumpRenderTreee and has corresponding run-webkit-test changes as well. 16349 5 3311 darin 2005-08-10 10:24:38 -0700 Comment on attachment 3311 add bitmap functinoality I like the approach here. Even if we do more later, we should definitely land this patch. 16404 6 eric 2005-08-10 20:36:15 -0700 commited. 3311 2005-08-10 08:46:25 -0700 2005-08-10 10:24:38 -0700 add bitmap functinoality 3840_patch_r1.txt text/plain 5613 mitz SW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLm0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBS ZW5kZXJUcmVlLm0sdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNQpkaWZmIC1wIC11IC1yMS41IER1 bXBSZW5kZXJUcmVlLm0KLS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJU cmVlLm0JMSBBdWcgMjAwNSAwMTo1NToxOSAtMDAwMAkxLjUKKysrIFdlYktpdFRvb2xzL0R1bXBS ZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLm0JMTAgQXVnIDIwMDUgMTU6Mzg6NTcgLTAwMDAKQEAg LTQwLDYgKzQwLDggQEAKICNpbXBvcnQgPFdlYktpdC9XZWJQcmVmZXJlbmNlcy5oPgogI2ltcG9y dCA8V2ViS2l0L1dlYlZpZXcuaD4KIAorI2ltcG9ydCA8Z2V0b3B0Lmg+CisKIEBpbnRlcmZhY2Ug V2FpdFVudGlsRG9uZURlbGVnYXRlIDogTlNPYmplY3QKIEBlbmQKIApAQCAtNTcsNiArNTksOSBA QCBzdGF0aWMgQk9PTCByZWFkeVRvRHVtcDsKIHN0YXRpYyBCT09MIHdhaXRUb0R1bXA7CiBzdGF0 aWMgQk9PTCBkdW1wQXNUZXh0Owogc3RhdGljIEJPT0wgZHVtcFRpdGxlQ2hhbmdlczsKK3N0YXRp YyBpbnQgZHVtcFBpeGVscyA9IE5POworc3RhdGljIGludCBkdW1wVHJlZSA9IFlFUzsKK3N0YXRp YyBCT09MIHByaW50U2VwYXJhdG9yczsKIAogaW50IG1haW4oaW50IGFyZ2MsIGNvbnN0IGNoYXIg KmFyZ3ZbXSkKIHsKQEAgLTczLDcgKzc4LDIwIEBAIGludCBtYWluKGludCBhcmdjLCBjb25zdCBj aGFyICphcmd2W10pCiAgICAgaW50IGRlZmF1bHRGb250U2l6ZSA9IFtwcmVmZXJlbmNlcyBkZWZh dWx0Rm9udFNpemVdOwogICAgIGludCBkZWZhdWx0Rml4ZWRGb250U2l6ZSA9IFtwcmVmZXJlbmNl cyBkZWZhdWx0Rml4ZWRGb250U2l6ZV07CiAgICAgaW50IG1pbmltdW1Gb250U2l6ZSA9IFtwcmVm ZXJlbmNlcyBtaW5pbXVtRm9udFNpemVdOworICAgIGludCB3aWR0aCA9IDgwMDsKKyAgICBpbnQg aGVpZ2h0ID0gNjAwOwogICAgIAorICAgIHN0cnVjdCBvcHRpb24gb3B0aW9uc1tdID0geworICAg ICAgICB7IndpZHRoIiwgcmVxdWlyZWRfYXJndW1lbnQsIE5VTEwsICd3J30sCisgICAgICAgIHsi aGVpZ2h0IiwgcmVxdWlyZWRfYXJndW1lbnQsIE5VTEwsICdoJ30sCisgICAgICAgIHsiYml0bWFw Iiwgbm9fYXJndW1lbnQsICZkdW1wUGl4ZWxzLCBZRVN9LAorICAgICAgICB7Im5vYml0bWFwIiwg bm9fYXJndW1lbnQsICZkdW1wUGl4ZWxzLCBOT30sCisgICAgICAgIHsidHJlZSIsIG5vX2FyZ3Vt ZW50LCAmZHVtcFRyZWUsIFlFU30sCisgICAgICAgIHsibm90cmVlIiwgbm9fYXJndW1lbnQsICZk dW1wVHJlZSwgTk99LAorICAgICAgICB7TlVMTCwgMCwgTlVMTCwgMH0KKyAgICB9OworICAgIGlu dCBvcHRpb247CisKICAgICBbcHJlZmVyZW5jZXMgc2V0U3RhbmRhcmRGb250RmFtaWx5OkAiVGlt ZXMiXTsKICAgICBbcHJlZmVyZW5jZXMgc2V0Rml4ZWRGb250RmFtaWx5OkAiQ291cmllciJdOwog ICAgIFtwcmVmZXJlbmNlcyBzZXRTZXJpZkZvbnRGYW1pbHk6QCJUaW1lcyJdOwpAQCAtODQsNyAr MTAyLDI5IEBAIGludCBtYWluKGludCBhcmdjLCBjb25zdCBjaGFyICphcmd2W10pCiAgICAgW3By ZWZlcmVuY2VzIHNldERlZmF1bHRGaXhlZEZvbnRTaXplOjEzXTsKICAgICBbcHJlZmVyZW5jZXMg c2V0TWluaW11bUZvbnRTaXplOjldOwogCi0gICAgV2ViVmlldyAqd2ViVmlldyA9IFtbV2ViVmll dyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKV07CisgICAg d2hpbGUgKChvcHRpb24gPSBnZXRvcHRfbG9uZyhhcmdjLCAoY2hhciAqIGNvbnN0ICopYXJndiwg IiIsIG9wdGlvbnMsIE5VTEwpKSAhPSAtMSkKKyAgICAgICAgc3dpdGNoIChvcHRpb24pIHsKKyAg ICAgICAgICAgIGNhc2UgJ3cnOgorICAgICAgICAgICAgICAgIHdpZHRoID0gc3RydG9sKG9wdGFy ZywgTlVMTCwgMCk7CisgICAgICAgICAgICAgICAgaWYgKHdpZHRoIDw9IDApIHsKKyAgICAgICAg ICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICIlczogaW52YWxpZCB3aWR0aFxuIiwgYXJndlsw XSk7CisgICAgICAgICAgICAgICAgICAgIGV4aXQoMSk7CisgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSAnaCc6CisgICAgICAgICAgICAg ICAgaGVpZ2h0ID0gc3RydG9sKG9wdGFyZywgTlVMTCwgMCk7CisgICAgICAgICAgICAgICAgaWYg KGhlaWdodCA8PSAwKSB7CisgICAgICAgICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiJXM6 IGludmFsaWQgaGVpZ2h0XG4iLCBhcmd2WzBdKTsKKyAgICAgICAgICAgICAgICAgICAgZXhpdCgx KTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAg ICBjYXNlICc/JzogICAvLyB1bmtub3duIG9yIGFtYmlndW91cyBvcHRpb24KKyAgICAgICAgICAg IGNhc2UgJzonOiAgIC8vIG1pc3NpbmcgYXJndW1lbnQKKyAgICAgICAgICAgICAgICBleGl0KDEp OworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgCisgICAgV2ViVmlldyAq d2ViVmlldyA9IFtbV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAs IHdpZHRoLCBoZWlnaHQpXTsKICAgICBXYWl0VW50aWxEb25lRGVsZWdhdGUgKmRlbGVnYXRlID0g W1tXYWl0VW50aWxEb25lRGVsZWdhdGUgYWxsb2NdIGluaXRdOwogICAgIEVkaXRpbmdEZWxlZ2F0 ZSAqZWRpdGluZ0RlbGVnYXRlID0gW1tFZGl0aW5nRGVsZWdhdGUgYWxsb2NdIGluaXRdOwogICAg IFt3ZWJWaWV3IHNldEZyYW1lTG9hZERlbGVnYXRlOmRlbGVnYXRlXTsKQEAgLTkyLDIwICsxMzIs MjEgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNvbnN0IGNoYXIgKmFyZ3ZbXSkKICAgICBbd2ViVmll dyBzZXRVSURlbGVnYXRlOmRlbGVnYXRlXTsKICAgICBmcmFtZSA9IFt3ZWJWaWV3IG1haW5GcmFt ZV07CiAgICAgCi0gICAgaWYgKGFyZ2MgPT0gMiAmJiBzdHJjbXAoYXJndlsxXSwgIi0iKSA9PSAw KSB7CisgICAgaWYgKGFyZ2MgPT0gb3B0aW5kKzEgJiYgc3RyY21wKGFyZ3Zbb3B0aW5kXSwgIi0i KSA9PSAwKSB7CiAgICAgICAgIGNoYXIgZmlsZW5hbWVCdWZmZXJbMjA0OF07CisgICAgICAgIHBy aW50U2VwYXJhdG9ycyA9IFlFUzsKICAgICAgICAgd2hpbGUgKGZnZXRzKGZpbGVuYW1lQnVmZmVy LCBzaXplb2YoZmlsZW5hbWVCdWZmZXIpLCBzdGRpbikpIHsKICAgICAgICAgICAgIGNoYXIgKm5l d0xpbmVDaGFyYWN0ZXIgPSBzdHJjaHIoZmlsZW5hbWVCdWZmZXIsICdcbicpOwogICAgICAgICAg ICAgaWYgKG5ld0xpbmVDaGFyYWN0ZXIpIHsKICAgICAgICAgICAgICAgICAqbmV3TGluZUNoYXJh Y3RlciA9ICdcMCc7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBkdW1wUmVuZGVyVHJlZShm aWxlbmFtZUJ1ZmZlcik7Ci0gICAgICAgICAgICBwdXRzKCIjRU9GIik7CiAgICAgICAgICAgICBm Zmx1c2goc3Rkb3V0KTsKICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAgIGludCBpOwot ICAgICAgICBmb3IgKGkgPSAxOyBpICE9IGFyZ2M7ICsraSkgeworICAgICAgICBwcmludFNlcGFy YXRvcnMgPSAob3B0aW5kIDwgYXJnYy0xIHx8IChkdW1wUGl4ZWxzICYmIGR1bXBUcmVlKSk7Cisg ICAgICAgIGZvciAoaSA9IG9wdGluZDsgaSAhPSBhcmdjOyArK2kpIHsKICAgICAgICAgICAgIGR1 bXBSZW5kZXJUcmVlKGFyZ3ZbaV0pOwogICAgICAgICB9CiAgICAgfQpAQCAtMTI3LDE5ICsxNjgs MzcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNvbnN0IGNoYXIgKmFyZ3ZbXSkKIHN0YXRpYyB2b2lk IGR1bXAodm9pZCkKIHsKICAgICBOU1N0cmluZyAqcmVzdWx0ID0gbmlsOwotICAgIGlmIChkdW1w QXNUZXh0KSB7Ci0gICAgICAgIERPTURvY3VtZW50ICpkb2N1bWVudCA9IFtmcmFtZSBET01Eb2N1 bWVudF07Ci0gICAgICAgIGlmIChbZG9jdW1lbnQgaXNLaW5kT2ZDbGFzczpbRE9NSFRNTERvY3Vt ZW50IGNsYXNzXV0pIHsKLSAgICAgICAgICAgIHJlc3VsdCA9IFtbWyhET01IVE1MRG9jdW1lbnQg Kilkb2N1bWVudCBib2R5XSBpbm5lclRleHRdIHN0cmluZ0J5QXBwZW5kaW5nU3RyaW5nOkAiXG4i XTsKKyAgICBpZiAoZHVtcFRyZWUpIHsKKyAgICAgICAgaWYgKGR1bXBBc1RleHQpIHsKKyAgICAg ICAgICAgIERPTURvY3VtZW50ICpkb2N1bWVudCA9IFtmcmFtZSBET01Eb2N1bWVudF07CisgICAg ICAgICAgICBpZiAoW2RvY3VtZW50IGlzS2luZE9mQ2xhc3M6W0RPTUhUTUxEb2N1bWVudCBjbGFz c11dKSB7CisgICAgICAgICAgICAgICAgcmVzdWx0ID0gW1tbKERPTUhUTUxEb2N1bWVudCAqKWRv Y3VtZW50IGJvZHldIGlubmVyVGV4dF0gc3RyaW5nQnlBcHBlbmRpbmdTdHJpbmc6QCJcbiJdOwor ICAgICAgICAgICAgfQorICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgcmVzdWx0ID0gW2Zy YW1lIHJlbmRlclRyZWVBc0V4dGVybmFsUmVwcmVzZW50YXRpb25dOwogICAgICAgICB9Ci0gICAg fSBlbHNlIHsKLSAgICAgICAgcmVzdWx0ID0gW2ZyYW1lIHJlbmRlclRyZWVBc0V4dGVybmFsUmVw cmVzZW50YXRpb25dOworICAgICAgICBpZiAoIXJlc3VsdCkgeworICAgICAgICAgICAgcHV0cygi ZXJyb3IiKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGZwdXRzKFtyZXN1bHQgVVRG OFN0cmluZ10sIHN0ZG91dCk7CisgICAgICAgIH0KKyAgICAgICAgaWYgKHByaW50U2VwYXJhdG9y cykKKyAgICAgICAgICAgIHB1dHMoIiNFT0YiKTsKICAgICB9Ci0gICAgaWYgKCFyZXN1bHQpIHsK LSAgICAgICAgcHV0cygiZXJyb3IiKTsKLSAgICB9IGVsc2UgewotICAgICAgICBmcHV0cyhbcmVz dWx0IFVURjhTdHJpbmddLCBzdGRvdXQpOworICAgIAorICAgIGlmIChkdW1wUGl4ZWxzKSB7Cisg ICAgICAgIE5TQXV0b3JlbGVhc2VQb29sICpwb29sID0gW1tOU0F1dG9yZWxlYXNlUG9vbCBhbGxv Y10gaW5pdF07CisgICAgICAgIFdlYlZpZXcgKnZpZXcgPSBbZnJhbWUgd2ViVmlld107CisgICAg ICAgIE5TQml0bWFwSW1hZ2VSZXAgKmltYWdlUmVwID0gW3ZpZXcgYml0bWFwSW1hZ2VSZXBGb3JD YWNoaW5nRGlzcGxheUluUmVjdDpbdmlldyBmcmFtZV1dOworICAgICAgICBOU0RhdGEgKmltYWdl RGF0YTsKKyAgICAgICAgW3ZpZXcgY2FjaGVEaXNwbGF5SW5SZWN0Olt2aWV3IGZyYW1lXSB0b0Jp dG1hcEltYWdlUmVwOmltYWdlUmVwXTsKKyAgICAgICAgaW1hZ2VEYXRhID0gW2ltYWdlUmVwIHJl cHJlc2VudGF0aW9uVXNpbmdUeXBlOk5TUE5HRmlsZVR5cGUgcHJvcGVydGllczpuaWxdOworICAg ICAgICBpZiAocHJpbnRTZXBhcmF0b3JzKQorICAgICAgICAgICAgcHJpbnRmKCIlZFxuIiwgW2lt YWdlRGF0YSBsZW5ndGhdKTsKKyAgICAgICAgZndyaXRlKFtpbWFnZURhdGEgYnl0ZXNdLCAxLCBb aW1hZ2VEYXRhIGxlbmd0aF0sIHN0ZG91dCk7CisgICAgICAgIFtwb29sIHJlbGVhc2VdOwogICAg IH0KKwogICAgIGRvbmUgPSBZRVM7CiB9CiAK