84682 2012-04-24 01:42:26 -0700 [chromium-android] Dump Image in RGBA order with a checksum. 2012-05-09 17:30:24 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Android Unspecified RESOLVED DUPLICATE 86040 P2 Normal --- 1 jnd jnd abarth tkent tony webkit.review.bot zhenghao oldest_to_newest 608458 0 jnd 2012-04-24 01:42:26 -0700 On Chromium Android, pixel layout encoding is RGBA, however, other Chrome platforms use BGRA. We need to correctly dump the image with RGBA encoding and reorder the layout of pixels to calculate the checksum in order to match the checksum of other Chrome platforms. 608750 1 138576 jnd 2012-04-24 09:25:43 -0700 Created attachment 138576 patch v1 609328 2 138576 tkent 2012-04-24 17:59:16 -0700 Comment on attachment 138576 patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=138576&action=review This change is acceptable. However - introduce webkit_support::EncodeRGBAPNGWithChecksum(), and - Make re-ordered bytes on the fly and pour it to MD5 digester would be better for performance. > Tools/DumpRenderTree/chromium/TestShell.cpp:674 > + WTF::MD5 digester; > + WTF::Vector<uint8_t, 16> digestValue; You don't need to add WTF::. > Tools/DumpRenderTree/chromium/TestShell.cpp:685 > + WTF::Vector<SkPMColor> pixelsInBGRAOrder; ditto. > Tools/DumpRenderTree/chromium/TestShell.cpp:688 > + SkPMColor* srcRow = reinterpret_cast<SkPMColor*>(sourceBitmap.getAddr32(0, y)); nit: The variable name should be sourceRow for consistency. 620094 3 abarth 2012-05-09 17:30:24 -0700 *** This bug has been marked as a duplicate of bug 86040 *** 138576 2012-04-24 09:25:43 -0700 2012-04-24 17:59:16 -0700 patch v1 pixel_encoding.txt text/plain 3896 jnd SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDExNTA2NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDEyLTA0LTI0ICBKb2hubnkgRGluZyAgPGpuZEBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmVvcmRlciBTa0JpdG1hcCB3aGljaCBpcyBpbiBSR0JBIG9yZGVyIHRvIEJHUkEg b3JkZXIgaW4gb3JkZXIgdG8gY29ycmVjdGx5IGR1bXAgaXQuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDY4MgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgSXQncyBiZWNhdXNlIHRoZSBwaXhl bCBsYXlvdXQgZW5jb2Rpbmcgb2YgU2tCaXRtYXAgaXMgUkdCQSwgb3RoZXIgQ2hyb21lIHBsYXRm b3JtcyB1c2UgQkdSQS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RT aGVsbC5jcHA6CisgICAgICAgIChUZXN0U2hlbGw6OmR1bXBJbWFnZSk6CisKIDIwMTItMDQtMjQg IE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hy b21pdW1dIFVucmV2aWV3ZWQgdGVzdCBleHBlY3RhdGlvbnMgdXBkYXRlLgpJbmRleDogVG9vbHMv RHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuY3BwCShyZXZpc2lvbiAxMTUwMTcp CisrKyBUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC02NCw2ICs2NCwxMSBAQAogI2luY2x1ZGUgPGNjdHlwZT4KICNpbmNsdWRlIDx2 ZWN0b3I+CiAjaW5jbHVkZSA8d3RmL01ENS5oPgorI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KKwor I2lmIE9TKEFORFJPSUQpCisjaW5jbHVkZSAidGhpcmRfcGFydHkvc2tpYS9pbmNsdWRlL2NvcmUv U2tDb2xvclByaXYuaCIKKyNlbmRpZgogCiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogdXNpbmcg bmFtZXNwYWNlIHN0ZDsKQEAgLTY2NSw5ICs2NzAsMzQgQEAgdm9pZCBUZXN0U2hlbGw6OmR1bXBJ bWFnZShTa0NhbnZhcyogY2FudgogICAgIFNrQXV0b0xvY2tQaXhlbHMgc291cmNlQml0bWFwTG9j ayhzb3VyY2VCaXRtYXApOwogCiAgICAgLy8gQ29tcHV0ZSBNRDUgc3VtLgotICAgIE1ENSBkaWdl c3RlcjsKLSAgICBWZWN0b3I8dWludDhfdCwgMTY+IGRpZ2VzdFZhbHVlOwotICAgIGRpZ2VzdGVy LmFkZEJ5dGVzKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KHNvdXJjZUJpdG1hcC5n ZXRQaXhlbHMoKSksIHNvdXJjZUJpdG1hcC5nZXRTaXplKCkpOworICAgIFdURjo6TUQ1IGRpZ2Vz dGVyOworICAgIFdURjo6VmVjdG9yPHVpbnQ4X3QsIDE2PiBkaWdlc3RWYWx1ZTsKKyAgICBjb25z dCB1aW50OF90KiBpbWFnZVBpeGVscyA9IHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+ KHNvdXJjZUJpdG1hcC5nZXRQaXhlbHMoKSk7CisjaWYgT1MoQU5EUk9JRCkKKyAgICAvLyBPbiBD aHJvbWl1bSBBbmRyb2lkLCBwaXhlbCBsYXlvdXQgZW5jb2RpbmcgaXMgUkdCQSwgaG93ZXZlciwg b3RoZXIgQ2hyb21lCisgICAgLy8gcGxhdGZvcm1zIHVzZSBCR1JBLiBXZSBuZWVkIHRvIHJlb3Jk ZXIgdGhlIGxheW91dCBvZiBwaXhlbHMgaW4gQlJHQSBvcmRlcgorICAgIC8vIHRvIGNhbGN1bGF0 ZSB0aGUgY2hlY2tzdW0gaW4gb3JkZXIgdG8gbWF0Y2ggdGhlIGNoZWNrc3VtIG9mIG90aGVyIENo cm9tZQorICAgIC8vIHBsYXRmb3Jtcy4KKyAgICAvLyBOT1RFOiBUaGUgZm9sbG93aW5nIGNvZGUg YXNzdW1lcyB3ZSB1c2UgU2tCaXRtYXA6OmtBUkdCXzg4ODhfQ29uZmlnLAorICAgIC8vIHdoaWNo IGhhcyBiZWVuIGNoZWNrZWQgaW4gZGV2aWNlLm1ha2VPcGFxdWUoKSAoc2VlIGFib3ZlKS4KKyAg ICBpbnQgd2lkdGggPSBzb3VyY2VCaXRtYXAud2lkdGgoKTsKKyAgICBpbnQgaGVpZ2h0ID0gc291 cmNlQml0bWFwLmhlaWdodCgpOworICAgIFdURjo6VmVjdG9yPFNrUE1Db2xvcj4gcGl4ZWxzSW5C R1JBT3JkZXI7CisgICAgcGl4ZWxzSW5CR1JBT3JkZXIucmVzZXJ2ZUNhcGFjaXR5KHdpZHRoICog aGVpZ2h0KTsKKyAgICBmb3IgKGludCB5ID0gMDsgeSA8IGhlaWdodDsgKyt5KSB7CisgICAgICAg IFNrUE1Db2xvciogc3JjUm93ID0gcmVpbnRlcnByZXRfY2FzdDxTa1BNQ29sb3IqPihzb3VyY2VC aXRtYXAuZ2V0QWRkcjMyKDAsIHkpKTsKKyAgICAgICAgZm9yIChpbnQgeCA9IDA7IHggPCB3aWR0 aDsgKyt4KSB7CisgICAgICAgICAgICBTa1BNQ29sb3IgY29sb3IgPSBzcmNSb3dbeF07CisgICAg ICAgICAgICBwaXhlbHNJbkJHUkFPcmRlci5hcHBlbmQoU2tHZXRQYWNrZWRCMzIoY29sb3IpIHwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoU2tHZXRQYWNrZWRHMzIoY29s b3IpIDw8IDgpIHwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoU2tHZXRQ YWNrZWRSMzIoY29sb3IpIDw8IDE2KSB8CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKFNrR2V0UGFja2VkQTMyKGNvbG9yKSA8PCAyNCkpOworICAgICAgICB9CisgICAgfQor ICAgIGltYWdlUGl4ZWxzID0gcmVpbnRlcnByZXRfY2FzdDx1aW50OF90Kj4ocGl4ZWxzSW5CR1JB T3JkZXIuZGF0YSgpKTsKKyAgICBBU1NFUlQocGl4ZWxzSW5CR1JBT3JkZXIuc2l6ZSgpICogc2l6 ZW9mKFNrUE1Db2xvcikgPT0gc291cmNlQml0bWFwLmdldFNpemUoKSk7CisjZW5kaWYKKyAgICBk aWdlc3Rlci5hZGRCeXRlcyhpbWFnZVBpeGVscywgc291cmNlQml0bWFwLmdldFNpemUoKSk7ICAK ICAgICBkaWdlc3Rlci5jaGVja3N1bShkaWdlc3RWYWx1ZSk7CiAgICAgc3RyaW5nIG1kNWhhc2g7 CiAgICAgbWQ1aGFzaC5yZXNlcnZlKDE2ICogMik7CkBAIC02ODIsOCArNzEyLDggQEAgdm9pZCBU ZXN0U2hlbGw6OmR1bXBJbWFnZShTa0NhbnZhcyogY2FudgogICAgIC8vIGltYWdlIGlzIHJlYWxs eSBleHBlbnNpdmUuCiAgICAgaWYgKG1kNWhhc2guY29tcGFyZShtX3BhcmFtcy5waXhlbEhhc2gp KSB7CiAgICAgICAgIHN0ZDo6dmVjdG9yPHVuc2lnbmVkIGNoYXI+IHBuZzsKLSAgICAgICAgd2Vi a2l0X3N1cHBvcnQ6OkVuY29kZUJHUkFQTkdXaXRoQ2hlY2tzdW0ocmVpbnRlcnByZXRfY2FzdDxj b25zdCB1bnNpZ25lZCBjaGFyKj4oc291cmNlQml0bWFwLmdldFBpeGVscygpKSwgc291cmNlQml0 bWFwLndpZHRoKCksCi0gICAgICAgICAgICBzb3VyY2VCaXRtYXAuaGVpZ2h0KCksIHN0YXRpY19j YXN0PGludD4oc291cmNlQml0bWFwLnJvd0J5dGVzKCkpLCBkaXNjYXJkVHJhbnNwYXJlbmN5LCBt ZDVoYXNoLCAmcG5nKTsKKyAgICAgICAgd2Via2l0X3N1cHBvcnQ6OkVuY29kZUJHUkFQTkdXaXRo Q2hlY2tzdW0oaW1hZ2VQaXhlbHMsIHNvdXJjZUJpdG1hcC53aWR0aCgpLCBzb3VyY2VCaXRtYXAu aGVpZ2h0KCksCisgICAgICAgICAgICBzdGF0aWNfY2FzdDxpbnQ+KHNvdXJjZUJpdG1hcC5yb3dC eXRlcygpKSwgZGlzY2FyZFRyYW5zcGFyZW5jeSwgbWQ1aGFzaCwgJnBuZyk7CiAKICAgICAgICAg bV9wcmludGVyLT5oYW5kbGVJbWFnZShtZDVoYXNoLmNfc3RyKCksIG1fcGFyYW1zLnBpeGVsSGFz aC5jX3N0cigpLCAmcG5nWzBdLCBwbmcuc2l6ZSgpLCBtX3BhcmFtcy5waXhlbEZpbGVOYW1lLmNf c3RyKCkpOwogICAgIH0gZWxzZQo=