[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
kbr at google.com
kbr at google.com
Wed Dec 22 13:09:08 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 68f857fab6120b4938669479467050c5cb0d73fe
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 7 21:24:12 2010 +0000
2010-09-07 Kenneth Russell <kbr at google.com>
Reviewed by Dimitri Glazkov.
Regression in JPEG texture uploads on Mac OS X
https://bugs.webkit.org/show_bug.cgi?id=45316
Fixed regression introduced in
https://bugs.webkit.org/show_bug.cgi?id=44566 . Added regression
test covering this case to gl-teximage.html in Khronos repository
and synced test with WebKit's version.
* platform/graphics/cg/GraphicsContext3DCG.cpp:
(WebCore::GraphicsContext3D::getImageData):
2010-09-07 Kenneth Russell <kbr at google.com>
Reviewed by Dimitri Glazkov.
Regression in JPEG texture uploads on Mac OS X
https://bugs.webkit.org/show_bug.cgi?id=45316
Fixed regression introduced in
https://bugs.webkit.org/show_bug.cgi?id=44566 . Added regression
test covering this case to gl-teximage.html in Khronos repository
and synced test with WebKit's version.
* fast/canvas/webgl/gl-teximage-expected.txt:
* fast/canvas/webgl/gl-teximage.html:
* fast/canvas/webgl/resources/blue-1x1.jpg: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66908 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a877870..93e7317 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-07 Kenneth Russell <kbr at google.com>
+
+ Reviewed by Dimitri Glazkov.
+
+ Regression in JPEG texture uploads on Mac OS X
+ https://bugs.webkit.org/show_bug.cgi?id=45316
+
+ Fixed regression introduced in
+ https://bugs.webkit.org/show_bug.cgi?id=44566 . Added regression
+ test covering this case to gl-teximage.html in Khronos repository
+ and synced test with WebKit's version.
+
+ * fast/canvas/webgl/gl-teximage-expected.txt:
+ * fast/canvas/webgl/gl-teximage.html:
+ * fast/canvas/webgl/resources/blue-1x1.jpg: Added.
+
2010-09-07 Dan Bernstein <mitz at apple.com>
Reviewed by Dave Hyatt.
diff --git a/LayoutTests/fast/canvas/webgl/gl-teximage-expected.txt b/LayoutTests/fast/canvas/webgl/gl-teximage-expected.txt
index b31b127..e40a969 100644
--- a/LayoutTests/fast/canvas/webgl/gl-teximage-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/gl-teximage-expected.txt
@@ -62,6 +62,10 @@ PASS pixel 255, 8 should be 0, 255, 0, 255 was 0, 255, 0, 255
PASS pixel 0, 0 should be 0, 0, 0, 255 was 0, 0, 0, 255
PASS pixel 128, 0 should be 0, 0, 255, 255 was 0, 0, 255, 255
PASS pixel 255, 0 should be 255, 0, 0, 255 was 255, 0, 0, 255
+
+check uploading of images with no alpha channel works
+PASS getError was expected value: NO_ERROR : Should be no errors from setup
+PASS pixel 128, 8 should be within 10 units of 0, 0, 255, 255 was 0, 0, 254, 255
PASS getError was expected value: NO_ERROR : Should be no errors
PASS successfullyParsed is true
diff --git a/LayoutTests/fast/canvas/webgl/gl-teximage.html b/LayoutTests/fast/canvas/webgl/gl-teximage.html
index cec91b4..e124b5f 100644
--- a/LayoutTests/fast/canvas/webgl/gl-teximage.html
+++ b/LayoutTests/fast/canvas/webgl/gl-teximage.html
@@ -32,7 +32,8 @@ var imgURLs = [
'resources/gray-ramp-gamma9.0.png',
'resources/gray-ramp.png',
'resources/zero-alpha.png',
- 'resources/3x3.png'];
+ 'resources/3x3.png',
+ 'resources/blue-1x1.jpg'];
wtu.loadImagesAsync(imgURLs, runTests);
@@ -68,6 +69,28 @@ function runTests(imgs) {
testPassed(msg);
}
+ function checkPixelRange(buf, x, y, color, allowedRange) {
+ var off = (y * width + x) * 4;
+ var msg = "pixel " + x + ", " + y + " should be within " +
+ allowedRange + " units of " +
+ color[0] + ", " +
+ color[1] + ", " +
+ color[2] + ", " +
+ color[3] + " was " +
+ buf[off + 0] + ", " +
+ buf[off + 1] + ", " +
+ buf[off + 2] + ", " +
+ buf[off + 3];
+
+ for (var ii = 0; ii < 4; ++ii) {
+ if (Math.abs(buf[off + ii] - color[ii]) > allowedRange) {
+ testFailed(msg);
+ return;
+ }
+ }
+ testPassed(msg);
+ }
+
var tex = gl.createTexture();
gl.bindTexture(gl.TEXTURE_2D, tex);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
@@ -251,6 +274,18 @@ function runTests(imgs) {
checkPixel(buf, middle, bottom, [ 0, 0, 255, 255]);
checkPixel(buf, right, bottom, [255, 0, 0, 255]);
+ debug("");
+ debug("check uploading of images with no alpha channel works");
+ gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, false);
+ gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
+ gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGB, gl.RGB, gl.UNSIGNED_BYTE,
+ imgs['resources/blue-1x1.jpg']);
+ glErrorShouldBe(gl, gl.NO_ERROR, "Should be no errors from setup");
+ wtu.drawQuad(gl);
+ gl.readPixels(0, 0, width, height, gl.RGBA, gl.UNSIGNED_BYTE, buf);
+
+ checkPixelRange(buf, middle, center, [ 0, 0, 255, 255], 10);
+
glErrorShouldBe(gl, gl.NO_ERROR, "Should be no errors");
debug("");
diff --git a/LayoutTests/fast/canvas/webgl/resources/blue-1x1.jpg b/LayoutTests/fast/canvas/webgl/resources/blue-1x1.jpg
new file mode 100644
index 0000000..a70bbb0
Binary files /dev/null and b/LayoutTests/fast/canvas/webgl/resources/blue-1x1.jpg differ
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dc4f758..e475312 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-07 Kenneth Russell <kbr at google.com>
+
+ Reviewed by Dimitri Glazkov.
+
+ Regression in JPEG texture uploads on Mac OS X
+ https://bugs.webkit.org/show_bug.cgi?id=45316
+
+ Fixed regression introduced in
+ https://bugs.webkit.org/show_bug.cgi?id=44566 . Added regression
+ test covering this case to gl-teximage.html in Khronos repository
+ and synced test with WebKit's version.
+
+ * platform/graphics/cg/GraphicsContext3DCG.cpp:
+ (WebCore::GraphicsContext3D::getImageData):
+
2010-09-07 Martin Robinson <mrobinson at igalia.com>
Add rendering/ColumnInfo.h to the sources list.
diff --git a/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp b/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp
index c4008cc..fadc385 100644
--- a/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp
+++ b/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp
@@ -119,6 +119,7 @@ bool GraphicsContext3D::getImageData(Image* image,
default:
return false;
}
+ break;
case kCGImageAlphaNone:
switch (componentsPerPixel) {
case 1:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list