44993 2010-08-31 14:50:01 -0700 gl-teximage.html and tex-image-and-sub-image-2d-with-image.html failed on Chromium Mac bots (10.5) 2010-08-31 17:34:55 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 44566 1 zmo zmo kbr tony oldest_to_newest 272397 0 zmo 2010-08-31 14:50:01 -0700 The tests run fine on my Mac (10.6), but fail on Chromium bots (10.5). kbr's educated guess is due to image unpack alignment is ignored in the current code. 272404 1 66114 zmo 2010-08-31 14:52:33 -0700 Created attachment 66114 patch 272444 2 zmo 2010-08-31 15:39:35 -0700 *** Bug 44997 has been marked as a duplicate of this bug. *** 272464 3 66132 zmo 2010-08-31 16:14:23 -0700 Created attachment 66132 revised patch: re-enabling failing tests Enabling the failing tests together with the attempted fix. 272527 4 66132 kbr 2010-08-31 17:29:46 -0700 Comment on attachment 66132 revised patch: re-enabling failing tests Looks good; one minor stylistic issue. > Index: WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp > =================================================================== > --- WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp (revision 66549) > +++ WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp (working copy) > @@ -140,7 +140,15 @@ bool GraphicsContext3D::getImageData(Ima > return false; > const UInt8* rgba = CFDataGetBytePtr(pixelData.get()); > outputVector.resize(width * height * 4); > - bool rt = packPixels(rgba, srcDataFormat, width, height, 0, > + unsigned int srcUnpackAlignment = 0; > + size_t bytesPerRow = CGImageGetBytesPerRow(cgImage); > + unsigned int padding = bytesPerRow - componentsPerPixel * width; > + if (padding) { > + srcUnpackAlignment = padding + 1; > + while (bytesPerRow % srcUnpackAlignment) > + srcUnpackAlignment++; > + } This is a little subtle but I can't think of a better way to express it. Use preincrement however (++srcUnpackAligment). > + bool rt = packPixels(rgba, srcDataFormat, width, height, srcUnpackAlignment, > format, type, neededAlphaOp, outputVector.data()); > return rt; > } > Index: LayoutTests/ChangeLog > =================================================================== > --- LayoutTests/ChangeLog (revision 66549) > +++ LayoutTests/ChangeLog (working copy) > @@ -1,3 +1,12 @@ > +2010-08-31 Zhenyao Mo <zmo@google.com> > + > + Reviewed by NOBODY (OOPS!). > + > + gl-teximage.html and tex-image-and-sub-image-2d-with-image.html failed on Chromium Mac bots (10.5) > + https://bugs.webkit.org/show_bug.cgi?id=44993 > + > + * platform/chromium/test_expectations.txt: Enabling the failing tests with the fix. > + > 2010-08-31 Sam Weinig <sam@webkit.org> > > Reviewed by Gavin Barraclough. > Index: LayoutTests/platform/chromium/test_expectations.txt > =================================================================== > --- LayoutTests/platform/chromium/test_expectations.txt (revision 66549) > +++ LayoutTests/platform/chromium/test_expectations.txt (working copy) > @@ -3165,7 +3165,3 @@ BUGWK44967 MAC : fast/multicol/paginate- > // New tests in r66523 and r66516 > BUGWK44996 WIN : inspector/report-API-errors.html = TEXT > BUGWK44996 WIN : inspector/report-protocol-errors.html = TEXT > - > -// Failing after r44997 > -BUGWK44997 MAC : fast/canvas/webgl/gl-teximage.html = TEXT > -BUGWK44997 MAC : fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html = TEXT 272530 5 zmo 2010-08-31 17:34:55 -0700 Committed r66559: <http://trac.webkit.org/changeset/66559> 66114 2010-08-31 14:52:33 -0700 2010-08-31 16:14:23 -0700 patch pack.patch text/plain 1740 zmo SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NjU0MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTAtMDgtMzEgIFpoZW55YW8gTW8gIDx6bW9AZ29vZ2xlLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBnbC10ZXhp bWFnZS5odG1sIGFuZCB0ZXgtaW1hZ2UtYW5kLXN1Yi1pbWFnZS0yZC13aXRoLWltYWdlLmh0bWwg ZmFpbGVkIG9uIENocm9taXVtIE1hYyBib3RzICgxMC41KQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ5OTMKKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dDNEQ0cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3Jh cGhpY3NDb250ZXh0M0Q6OmdldEltYWdlRGF0YSk6IFRha2UgaW50byBjb25zaWRlcmF0aW9uIHRo ZSBzb3VyY2UgaW1hZ2UgcGl4ZWwgcm93IGFsaWdubWVudC4KKwogMjAxMC0wOC0zMSAgTWFydGlu IFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg R3VzdGF2byBOb3JvbmhhIFNpbHZhLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j Zy9HcmFwaGljc0NvbnRleHQzRENHLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dDNEQ0cuY3BwCShyZXZpc2lvbiA2NjUxMSkKKysr IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0M0RDRy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTE0MCw3ICsxNDAsMTUgQEAgYm9vbCBHcmFwaGljc0NvbnRleHQzRDo6 Z2V0SW1hZ2VEYXRhKEltYQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgY29uc3QgVUludDgq IHJnYmEgPSBDRkRhdGFHZXRCeXRlUHRyKHBpeGVsRGF0YS5nZXQoKSk7CiAgICAgb3V0cHV0VmVj dG9yLnJlc2l6ZSh3aWR0aCAqIGhlaWdodCAqIDQpOwotICAgIGJvb2wgcnQgPSBwYWNrUGl4ZWxz KHJnYmEsIHNyY0RhdGFGb3JtYXQsIHdpZHRoLCBoZWlnaHQsIDAsCisgICAgdW5zaWduZWQgaW50 IHNyY1VucGFja0FsaWdubWVudCA9IDA7CisgICAgc2l6ZV90IGJ5dGVzUGVyUm93ID0gQ0dJbWFn ZUdldEJ5dGVzUGVyUm93KGNnSW1hZ2UpOworICAgIHVuc2lnbmVkIGludCBwYWRkaW5nID0gYnl0 ZXNQZXJSb3cgLSBjb21wb25lbnRzUGVyUGl4ZWwgKiB3aWR0aDsKKyAgICBpZiAocGFkZGluZykg eworICAgICAgICBzcmNVbnBhY2tBbGlnbm1lbnQgPSBwYWRkaW5nICsgMTsKKyAgICAgICAgd2hp bGUgKGJ5dGVzUGVyUm93ICUgc3JjVW5wYWNrQWxpZ25tZW50KQorICAgICAgICAgICAgc3JjVW5w YWNrQWxpZ25tZW50Kys7CisgICAgfQorICAgIGJvb2wgcnQgPSBwYWNrUGl4ZWxzKHJnYmEsIHNy Y0RhdGFGb3JtYXQsIHdpZHRoLCBoZWlnaHQsIHNyY1VucGFja0FsaWdubWVudCwKICAgICAgICAg ICAgICAgICAgICAgICAgICBmb3JtYXQsIHR5cGUsIG5lZWRlZEFscGhhT3AsIG91dHB1dFZlY3Rv ci5kYXRhKCkpOwogICAgIHJldHVybiBydDsKIH0K 66132 2010-08-31 16:14:23 -0700 2010-08-31 17:29:46 -0700 revised patch: re-enabling failing tests pack.patch text/plain 3014 zmo SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NjU0OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTAtMDgtMzEgIFpoZW55YW8gTW8gIDx6bW9AZ29vZ2xlLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBnbC10ZXhp bWFnZS5odG1sIGFuZCB0ZXgtaW1hZ2UtYW5kLXN1Yi1pbWFnZS0yZC13aXRoLWltYWdlLmh0bWwg ZmFpbGVkIG9uIENocm9taXVtIE1hYyBib3RzICgxMC41KQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ5OTMKKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dDNEQ0cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3Jh cGhpY3NDb250ZXh0M0Q6OmdldEltYWdlRGF0YSk6IFRha2UgaW50byBjb25zaWRlcmF0aW9uIHRo ZSBzb3VyY2UgaW1hZ2UgcGl4ZWwgcm93IGFsaWdubWVudC4KKwogMjAxMC0wOC0zMSAgTmF0ZSBD aGFwaW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmlu IEZpc2hlci4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250 ZXh0M0RDRy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9H cmFwaGljc0NvbnRleHQzRENHLmNwcAkocmV2aXNpb24gNjY1NDkpCisrKyBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dDNEQ0cuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xNDAsNyArMTQwLDE1IEBAIGJvb2wgR3JhcGhpY3NDb250ZXh0M0Q6OmdldEltYWdlRGF0YShJ bWEKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGNvbnN0IFVJbnQ4KiByZ2JhID0gQ0ZEYXRh R2V0Qnl0ZVB0cihwaXhlbERhdGEuZ2V0KCkpOwogICAgIG91dHB1dFZlY3Rvci5yZXNpemUod2lk dGggKiBoZWlnaHQgKiA0KTsKLSAgICBib29sIHJ0ID0gcGFja1BpeGVscyhyZ2JhLCBzcmNEYXRh Rm9ybWF0LCB3aWR0aCwgaGVpZ2h0LCAwLAorICAgIHVuc2lnbmVkIGludCBzcmNVbnBhY2tBbGln bm1lbnQgPSAwOworICAgIHNpemVfdCBieXRlc1BlclJvdyA9IENHSW1hZ2VHZXRCeXRlc1BlclJv dyhjZ0ltYWdlKTsKKyAgICB1bnNpZ25lZCBpbnQgcGFkZGluZyA9IGJ5dGVzUGVyUm93IC0gY29t cG9uZW50c1BlclBpeGVsICogd2lkdGg7CisgICAgaWYgKHBhZGRpbmcpIHsKKyAgICAgICAgc3Jj VW5wYWNrQWxpZ25tZW50ID0gcGFkZGluZyArIDE7CisgICAgICAgIHdoaWxlIChieXRlc1BlclJv dyAlIHNyY1VucGFja0FsaWdubWVudCkKKyAgICAgICAgICAgIHNyY1VucGFja0FsaWdubWVudCsr OworICAgIH0KKyAgICBib29sIHJ0ID0gcGFja1BpeGVscyhyZ2JhLCBzcmNEYXRhRm9ybWF0LCB3 aWR0aCwgaGVpZ2h0LCBzcmNVbnBhY2tBbGlnbm1lbnQsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgZm9ybWF0LCB0eXBlLCBuZWVkZWRBbHBoYU9wLCBvdXRwdXRWZWN0b3IuZGF0YSgpKTsKICAg ICByZXR1cm4gcnQ7CiB9CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA2NjU0OSkKKysrIExheW91dFRlc3Rz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDEwLTA4LTMxICBa aGVueWFvIE1vICA8em1vQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgZ2wtdGV4aW1hZ2UuaHRtbCBhbmQgdGV4LWltYWdlLWFuZC1z dWItaW1hZ2UtMmQtd2l0aC1pbWFnZS5odG1sIGZhaWxlZCBvbiBDaHJvbWl1bSBNYWMgYm90cyAo MTAuNSkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0 OTkzCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQ6 IEVuYWJsaW5nIHRoZSBmYWlsaW5nIHRlc3RzIHdpdGggdGhlIGZpeC4KKwogMjAxMC0wOC0zMSAg U2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdhdmlu IEJhcnJhY2xvdWdoLgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9l eHBlY3RhdGlvbnMudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9t aXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dAkocmV2aXNpb24gNjY1NDkpCisrKyBMYXlvdXRUZXN0 cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQJKHdvcmtpbmcgY29weSkK QEAgLTMxNjUsNyArMzE2NSwzIEBAIEJVR1dLNDQ5NjcgTUFDIDogZmFzdC9tdWx0aWNvbC9wYWdp bmF0ZS0KIC8vIE5ldyB0ZXN0cyBpbiByNjY1MjMgYW5kIHI2NjUxNgogQlVHV0s0NDk5NiBXSU4g OiBpbnNwZWN0b3IvcmVwb3J0LUFQSS1lcnJvcnMuaHRtbCA9IFRFWFQKIEJVR1dLNDQ5OTYgV0lO IDogaW5zcGVjdG9yL3JlcG9ydC1wcm90b2NvbC1lcnJvcnMuaHRtbCA9IFRFWFQKLQotLy8gRmFp bGluZyBhZnRlciByNDQ5OTcKLUJVR1dLNDQ5OTcgTUFDIDogZmFzdC9jYW52YXMvd2ViZ2wvZ2wt dGV4aW1hZ2UuaHRtbCA9IFRFWFQKLUJVR1dLNDQ5OTcgTUFDIDogZmFzdC9jYW52YXMvd2ViZ2wv dGV4LWltYWdlLWFuZC1zdWItaW1hZ2UtMmQtd2l0aC1pbWFnZS5odG1sID0gVEVYVAo=