[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 15:51:47 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 705e14637f068dc5ca81e33cb91bf72a223a862d
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 15 17:42:45 2010 +0000

    2010-11-12  Zhenyao Mo  <zmo at google.com>
    
            Reviewed by Kenneth Russell.
    
            [Chromium] fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html is a flaky crash
            https://bugs.webkit.org/show_bug.cgi?id=48142
    
            * fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html: Cleanup the test, hoping to stop flaky crashes on chromium bots.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72012 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9da8d7c..fb2e9d5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-12  Zhenyao Mo  <zmo at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        [Chromium] fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html is a flaky crash
+        https://bugs.webkit.org/show_bug.cgi?id=48142
+
+        * fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html: Cleanup the test, hoping to stop flaky crashes on chromium bots.
+
 2010-11-15  Martin Robinson  <mrobinson at igalia.com>
 
         Add some baselines for new tests and skip a HTML5 meter test until
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html
index 13603e8..1467223 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html
@@ -4,46 +4,18 @@
 <script src="../../js/resources/js-test-pre.js"></script>
 <script src="resources/webgl-test.js"></script>
 <script src="resources/webgl-test-utils.js"></script>
+</head>
+<body>
+<canvas id="example" width="1px" height="2px"></canvas>
+<div id="description"></div>
+<div id="console"></div>
 <script>
+description('Verifies texImage2D and texSubImage2D code paths taking ArrayBufferView');
+
 var wtu = WebGLTestUtils;
 var gl = null;
 var textureLoc = null;
 var successfullyParsed = false;
-var imageData = null;
-
-function init()
-{
-    if (window.initNonKhronosFramework) {
-        window.initNonKhronosFramework(true);
-    }
-
-    description('Verifies texImage2D and texSubImage2D code paths taking ArrayBufferView');
-
-    var canvas2d = document.getElementById("texcanvas");
-    var context2d = canvas2d.getContext("2d");
-    imageData = context2d.createImageData(1, 2);
-    var data = imageData.data;
-    data[0] = 255;
-    data[1] = 0;
-    data[2] = 0;
-    data[3] = 255;
-    data[4] = 0;
-    data[5] = 255;
-    data[6] = 0;
-    data[7] = 0;
-
-    var canvas = document.getElementById("example");
-    gl = wtu.create3DContext(canvas);
-    var program = wtu.setupTexturedQuad(gl);
-    gl.disable(gl.BLEND);
-
-    gl.clearColor(0,0,0,1);
-    gl.clearDepth(1);
-
-    textureLoc = gl.getUniformLocation(program, "tex");
-
-    runTest();
-}
 
 // These two declarations need to be global for "shouldBe" to see them
 var buf = null;
@@ -194,24 +166,21 @@ function runTest()
         }
     }
 
-    successfullyParsed = true;
-    var epilogue = document.createElement("script");
-    epilogue.onload = finish;
-    epilogue.src = "../../js/resources/js-test-post.js";
-    document.body.appendChild(epilogue);
 }
 
-function finish() {
-    if (window.nonKhronosFrameworkNotifyDone) {
-        window.nonKhronosFrameworkNotifyDone();
-    }
-}
+var canvas = document.getElementById("example");
+gl = wtu.create3DContext(canvas);
+var program = wtu.setupTexturedQuad(gl);
+gl.disable(gl.BLEND);
+
+gl.clearColor(0,0,0,1);
+gl.clearDepth(1);
+
+textureLoc = gl.getUniformLocation(program, "tex");
+
+runTest();
+successfullyParsed = true;
 </script>
-</head>
-<body onload="init()">
-<canvas id="texcanvas" width="1px" height="2px"></canvas>
-<canvas id="example" width="1px" height="2px"></canvas>
-<div id="description"></div>
-<div id="console"></div>
+<script src="../../js/resources/js-test-post.js"></script>
 </body>
 </html>

-- 
WebKit Debian packaging

