[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 02:00:09 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit abe6b12d521985777633b066fa02363b961594c0
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 26 15:30:30 2010 +0000
2010-02-26 Zhenyao Mo <zmo at google.com>
Reviewed by David Levin.
Set viewport to canvas size upon context creation
https://bugs.webkit.org/show_bug.cgi?id=35057
* fast/canvas/webgl/bug-32888.html: Remove the gl.viewport call since it's done when WebGLRenderingContext is created.
* fast/canvas/webgl/gl-get-calls-expected.txt: The read-back viewport size should match the canvas size instead of (0, 0, 0, 0).
* fast/canvas/webgl/gl-get-calls.html: Remove the gl.viewport call since it's done when WebGLRenderingContext is created.
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html: Ditto.
* fast/canvas/webgl/tex-sub-image-2d.html: Ditto.
* fast/canvas/webgl/texImage2DImageDataTest.html: Ditto.
* fast/canvas/webgl/triangle.html: Ditto.
* fast/canvas/webgl/viewport-unchanged-upon-resize.html: Ditto.
2010-02-26 Zhenyao Mo <zmo at google.com>
Reviewed by David Levin.
Set viewport to canvas size upon context creation
https://bugs.webkit.org/show_bug.cgi?id=35057
Covered by existing tests, in particular fast/canvas/webgl/gl-get-calls.html
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::WebGLRenderingContext): Set the viewport size to match the canvas size.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55282 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 26d051a..c3417f6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-02-26 Zhenyao Mo <zmo at google.com>
+
+ Reviewed by David Levin.
+
+ Set viewport to canvas size upon context creation
+ https://bugs.webkit.org/show_bug.cgi?id=35057
+
+ * fast/canvas/webgl/bug-32888.html: Remove the gl.viewport call since it's done when WebGLRenderingContext is created.
+ * fast/canvas/webgl/gl-get-calls-expected.txt: The read-back viewport size should match the canvas size instead of (0, 0, 0, 0).
+ * fast/canvas/webgl/gl-get-calls.html: Remove the gl.viewport call since it's done when WebGLRenderingContext is created.
+ * fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html: Ditto.
+ * fast/canvas/webgl/tex-sub-image-2d.html: Ditto.
+ * fast/canvas/webgl/texImage2DImageDataTest.html: Ditto.
+ * fast/canvas/webgl/triangle.html: Ditto.
+ * fast/canvas/webgl/viewport-unchanged-upon-resize.html: Ditto.
+
2010-02-26 Csaba Osztrogonác <ossy at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/LayoutTests/fast/canvas/webgl/bug-32888.html b/LayoutTests/fast/canvas/webgl/bug-32888.html
index 7026722..d9a83a6 100644
--- a/LayoutTests/fast/canvas/webgl/bug-32888.html
+++ b/LayoutTests/fast/canvas/webgl/bug-32888.html
@@ -43,7 +43,6 @@ function init()
description('Regression test for <a href="https://bugs.webkit.org/show_bug.cgi?id=32888">https://bugs.webkit.org/show_bug.cgi?id=32888</a> : <code>Garbage in transparent regions of images uploaded as textures</code>');
gl = initWebGL("example", "vshader", "fshader", [ "g_Position", "g_TexCoord0" ], [ 0, 0, 0, 1 ], 1);
- gl.viewport(0, 0, 32, 32);
textureLoc = gl.getUniformLocation(gl.program, "tex");
diff --git a/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt b/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt
index c844c83..ad80582 100644
--- a/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt
@@ -63,7 +63,7 @@ PASS context.getParameter(context.STENCIL_REF) is 0
PASS context.getParameter(context.STENCIL_TEST) is false
PASS context.getParameter(context.TEXTURE_BINDING_2D) is null
PASS context.getParameter(context.TEXTURE_BINDING_CUBE_MAP) is null
-PASS context.getParameter(context.VIEWPORT) is [0, 0, 0, 0]
+PASS context.getParameter(context.VIEWPORT) is [0, 0, 2, 2]
PASS successfullyParsed is true
diff --git a/LayoutTests/fast/canvas/webgl/gl-get-calls.html b/LayoutTests/fast/canvas/webgl/gl-get-calls.html
index 67a0784..955704a 100644
--- a/LayoutTests/fast/canvas/webgl/gl-get-calls.html
+++ b/LayoutTests/fast/canvas/webgl/gl-get-calls.html
@@ -94,7 +94,7 @@ else {
//shouldBe('context.getParameter(context.STENCIL_WRITEMASK)', '0xFFFFFFFF');
shouldBe('context.getParameter(context.TEXTURE_BINDING_2D)', 'null');
shouldBe('context.getParameter(context.TEXTURE_BINDING_CUBE_MAP)', 'null');
- shouldBe('context.getParameter(context.VIEWPORT)', '[0, 0, 0, 0]');
+ shouldBe('context.getParameter(context.VIEWPORT)', '[0, 0, 2, 2]');
}
debug("");
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html
index fd41707..5721523 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html
@@ -45,7 +45,6 @@ function init()
debug('Regression test for <a href="https://bugs.webkit.org/show_bug.cgi?id=34458">https://bugs.webkit.org/show_bug.cgi?id=34458</a> : <code>Refactor texImage2D and texSubImage2D taking Image to use common code</code>');
gl = initWebGL("example", "vshader", "fshader", [ "g_Position", "g_TexCoord0" ], [ 0, 0, 0, 1 ], 1);
- gl.viewport(0, 0, 32, 32);
textureLoc = gl.getUniformLocation(gl.program, "tex");
diff --git a/LayoutTests/fast/canvas/webgl/tex-sub-image-2d.html b/LayoutTests/fast/canvas/webgl/tex-sub-image-2d.html
index e89c796..fe7fd9c 100644
--- a/LayoutTests/fast/canvas/webgl/tex-sub-image-2d.html
+++ b/LayoutTests/fast/canvas/webgl/tex-sub-image-2d.html
@@ -42,8 +42,6 @@ var gl = initWebGL("example", "vshader", "fshader", [ "g_Position", "g_TexCoord0
var textureWidth = 256;
var textureHeight = 1;
-gl.viewport(0, 0, textureWidth, textureHeight);
-
textureLoc = gl.getUniformLocation(gl.program, "tex");
var vertices = new WebGLFloatArray([
diff --git a/LayoutTests/fast/canvas/webgl/texImage2DImageDataTest.html b/LayoutTests/fast/canvas/webgl/texImage2DImageDataTest.html
index 25b0765..560ab62 100644
--- a/LayoutTests/fast/canvas/webgl/texImage2DImageDataTest.html
+++ b/LayoutTests/fast/canvas/webgl/texImage2DImageDataTest.html
@@ -59,7 +59,6 @@
context2d.fillRect(0,0,64,64);
gl = initWebGL("example", "vshader", "fshader", [ "vPosition", "vTexCoord0"], [ 1, 0, 1, 1 ], 100);
- gl.viewport(0, 0, 64, 64);
gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
var vertexObject = gl.createBuffer();
diff --git a/LayoutTests/fast/canvas/webgl/triangle.html b/LayoutTests/fast/canvas/webgl/triangle.html
index 57852e7..436397a 100644
--- a/LayoutTests/fast/canvas/webgl/triangle.html
+++ b/LayoutTests/fast/canvas/webgl/triangle.html
@@ -39,7 +39,6 @@
}
gl = initWebGL("example", "vshader", "fshader", [ "vPosition"], [ 0, 0, 0, 1 ], 1);
- gl.viewport(0, 0, 50, 50);
var vertexObject = gl.createBuffer();
gl.bindBuffer(gl.ARRAY_BUFFER, vertexObject);
diff --git a/LayoutTests/fast/canvas/webgl/viewport-unchanged-upon-resize.html b/LayoutTests/fast/canvas/webgl/viewport-unchanged-upon-resize.html
index 2ad9f17..3961a8b 100644
--- a/LayoutTests/fast/canvas/webgl/viewport-unchanged-upon-resize.html
+++ b/LayoutTests/fast/canvas/webgl/viewport-unchanged-upon-resize.html
@@ -32,8 +32,6 @@ debug('Regression test for <a href="https://bugs.webkit.org/show_bug.cgi?id=3476
var gl = initWebGL("example", "vshader", "fshader", [ "g_Position" ], [ 0, 0, 1, 1 ], 1);
-gl.viewport(0, 0, 4, 4);
-
var vertices = new WebGLFloatArray([
1.0, 1.0, 0.0,
-1.0, 1.0, 0.0,
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8c82843..a51b302 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-26 Zhenyao Mo <zmo at google.com>
+
+ Reviewed by David Levin.
+
+ Set viewport to canvas size upon context creation
+ https://bugs.webkit.org/show_bug.cgi?id=35057
+
+ Covered by existing tests, in particular fast/canvas/webgl/gl-get-calls.html
+
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::WebGLRenderingContext): Set the viewport size to match the canvas size.
+
2010-02-26 Pavel Feldman <pfeldman at chromium.org>
Not reviewed: touch InspectorController to force front-end deployment.
diff --git a/WebCore/html/canvas/WebGLRenderingContext.cpp b/WebCore/html/canvas/WebGLRenderingContext.cpp
index 6cb3348..118d734 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -97,6 +97,7 @@ WebGLRenderingContext::WebGLRenderingContext(HTMLCanvasElement* passedCanvas, Pa
m_context->getIntegerv(GraphicsContext3D::MAX_VERTEX_ATTRIBS, &numVertexAttribs);
m_maxVertexAttribs = numVertexAttribs;
m_context->reshape(canvas()->width(), canvas()->height());
+ m_context->viewport(0, 0, canvas()->width(), canvas()->height());
}
WebGLRenderingContext::~WebGLRenderingContext()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list