86040 2012-05-09 17:08:23 -0700 [Chromium] Android needs to swizzle pixel dumps in order to get the same hash as other platforms 2012-05-09 17:50:35 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 66687 1 abarth abarth dpranke eric jnd johnme peter tkent tony webkit.review.bot oldest_to_newest 620054 0 abarth 2012-05-09 17:08:23 -0700 [Chromium] Android needs to swizzle pixel dumps in order to get the same hash as other platforms 620056 1 141057 abarth 2012-05-09 17:08:54 -0700 Created attachment 141057 Patch 620062 2 141057 eric 2012-05-09 17:13:16 -0700 Comment on attachment 141057 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141057&action=review > Tools/DumpRenderTree/chromium/TestShell.cpp:710 > +#if OS(ANDROID) > + webkit_support::EncodeRGBAPNGWithChecksum(reinterpret_cast<const unsigned char*>(sourceBitmap.getPixels()), sourceBitmap.width(), > + sourceBitmap.height(), static_cast<int>(sourceBitmap.rowBytes()), discardTransparency, md5hash, &png); > +#else > webkit_support::EncodeBGRAPNGWithChecksum(reinterpret_cast<const unsigned char*>(sourceBitmap.getPixels()), sourceBitmap.width(), > sourceBitmap.height(), static_cast<int>(sourceBitmap.rowBytes()), discardTransparency, md5hash, &png); > +#endif Did you just add 5 lines of code, or 4 charaters or am blind? 620090 3 141057 tkent 2012-05-09 17:28:58 -0700 Comment on attachment 141057 Patch This bug looks a dupe of Bug 84682. Anyway, the code is ok. 620095 4 abarth 2012-05-09 17:30:24 -0700 *** Bug 84682 has been marked as a duplicate of this bug. *** 620117 5 141057 webkit.review.bot 2012-05-09 17:50:30 -0700 Comment on attachment 141057 Patch Clearing flags on attachment: 141057 Committed r116588: <http://trac.webkit.org/changeset/116588> 620118 6 webkit.review.bot 2012-05-09 17:50:35 -0700 All reviewed patches have been landed. Closing bug. 141057 2012-05-09 17:08:54 -0700 2012-05-09 17:50:30 -0700 Patch bug-86040-20120509170853.patch text/plain 3288 abarth SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDExNjU3OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDEyLTA1LTA5ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisK KyAgICAgICAgW0Nocm9taXVtXSBBbmRyb2lkIG5lZWRzIHRvIHN3aXp6bGUgcGl4ZWwgZHVtcHMg aW4gb3JkZXIgdG8gZ2V0IHRoZSBzYW1lIGhhc2ggYXMgb3RoZXIgcGxhdGZvcm1zCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjA0MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUv Y2hyb21pdW0vVGVzdFNoZWxsLmNwcDoKKyAgICAgICAgKFRlc3RTaGVsbDo6ZHVtcEltYWdlKToK KwogMjAxMi0wNS0wOSAgVG9tIFpha3JhanNlayAgPHRvbXpAY29kZWF1cm9yYS5vcmc+CiAKICAg ICAgICAgRml4IG92ZXJ6ZWFsb3VzIHJlLW9wZW5lZCBzaW5jZSBibG9ja2VkIGJ5Li4uIG1lc3Nh Z2UKSW5kZXg6IFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcAko cmV2aXNpb24gMTE2NTI1KQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNo ZWxsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjQsNiArNjQsNyBAQAogI2luY2x1ZGUgPGNjdHlw ZT4KICNpbmNsdWRlIDx2ZWN0b3I+CiAjaW5jbHVkZSA8d3RmL01ENS5oPgorI2luY2x1ZGUgPHd0 Zi9Pd25BcnJheVB0ci5oPgogCiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogdXNpbmcgbmFtZXNw YWNlIHN0ZDsKQEAgLTY2Niw3ICs2NjcsMjYgQEAgdm9pZCBUZXN0U2hlbGw6OmR1bXBJbWFnZShT a0NhbnZhcyogY2FudgogICAgIC8vIENvbXB1dGUgTUQ1IHN1bS4KICAgICBNRDUgZGlnZXN0ZXI7 CiAgICAgVmVjdG9yPHVpbnQ4X3QsIDE2PiBkaWdlc3RWYWx1ZTsKKyNpZiBPUyhBTkRST0lEKQor ICAgIC8vIE9uIEFuZHJvaWQsIHBpeGVsIGxheW91dCBpcyBSR0JBIChzZWUgdGhpcmRfcGFydHkv c2tpYS9pbmNsdWRlL2NvcmUvU2tDb2xvclByaXYuaCk7CisgICAgLy8gaG93ZXZlciwgb3RoZXIg Q2hyb21lIHBsYXRmb3JtcyB1c2UgQkdSQSAoc2VlIHNraWEvY29uZmlnL1NrVXNlckNvbmZpZy5o KS4KKyAgICAvLyBUbyBtYXRjaCB0aGUgY2hlY2tzdW0gb2Ygb3RoZXIgQ2hyb21lIHBsYXRmb3Jt cywgd2UgbmVlZCB0byByZW9yZGVyIHRoZSBsYXlvdXQgb2YgcGl4ZWxzLgorICAgIC8vIE5PVEU6 IFRoZSBmb2xsb3dpbmcgY29kZSBhc3N1bWVzIHdlIHVzZSBTa0JpdG1hcDo6a0FSR0JfODg4OF9D b25maWcsCisgICAgLy8gd2hpY2ggaGFzIGJlZW4gY2hlY2tlZCBpbiBkZXZpY2UubWFrZU9wYXF1 ZSgpIChzZWUgYWJvdmUpLgorICAgIGNvbnN0IHVpbnQ4X3QqIHJhd1BpeGVscyA9IHJlaW50ZXJw cmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KHNvdXJjZUJpdG1hcC5nZXRQaXhlbHMoKSk7CisgICAg c2l6ZV90IGJpdG1hcFNpemUgPSBzb3VyY2VCaXRtYXAuZ2V0U2l6ZSgpOworICAgIE93bkFycmF5 UHRyPHVpbnQ4X3Q+IHJlb3JkZXJlZFBpeGVscyA9IGFkb3B0QXJyYXlQdHIobmV3IHVpbnQ4X3Rb Yml0bWFwU2l6ZV0pOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgYml0bWFwU2l6ZTsgaSAr PSA0KSB7CisgICAgICAgIHJlb3JkZXJlZFBpeGVsc1tpXSA9IHJhd1BpeGVsc1tpICsgMl07IC8v IFIKKyAgICAgICAgcmVvcmRlcmVkUGl4ZWxzW2kgKyAxXSA9IHJhd1BpeGVsc1tpICsgMV07IC8v IEcKKyAgICAgICAgcmVvcmRlcmVkUGl4ZWxzW2kgKyAyXSA9IHJhd1BpeGVsc1tpXTsgLy8gQgor ICAgICAgICByZW9yZGVyZWRQaXhlbHNbaSArIDNdID0gcmF3UGl4ZWxzW2kgKyAzXTsgLy8gQQor ICAgIH0KKyAgICBkaWdlc3Rlci5hZGRCeXRlcyhyZW9yZGVyZWRQaXhlbHMuZ2V0KCksIGJpdG1h cFNpemUpOworICAgIHJlb3JkZXJlZFBpeGVscy5jbGVhcigpOworI2Vsc2UKICAgICBkaWdlc3Rl ci5hZGRCeXRlcyhyZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQ4X3QqPihzb3VyY2VCaXRtYXAu Z2V0UGl4ZWxzKCkpLCBzb3VyY2VCaXRtYXAuZ2V0U2l6ZSgpKTsKKyNlbmRpZgogICAgIGRpZ2Vz dGVyLmNoZWNrc3VtKGRpZ2VzdFZhbHVlKTsKICAgICBzdHJpbmcgbWQ1aGFzaDsKICAgICBtZDVo YXNoLnJlc2VydmUoMTYgKiAyKTsKQEAgLTY4MSw4ICs3MDEsMTMgQEAgdm9pZCBUZXN0U2hlbGw6 OmR1bXBJbWFnZShTa0NhbnZhcyogY2FudgogICAgIC8vIGltYWdlIGlzIHJlYWxseSBleHBlbnNp dmUuCiAgICAgaWYgKG1kNWhhc2guY29tcGFyZShtX3BhcmFtcy5waXhlbEhhc2gpKSB7CiAgICAg ICAgIHN0ZDo6dmVjdG9yPHVuc2lnbmVkIGNoYXI+IHBuZzsKKyNpZiBPUyhBTkRST0lEKQorICAg ICAgICB3ZWJraXRfc3VwcG9ydDo6RW5jb2RlUkdCQVBOR1dpdGhDaGVja3N1bShyZWludGVycHJl dF9jYXN0PGNvbnN0IHVuc2lnbmVkIGNoYXIqPihzb3VyY2VCaXRtYXAuZ2V0UGl4ZWxzKCkpLCBz b3VyY2VCaXRtYXAud2lkdGgoKSwKKyAgICAgICAgICAgIHNvdXJjZUJpdG1hcC5oZWlnaHQoKSwg c3RhdGljX2Nhc3Q8aW50Pihzb3VyY2VCaXRtYXAucm93Qnl0ZXMoKSksIGRpc2NhcmRUcmFuc3Bh cmVuY3ksIG1kNWhhc2gsICZwbmcpOworI2Vsc2UKICAgICAgICAgd2Via2l0X3N1cHBvcnQ6OkVu Y29kZUJHUkFQTkdXaXRoQ2hlY2tzdW0ocmVpbnRlcnByZXRfY2FzdDxjb25zdCB1bnNpZ25lZCBj aGFyKj4oc291cmNlQml0bWFwLmdldFBpeGVscygpKSwgc291cmNlQml0bWFwLndpZHRoKCksCiAg ICAgICAgICAgICBzb3VyY2VCaXRtYXAuaGVpZ2h0KCksIHN0YXRpY19jYXN0PGludD4oc291cmNl Qml0bWFwLnJvd0J5dGVzKCkpLCBkaXNjYXJkVHJhbnNwYXJlbmN5LCBtZDVoYXNoLCAmcG5nKTsK KyNlbmRpZgogCiAgICAgICAgIG1fcHJpbnRlci0+aGFuZGxlSW1hZ2UobWQ1aGFzaC5jX3N0cigp LCBtX3BhcmFtcy5waXhlbEhhc2guY19zdHIoKSwgJnBuZ1swXSwgcG5nLnNpemUoKSwgbV9wYXJh bXMucGl4ZWxGaWxlTmFtZS5jX3N0cigpKTsKICAgICB9IGVsc2UK