49640 2010-11-16 19:21:24 -0800 Rebaseline server: compute diffs client-side 2010-11-17 09:43:00 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 47761 1 mihaip mihaip tony oldest_to_newest 310096 0 mihaip 2010-11-16 19:21:24 -0800 Rebaseline server: compute diffs client-side 310097 1 74078 mihaip 2010-11-16 19:23:07 -0800 Created attachment 74078 Patch 310315 2 74078 tony 2010-11-17 08:53:36 -0800 Comment on attachment 74078 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=74078&action=review > WebKitTools/Scripts/webkitpy/tool/commands/data/rebaselineserver/main.js:241 > + if (currentExpectedImageTest == currentActualImageTest && > + currentExpectedImageTest == testName) { Nit: WebKit style is to put the && on the left of the second line. 310346 3 mihaip 2010-11-17 09:43:00 -0800 (In reply to comment #2) > Nit: WebKit style is to put the && on the left of the second line. Fixed before landing. This got landed as http://trac.webkit.org/changeset/72214, but due to a bad merge in the ChangeLog (my entry didn't end up at the top) didn't get attached to this bug in the commit. 74078 2010-11-16 19:23:07 -0800 2010-11-17 08:53:36 -0800 Patch bug-49640-20101116192306.patch text/plain 7356 mihaip ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhZWE5NTA0YjM1ODlhY2UzZjMyMDM2ODk4YmJkY2IyNjVhN2M1MWZkLi4xNTY4YjNk ZDM3YjMwNDE5MzI4YjI1ZDc1Zjc2OTg3OTcxZGY0MTg5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAK IDIwMTAtMTEtMTYgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CiAKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmViYXNlbGluZSBz ZXJ2ZXI6IGNvbXB1dGUgZGlmZnMgY2xpZW50LXNpZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5NjQwCisgICAgICAgIAorICAgICAgICBUaGUgaW1h Z2UgZGlmZiBvdXRwdXQgZnJvbSB0aGUgRFJUIGlzIHByZXR0eSBiYWQgb24gc29tZSBwb3J0cyAo YXQKKyAgICAgICAgbGVhc3QgdGhlIE1hYyBvbmUpLCBzbyBpdCdzIGJldHRlciB0byBjb21wdXRl IGRpZmZzIG9uIHRoZSBjbGllbnQgYnkKKyAgICAgICAgdXNpbmcgPGNhbnZhcz4uCisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZGF0YS9yZWJhc2VsaW5lc2VydmVy L2luZGV4Lmh0bWw6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Rh dGEvcmViYXNlbGluZXNlcnZlci9tYWluLmNzczoKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L3Rvb2wvY29tbWFuZHMvZGF0YS9yZWJhc2VsaW5lc2VydmVyL21haW4uanM6CisKKzIwMTAtMTEt MTYgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgUmV2 aWV3ZWQgYnkgVG9ueSBDaGFuZy4KIAogICAgICAgICBSZWJhc2VsaW5lIHNlcnZlcjogZGlzcGxh eSB0ZXN0IHJlc3VsdHMKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9jb21tYW5kcy9kYXRhL3JlYmFzZWxpbmVzZXJ2ZXIvaW5kZXguaHRtbCBiL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9kYXRhL3JlYmFzZWxpbmVzZXJ2ZXIv aW5kZXguaHRtbAppbmRleCAxNDJlMTY0NDdjODIxNDYwYTZkOGY3MjJjOWJkYzEyZjg3NWI0MDRi Li5hZmQyZmZmZGJlYzE5ODE2M2MxMzgwNjRjYWFkZGFkNDNlZWY2NTZlIDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZGF0YS9yZWJhc2VsaW5l c2VydmVyL2luZGV4Lmh0bWwKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L2NvbW1hbmRzL2RhdGEvcmViYXNlbGluZXNlcnZlci9pbmRleC5odG1sCkBAIC04NSw3ICs4NSw3 IEBACiAgICAgPHRyPgogICAgICAgPHRkPjxpbWcgaWQ9ImV4cGVjdGVkLWltYWdlIj48L3RkPgog ICAgICAgPHRkPjxpbWcgaWQ9ImFjdHVhbC1pbWFnZSI+PC90ZD4KLSAgICAgIDx0ZD48aW1nIGlk PSJkaWZmLWltYWdlIj48L3RkPgorICAgICAgPHRkPjxjYW52YXMgaWQ9ImRpZmYtY2FudmFzIiB3 aWR0aD0iODAwIiBoZWlnaHQ9IjYwMCI+PC9jYW52YXM+PC90ZD4KICAgICA8L3RyPgogICA8L3Ri b2R5PgogICA8dGJvZHkgaWQ9InRleHQtb3V0cHV0cyIgc3R5bGU9ImRpc3BsYXk6IG5vbmUiPgpk aWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Rh dGEvcmViYXNlbGluZXNlcnZlci9tYWluLmNzcyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9jb21tYW5kcy9kYXRhL3JlYmFzZWxpbmVzZXJ2ZXIvbWFpbi5jc3MKaW5kZXggMzI5 Zjk1ZjQ0ZjZmNWU3YzE5ODk1N2VmZWQ2YjE3ZjBhOTBjNTA4Mi4uYmQyY2Q5ODNhNjc3N2E2Yzc1 OWNjY2E2MDlmMTg1Yzk1YjJlMDhkMiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS90b29sL2NvbW1hbmRzL2RhdGEvcmViYXNlbGluZXNlcnZlci9tYWluLmNzcworKysg Yi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZGF0YS9yZWJhc2Vs aW5lc2VydmVyL21haW4uY3NzCkBAIC0xMTMsNyArMTEzLDggQEAgYSwgLmxpbmsgewogICB2ZXJ0 aWNhbC1hbGlnbjogdG9wOwogfQogCi0jaW1hZ2Utb3V0cHV0cyBpbWcgeworI2ltYWdlLW91dHB1 dHMgaW1nLAorI2ltYWdlLW91dHB1dHMgY2FudmFzIHsKICAgd2lkdGg6IDgwMHB4OwogICBoZWln aHQ6IDYwMHB4OwogICBib3JkZXI6IHNvbGlkIDFweCAjZGRkOwpAQCAtMTIxLDYgKzEyMiwxMSBA QCBhLCAubGluayB7CiAgIC13ZWJraXQtdXNlci1kcmFnOiBub25lOwogfQogCisjaW1hZ2Utb3V0 cHV0cyBpbWcubG9hZGluZywKKyNpbWFnZS1vdXRwdXRzIGNhbnZhcy5sb2FkaW5nIHsKKyAgb3Bh Y2l0eTogLjU7Cit9CisKICNpbWFnZS1vdXRwdXRzICNhY3R1YWwtaW1hZ2UgewogICBtYXJnaW46 IDAgMWVtOwogfQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L2NvbW1hbmRzL2RhdGEvcmViYXNlbGluZXNlcnZlci9tYWluLmpzIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2RhdGEvcmViYXNlbGluZXNlcnZlci9tYWluLmpz CmluZGV4IDUzODdjZDkzNjVmMDRiNDE0MjY2YjdjOGViMjQ5ZjMyNmRiODJkMzMuLjc0MWJkMTkz OGEwZjU4NTVjYTNjY2MyNjMyNTgyNTQyMDNhYmJmZmMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9kYXRhL3JlYmFzZWxpbmVzZXJ2ZXIvbWFp bi5qcworKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZGF0 YS9yZWJhc2VsaW5lc2VydmVyL21haW4uanMKQEAgLTIzMiwxNSArMjMyLDExNSBAQCBmdW5jdGlv biBnZXRUZXN0UmVzdWx0VXJsKHRlc3ROYW1lLCBtb2RlKQogICAgIHJldHVybiAnL3Rlc3RfcmVz dWx0P3Rlc3Q9JyArIHRlc3ROYW1lICsgJyZtb2RlPScgKyBtb2RlOwogfQogCit2YXIgY3VycmVu dEV4cGVjdGVkSW1hZ2VUZXN0OwordmFyIGN1cnJlbnRBY3R1YWxJbWFnZVRlc3Q7CisKIGZ1bmN0 aW9uIGRpc3BsYXlJbWFnZVJlc3VsdHModGVzdE5hbWUpCiB7Ci0gICAgZnVuY3Rpb24gZGlzcGxh eUltYWdlUmVzdWx0KG1vZGUpIHsKLSAgICAgICAgJChtb2RlKS5zcmMgPSBnZXRUZXN0UmVzdWx0 VXJsKHRlc3ROYW1lLCBtb2RlKTsKKyAgICBpZiAoY3VycmVudEV4cGVjdGVkSW1hZ2VUZXN0ID09 IGN1cnJlbnRBY3R1YWxJbWFnZVRlc3QgJiYKKyAgICAgICAgY3VycmVudEV4cGVjdGVkSW1hZ2VU ZXN0ID09IHRlc3ROYW1lKSB7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgCisgICAgZnVu Y3Rpb24gZGlzcGxheUltYWdlUmVzdWx0KG1vZGUsIGNhbGxiYWNrKSB7CisgICAgICAgIHZhciBp bWFnZSA9ICQobW9kZSk7CisgICAgICAgIGltYWdlLmNsYXNzTmFtZSA9ICdsb2FkaW5nJzsKKyAg ICAgICAgaW1hZ2Uuc3JjID0gZ2V0VGVzdFJlc3VsdFVybCh0ZXN0TmFtZSwgbW9kZSk7CisgICAg ICAgIGltYWdlLm9ubG9hZCA9IGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgaW1hZ2UuY2xhc3NO YW1lID0gJyc7CisgICAgICAgICAgICBjYWxsYmFjaygpOworICAgICAgICAgICAgdXBkYXRlSW1h Z2VEaWZmKCk7CisgICAgICAgIH07CiAgICAgfQogCi0gICAgZGlzcGxheUltYWdlUmVzdWx0KCdl eHBlY3RlZC1pbWFnZScpOwotICAgIGRpc3BsYXlJbWFnZVJlc3VsdCgnYWN0dWFsLWltYWdlJyk7 Ci0gICAgZGlzcGxheUltYWdlUmVzdWx0KCdkaWZmLWltYWdlJyk7CisgICAgZGlzcGxheUltYWdl UmVzdWx0KAorICAgICAgICAnZXhwZWN0ZWQtaW1hZ2UnLAorICAgICAgICBmdW5jdGlvbigpIHsg Y3VycmVudEV4cGVjdGVkSW1hZ2VUZXN0ID0gdGVzdE5hbWU7IH0pOworICAgIGRpc3BsYXlJbWFn ZVJlc3VsdCgKKyAgICAgICAgJ2FjdHVhbC1pbWFnZScsCisgICAgICAgIGZ1bmN0aW9uKCkgeyBj dXJyZW50QWN0dWFsSW1hZ2VUZXN0ID0gdGVzdE5hbWU7IH0pOworCisgICAgJCgnZGlmZi1jYW52 YXMnKS5jbGFzc05hbWUgPSAnbG9hZGluZyc7CisgICAgJCgnZGlmZi1jYW52YXMnKS5zdHlsZS5k aXNwbGF5ID0gJyc7Cit9CisKKy8qKgorICogQ29tcHV0ZXMgYSBncmFwaGljYWwgYSBkaWZmIGJl dHdlZW4gdGhlIGV4cGVjdGVkIGFuZCBhY3R1YWwgaW1hZ2VzIGJ5CisgKiByZW5kZXJpbmcgZWFj aCB0byBhIGNhbnZhcywgZ2V0dGluZyB0aGUgaW1hZ2UgZGF0YSwgYW5kIGNvbXBhcmluZyB0aGUg UkdCQQorICogY29tcG9uZW50cyBvZiBlYWNoIHBpeGVsLiBUaGUgb3V0cHV0IGlzIHB1dCBpbnRv IHRoZSBkaWZmIGNhbnZhcywgd2l0aAorICogaWRlbnRpY2FsIHBpeGVscyBhcHBlYXJpbmcgYXQg MTIuNSUgb3BhY2l0eSBhbmQgZGlmZmVyZW50IHBpeGVscyBiZWluZworICogaGlnaGxpZ2h0ZWQg aW4gcmVkLgorICovCitmdW5jdGlvbiB1cGRhdGVJbWFnZURpZmYoKSB7CisgICAgaWYgKGN1cnJl bnRFeHBlY3RlZEltYWdlVGVzdCAhPSBjdXJyZW50QWN0dWFsSW1hZ2VUZXN0KQorICAgICAgICBy ZXR1cm47CisgICAgICAgIAorICAgIHZhciBleHBlY3RlZEltYWdlID0gJCgnZXhwZWN0ZWQtaW1h Z2UnKTsKKyAgICB2YXIgYWN0dWFsSW1hZ2UgPSAkKCdhY3R1YWwtaW1hZ2UnKTsKKyAgICAKKyAg ICBmdW5jdGlvbiBnZXRJbWFnZURhdGEoaW1hZ2UpIHsKKyAgICAgICAgdmFyIGltYWdlQ2FudmFz ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnY2FudmFzJyk7CisgICAgICAgIGltYWdlQ2FudmFz LndpZHRoID0gaW1hZ2Uud2lkdGg7CisgICAgICAgIGltYWdlQ2FudmFzLmhlaWdodCA9IGltYWdl LmhlaWdodDsKKyAgICAgICAgaW1hZ2VDYW52YXNDb250ZXh0ID0gaW1hZ2VDYW52YXMuZ2V0Q29u dGV4dCgnMmQnKTsKKyAgICAgICAgCisgICAgICAgIGltYWdlQ2FudmFzQ29udGV4dC5maWxsU3R5 bGUgPSAncmdiYSgyNTUsIDI1NSwgMjU1LCAxKSc7CisgICAgICAgIGltYWdlQ2FudmFzQ29udGV4 dC5maWxsUmVjdCgKKyAgICAgICAgICAgIDAsIDAsIGltYWdlLndpZHRoLCBpbWFnZS5oZWlnaHQp OworICAgICAgICAgICAgCisgICAgICAgIGltYWdlQ2FudmFzQ29udGV4dC5kcmF3SW1hZ2UoaW1h Z2UsIDAsIDApOworICAgICAgICByZXR1cm4gaW1hZ2VDYW52YXNDb250ZXh0LmdldEltYWdlRGF0 YSgKKyAgICAgICAgICAgIDAsIDAsIGltYWdlLndpZHRoLCBpbWFnZS5oZWlnaHQpOyAgCisgICAg fQorICAgIAorICAgIHZhciBleHBlY3RlZEltYWdlRGF0YSA9IGdldEltYWdlRGF0YShleHBlY3Rl ZEltYWdlKTsKKyAgICB2YXIgYWN0dWFsSW1hZ2VEYXRhID0gZ2V0SW1hZ2VEYXRhKGFjdHVhbElt YWdlKTsKKyAgICAKKyAgICB2YXIgZGlmZkNhbnZhcyA9ICQoJ2RpZmYtY2FudmFzJyk7CisgICAg dmFyIGRpZmZDYW52YXNDb250ZXh0ID0gZGlmZkNhbnZhcy5nZXRDb250ZXh0KCcyZCcpOworICAg IHZhciBkaWZmSW1hZ2VEYXRhID0KKyAgICAgICAgZGlmZkNhbnZhc0NvbnRleHQuY3JlYXRlSW1h Z2VEYXRhKGRpZmZDYW52YXMud2lkdGgsIGRpZmZDYW52YXMuaGVpZ2h0KTsKKyAgCisgICAgLy8g QXZvaWRpbmcgcHJvcGVydHkgbG9va3VwcyBmb3IgYWxsIHRoZXNlIGR1cmluZyB0aGUgcGVyLXBp eGVsIGxvb3AgYmVsb3cKKyAgICAvLyBwcm92aWRlcyBhIHNpZ25pZmljYW50IHBlcmZvcm1hbmNl IGJlbmVmaXQuCisgICAgdmFyIGV4cGVjdGVkV2lkdGggPSBleHBlY3RlZEltYWdlLndpZHRoOwor ICAgIHZhciBleHBlY3RlZEhlaWdodCA9IGV4cGVjdGVkSW1hZ2UuaGVpZ2h0OworICAgIHZhciBl eHBlY3RlZCA9IGV4cGVjdGVkSW1hZ2VEYXRhLmRhdGE7CisgICAgCisgICAgdmFyIGFjdHVhbFdp ZHRoID0gYWN0dWFsSW1hZ2Uud2lkdGg7CisgICAgdmFyIGFjdHVhbCA9IGFjdHVhbEltYWdlRGF0 YS5kYXRhOworICAKKyAgICB2YXIgZGlmZldpZHRoID0gZGlmZkltYWdlRGF0YS53aWR0aDsKKyAg ICB2YXIgZGlmZiA9IGRpZmZJbWFnZURhdGEuZGF0YTsKKyAgICAKKyAgICBmb3IgKHZhciB4ID0g MDsgeCA8IGV4cGVjdGVkV2lkdGg7IHgrKykgeworICAgICAgICBmb3IgKHZhciB5ID0gMDsgeSA8 IGV4cGVjdGVkSGVpZ2h0OyB5KyspIHsKKyAgICAgICAgICAgIHZhciBleHBlY3RlZE9mZnNldCA9 ICh5ICogZXhwZWN0ZWRXaWR0aCArIHgpICogNDsKKyAgICAgICAgICAgIHZhciBhY3R1YWxPZmZz ZXQgPSAoeSAqIGFjdHVhbFdpZHRoICsgeCkgKiA0OworICAgICAgICAgICAgdmFyIGRpZmZPZmZz ZXQgPSAoeSAqIGRpZmZXaWR0aCArIHgpICogNDsKKyAgICAgICAgICAgIGlmIChleHBlY3RlZFtl eHBlY3RlZE9mZnNldF0gIT0gYWN0dWFsW2FjdHVhbE9mZnNldF0gfHwKKyAgICAgICAgICAgICAg ICBleHBlY3RlZFtleHBlY3RlZE9mZnNldCArIDFdICE9IGFjdHVhbFthY3R1YWxPZmZzZXQgKyAx XSB8fAorICAgICAgICAgICAgICAgIGV4cGVjdGVkW2V4cGVjdGVkT2Zmc2V0ICsgMl0gIT0gYWN0 dWFsW2FjdHVhbE9mZnNldCArIDJdIHx8CisgICAgICAgICAgICAgICAgZXhwZWN0ZWRbZXhwZWN0 ZWRPZmZzZXQgKyAzXSAhPSBhY3R1YWxbYWN0dWFsT2Zmc2V0ICsgM10pIHsKKyAgICAgICAgICAg ICAgICBkaWZmW2RpZmZPZmZzZXRdID0gMjU1OworICAgICAgICAgICAgICAgIGRpZmZbZGlmZk9m ZnNldCArIDFdID0gMDsKKyAgICAgICAgICAgICAgICBkaWZmW2RpZmZPZmZzZXQgKyAyXSA9IDA7 CisgICAgICAgICAgICAgICAgZGlmZltkaWZmT2Zmc2V0ICsgM10gPSAyNTU7CisgICAgICAgICAg ICB9IGVsc2UgeworICAgICAgICAgICAgICAgIGRpZmZbZGlmZk9mZnNldF0gPSBleHBlY3RlZFtl eHBlY3RlZE9mZnNldF07CisgICAgICAgICAgICAgICAgZGlmZltkaWZmT2Zmc2V0ICsgMV0gPSBl eHBlY3RlZFtleHBlY3RlZE9mZnNldCArIDFdOworICAgICAgICAgICAgICAgIGRpZmZbZGlmZk9m ZnNldCArIDJdID0gZXhwZWN0ZWRbZXhwZWN0ZWRPZmZzZXQgKyAyXTsKKyAgICAgICAgICAgICAg ICBkaWZmW2RpZmZPZmZzZXQgKyAzXSA9IDMyOworICAgICAgICAgICAgfQorICAgICAgICB9Cisg ICAgfQorICAgIAorICAgIGRpZmZDYW52YXNDb250ZXh0LnB1dEltYWdlRGF0YSgKKyAgICAgICAg ZGlmZkltYWdlRGF0YSwKKyAgICAgICAgMCwgMCwKKyAgICAgICAgMCwgMCwKKyAgICAgICAgZGlm ZkltYWdlRGF0YS53aWR0aCwgZGlmZkltYWdlRGF0YS5oZWlnaHQpOworICAgIGRpZmZDYW52YXMu Y2xhc3NOYW1lID0gJyc7CiB9CiAKIGZ1bmN0aW9uIGRpc3BsYXlUZXh0UmVzdWx0cyh0ZXN0TmFt ZSkK