54066 2011-02-08 22:15:09 -0800 [NRWT] Remove encoding parameters in rebaseline. 2011-02-09 21:31:48 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hayato webkit-unassigned dpranke eric ojan tony oldest_to_newest 347986 0 hayato 2011-02-08 22:15:09 -0800 This is a follow up patch, after this comment, https://bugs.webkit.org/show_bug.cgi?id=53071#c6 We can remove encoding parameters because we can assume all rebaseline data can be written to files in binary mode. 347990 1 81752 hayato 2011-02-08 22:28:14 -0800 Created attachment 81752 remove-encoding-parameters 348372 2 81752 tony 2011-02-09 10:43:30 -0800 Comment on attachment 81752 remove-encoding-parameters Thanks! 348504 3 dpranke 2011-02-09 13:22:46 -0800 As long as nothing breaks, I guess this change is fine, but I still feel kind of uncomfortable about it. Perhaps we should also change the expected_text() and expected_checksum() methods in port/base.py to use read_binary_file() instead of read_text_file()? 348529 4 tony 2011-02-09 13:42:48 -0800 (In reply to comment #3) > As long as nothing breaks, I guess this change is fine, but I still feel kind of uncomfortable about it. Perhaps we should also change the expected_text() and expected_checksum() methods in port/base.py to use read_binary_file() instead of read_text_file()? expected_text() already uses read_binary_file(). expected_checksum() could use either since it's just reading ascii. It's probably a bit safer to use read_text_file(), but I don't feel strongly one way or another. 348534 5 dpranke 2011-02-09 13:49:29 -0800 (In reply to comment #4) > (In reply to comment #3) > > As long as nothing breaks, I guess this change is fine, but I still feel kind of uncomfortable about it. Perhaps we should also change the expected_text() and expected_checksum() methods in port/base.py to use read_binary_file() instead of read_text_file()? > > expected_text() already uses read_binary_file(). expected_checksum() could use either since it's just reading ascii. It's probably a bit safer to use read_text_file(), but I don't feel strongly one way or another. You're right. Apparently I can't read. Anyway, I would feel better if we changed expected_checksum() to use read_binary_file() as well, for consistency. 348799 6 hayato 2011-02-09 21:29:14 -0800 Thank you for the reviews. I'll commit the patch after I change expected_checksum() to use read_binary_file(). (In reply to comment #5) > You're right. Apparently I can't read. Anyway, I would feel better if we changed expected_checksum() to use read_binary_file() as well, for consistency. 348800 7 hayato 2011-02-09 21:31:48 -0800 Committed r78175: <http://trac.webkit.org/changeset/78175> 81752 2011-02-08 22:28:14 -0800 2011-02-09 10:43:30 -0800 remove-encoding-parameters bug-54066-20110209152812.patch text/plain 4650 hayato U3VidmVyc2lvbiBSZXZpc2lvbjogNzgwMTUKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwNGM2YjMxMzc2NDdlNWQ1MzY2NDhkOTJiZjc2YTAyMmFj OWNjZDQ4Li44YjllZGQ0MGVmOTNmNjU2NGE3MmVkYjVhNjU1MmJjZjQzMmE2ZTBiIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcg QEAKIDIwMTEtMDItMDggIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgogCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtOUldUXSBSZW1vdmUg ZW5jb2RpbmcgcGFyYW1ldGVycyB3aGVyZSB3ZSBjYW4gYXNzdW1lIGRhdGEgY2FuIGJlCisgICAg ICAgIHdyaXR0ZW4gaW4gYmluYXJ5IG1vZGUuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTU0MDY2CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9zaW5nbGVfdGVzdF9ydW5uZXIucHk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5OgorCisyMDEx LTAyLTA4ICBIYXlhdG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KKwogICAgICAgICBSZXZp ZXdlZCBieSBUb255IENoYW5nLgogCiAgICAgICAgIFtOUldUXSBQdWxsIHVwIHJlYmFzZWxpbmUg Y29kZSBmcm9tIGNvbXBhcmVfb3V0cHV0KCkgZnVuY3Rpb24gZGVmaW5lZApkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2Uvc2luZ2xl X3Rlc3RfcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5 b3V0X3BhY2thZ2Uvc2luZ2xlX3Rlc3RfcnVubmVyLnB5CmluZGV4IDE3ODc0M2Y4ZWY1YjFmMGQ1 YTU3Yjk5YmRhYmU2Y2NlYjllMzM0YjEuLjk2ZTNlZTZlODA0MzNlYjBjNTE3N2EyNDdmYTkyYjJh M2VhODUwZDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2xheW91dF9wYWNrYWdlL3NpbmdsZV90ZXN0X3J1bm5lci5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9zaW5nbGVfdGVzdF9ydW5uZXIu cHkKQEAgLTIwMywxNyArMjAzLDE1IEBAIGNsYXNzIFNpbmdsZVRlc3RSdW5uZXI6CiAgICAgICAg ICMgQWx0aG91Z2ggYWxsIHRlc3Rfc2hlbGwvRHVtcFJlbmRlclRyZWUgb3V0cHV0IHNob3VsZCBi ZSB1dGYtOCwKICAgICAgICAgIyB3ZSBkbyBub3QgZXZlciBkZWNvZGUgaXQgaW5zaWRlIHJ1bi13 ZWJraXQtdGVzdHMuICBGb3Igc29tZSB0ZXN0cwogICAgICAgICAjIER1bXBSZW5kZXJUcmVlIG1h eSBub3Qgb3V0cHV0IHV0Zi04IHRleHQgKGUuZy4gd2ViYXJjaGl2ZXMpLgotICAgICAgICBzZWxm Ll9zYXZlX2Jhc2VsaW5lX2RhdGEoZHJpdmVyX291dHB1dC50ZXh0LCAiLnR4dCIsIGVuY29kaW5n PU5vbmUsCisgICAgICAgIHNlbGYuX3NhdmVfYmFzZWxpbmVfZGF0YShkcml2ZXJfb3V0cHV0LnRl eHQsICIudHh0IiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdlbmVyYXRlX25l d19iYXNlbGluZT1zZWxmLl9vcHRpb25zLm5ld19iYXNlbGluZSkKICAgICAgICAgaWYgc2VsZi5f b3B0aW9ucy5waXhlbF90ZXN0cyBhbmQgZHJpdmVyX291dHB1dC5pbWFnZV9oYXNoOgotICAgICAg ICAgICAgc2VsZi5fc2F2ZV9iYXNlbGluZV9kYXRhKGRyaXZlcl9vdXRwdXQuaW1hZ2UsICIucG5n IiwgZW5jb2Rpbmc9Tm9uZSwKKyAgICAgICAgICAgIHNlbGYuX3NhdmVfYmFzZWxpbmVfZGF0YShk cml2ZXJfb3V0cHV0LmltYWdlLCAiLnBuZyIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZ2VuZXJhdGVfbmV3X2Jhc2VsaW5lPXNlbGYuX29wdGlvbnMubmV3X2Jhc2VsaW5l KQogICAgICAgICAgICAgc2VsZi5fc2F2ZV9iYXNlbGluZV9kYXRhKGRyaXZlcl9vdXRwdXQuaW1h Z2VfaGFzaCwgIi5jaGVja3N1bSIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZW5jb2Rpbmc9ImFzY2lpIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBnZW5lcmF0ZV9uZXdfYmFzZWxpbmU9c2VsZi5fb3B0aW9ucy5uZXdfYmFzZWxpbmUpCiAKLSAg ICBkZWYgX3NhdmVfYmFzZWxpbmVfZGF0YShzZWxmLCBkYXRhLCBtb2RpZmllciwgZW5jb2Rpbmcs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2VuZXJhdGVfbmV3X2Jhc2VsaW5lPVRydWUp OgorICAgIGRlZiBfc2F2ZV9iYXNlbGluZV9kYXRhKHNlbGYsIGRhdGEsIG1vZGlmaWVyLCBnZW5l cmF0ZV9uZXdfYmFzZWxpbmU9VHJ1ZSk6CiAgICAgICAgICIiIlNhdmVzIGEgbmV3IGJhc2VsaW5l IGZpbGUgaW50byB0aGUgcG9ydCdzIGJhc2VsaW5lIGRpcmVjdG9yeS4KIAogICAgICAgICBUaGUg ZmlsZSB3aWxsIGJlIG5hbWVkIHNpbXBseSAiPHRlc3Q+LWV4cGVjdGVkPG1vZGlmaWVyPiIsIHN1 aXRhYmxlIGZvcgpAQCAtMjIyLDcgKzIyMCw2IEBAIGNsYXNzIFNpbmdsZVRlc3RSdW5uZXI6CiAg ICAgICAgIEFyZ3M6CiAgICAgICAgICAgZGF0YTogcmVzdWx0IHRvIGJlIHNhdmVkIGFzIHRoZSBu ZXcgYmFzZWxpbmUKICAgICAgICAgICBtb2RpZmllcjogdHlwZSBvZiB0aGUgcmVzdWx0IGZpbGUs IGUuZy4gIi50eHQiIG9yICIucG5nIgotICAgICAgICAgIGVuY29kaW5nOiBmaWxlIGVuY29kaW5n IChub25lLCAidXRmLTgiLCBldGMuKQogICAgICAgICAgIGdlbmVyYXRlX25ld19iYXNlbGluZTog d2hldGhlciB0byBlbmVyYXRlIGEgbmV3LCBwbGF0Zm9ybS1zcGVjaWZpYwogICAgICAgICAgICAg YmFzZWxpbmUsIG9yIHVwZGF0ZSB0aGUgZXhpc3Rpbmcgb25lCiAgICAgICAgICIiIgpAQCAtMjQy LDcgKzIzOSw3IEBAIGNsYXNzIFNpbmdsZVRlc3RSdW5uZXI6CiAgICAgICAgICAgICBvdXRwdXRf cGF0aCA9IHBvcnQuZXhwZWN0ZWRfZmlsZW5hbWUoc2VsZi5fZmlsZW5hbWUsIG1vZGlmaWVyKQog ICAgICAgICAgICAgX2xvZy5kZWJ1ZygncmVzZXR0aW5nIGJhc2VsaW5lIHJlc3VsdCAiJXMiJyAl IG91dHB1dF9wYXRoKQogCi0gICAgICAgIHBvcnQudXBkYXRlX2Jhc2VsaW5lKG91dHB1dF9wYXRo LCBkYXRhLCBlbmNvZGluZykKKyAgICAgICAgcG9ydC51cGRhdGVfYmFzZWxpbmUob3V0cHV0X3Bh dGgsIGRhdGEpCiAKICAgICBkZWYgX2hhbmRsZV9lcnJvcihzZWxmLCBkcml2ZXJfb3V0cHV0KToK ICAgICAgICAgZmFpbHVyZXMgPSBbXQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IGUzZDVmOGU5YTQ1OGYxOWQxOTMwNjY4MTEzNzEw OWM4ZGNlNzRmZmUuLjk2OTA0MzQ0MWY3MjcyMTkyYmNiYjliM2NhY2NmNzExOWJkZWJmZTYgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkK QEAgLTM5Niw3ICszOTYsNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgIGRyaXZlciA9 IHNlbGYuY3JlYXRlX2RyaXZlcigwKQogICAgICAgICByZXR1cm4gZHJpdmVyLmNtZF9saW5lKCkK IAotICAgIGRlZiB1cGRhdGVfYmFzZWxpbmUoc2VsZiwgcGF0aCwgZGF0YSwgZW5jb2RpbmcpOgor ICAgIGRlZiB1cGRhdGVfYmFzZWxpbmUoc2VsZiwgcGF0aCwgZGF0YSk6CiAgICAgICAgICIiIlVw ZGF0ZXMgdGhlIGJhc2VsaW5lIGZvciBhIHRlc3QuCiAKICAgICAgICAgQXJnczoKQEAgLTQwNCwx NCArNDA0LDggQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICAgICAgICB0aGUgdGVzdC4g VGhpcyBmdW5jdGlvbiBpcyB1c2VkIHRvIHVwZGF0ZSBlaXRoZXIgZ2VuZXJpYyBvcgogICAgICAg ICAgICAgICBwbGF0Zm9ybS1zcGVjaWZpYyBiYXNlbGluZXMsIGJ1dCB3ZSBjYW4ndCBpbmZlciB3 aGljaCBoZXJlLgogICAgICAgICAgICAgZGF0YTogY29udGVudHMgb2YgdGhlIGJhc2VsaW5lLgot ICAgICAgICAgICAgZW5jb2Rpbmc6IGZpbGUgZW5jb2RpbmcgdG8gdXNlIGZvciB0aGUgYmFzZWxp bmUuCiAgICAgICAgICIiIgotICAgICAgICAjIEZJWE1FOiByZW1vdmUgdGhlIGVuY29kaW5nIHBh cmFtZXRlciBpbiBmYXZvciBvZiB0ZXh0L2JpbmFyeQotICAgICAgICAjIGZ1bmN0aW9ucy4KLSAg ICAgICAgaWYgZW5jb2RpbmcgaXMgTm9uZToKLSAgICAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0u d3JpdGVfYmluYXJ5X2ZpbGUocGF0aCwgZGF0YSkKLSAgICAgICAgZWxzZToKLSAgICAgICAgICAg IHNlbGYuX2ZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKHBhdGgsIGRhdGEpCisgICAgICAgIHNl bGYuX2ZpbGVzeXN0ZW0ud3JpdGVfYmluYXJ5X2ZpbGUocGF0aCwgZGF0YSkKIAogICAgIGRlZiB1 cmlfdG9fdGVzdF9uYW1lKHNlbGYsIHVyaSk6CiAgICAgICAgICIiIlJldHVybiB0aGUgYmFzZSBs YXlvdXQgdGVzdCBuYW1lIGZvciBhIGdpdmVuIFVSSS4K