Title: [251145] trunk/LayoutTests
Revision
251145
Author
d...@apple.com
Date
2019-10-15 10:16:05 -0700 (Tue, 15 Oct 2019)

Log Message

Reset maxCanvasPixelMemory between tests
https://bugs.webkit.org/show_bug.cgi?id=202941
<rdar://problem/56260865>

Attempt to fix flakiness.

* fast/canvas/canvas-too-large-to-draw-expected.txt:
* fast/canvas/canvas-too-large-to-draw.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (251144 => 251145)


--- trunk/LayoutTests/ChangeLog	2019-10-15 17:15:40 UTC (rev 251144)
+++ trunk/LayoutTests/ChangeLog	2019-10-15 17:16:05 UTC (rev 251145)
@@ -1,3 +1,14 @@
+2019-10-15  Dean Jackson  <d...@apple.com>
+
+        Reset maxCanvasPixelMemory between tests
+        https://bugs.webkit.org/show_bug.cgi?id=202941
+        <rdar://problem/56260865>
+
+        Attempt to fix flakiness.
+
+        * fast/canvas/canvas-too-large-to-draw-expected.txt:
+        * fast/canvas/canvas-too-large-to-draw.html:
+
 2019-10-15  Wenson Hsieh  <wenson_hs...@apple.com>
 
         [Clipboard API] Implement getType() for ClipboardItems created from bindings

Modified: trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw-expected.txt (251144 => 251145)


--- trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw-expected.txt	2019-10-15 17:15:40 UTC (rev 251144)
+++ trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw-expected.txt	2019-10-15 17:16:05 UTC (rev 251145)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 33: Total canvas memory use exceeds the maximum limit (15 MB).
+CONSOLE MESSAGE: line 31: Total canvas memory use exceeds the maximum limit (15 MB).
 This test requires Internals.
 
  

Modified: trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw.html (251144 => 251145)


--- trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw.html	2019-10-15 17:15:40 UTC (rev 251144)
+++ trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw.html	2019-10-15 17:16:05 UTC (rev 251145)
@@ -23,8 +23,6 @@
         const MAX_WIDTH = 2000;
         const MAX_HEIGHT = MAX_WIDTH;
 
-        window.internals.setMaxCanvasPixelMemory(MAX_WIDTH * MAX_HEIGHT * 4);
-
         function fillCanvas(id, width, height) {
             const canvas = document.getElementById(id);
             canvas.width = width;
@@ -41,6 +39,8 @@
         // This one should always work.
         fillCanvas("canvas2", 10, 10);
 
+        window.internals.setMaxCanvasPixelMemory(MAX_WIDTH * MAX_HEIGHT * 4);
+
         // And this one should exceed the memory limit.
         fillCanvas("canvas1", MAX_WIDTH + 1, MAX_HEIGHT + 1);
     }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to