Changeset 280715 in webkit

Timestamp:

Aug 5, 2021, 6:56:58 PM (5 years ago)

Author:

timothy_horton@apple.com

Message:

fast/canvas/canvas-crash.html doesn't test what it intends to on iOS
​https://bugs.webkit.org/show_bug.cgi?id=228747

Reviewed by Simon Fraser.

Source/WebCore:

The test fast/canvas/canvas-crash.html intends to test changes made
to actual canvas code (see r215632); however, on the iOS simulator
the test doesn't even manage to make a canvas context because of
"maximum area" and "maximum backing store size" limits, which differ
per-platform. This results in unique test results for iOS, as well
as the test not actually exercising the code it was intended to.

Fix this by adding an override for the maximum area limit (we already
had one for maximum backing store size), and overriding them in
this test (and another similarly afflicted test).

• html/HTMLCanvasElement.cpp:

(WebCore::maxCanvasArea):
(WebCore::HTMLCanvasElement::setMaxCanvasAreaForTesting):
(WebCore::HTMLCanvasElement::createImageBuffer const):

• html/HTMLCanvasElement.h:
• testing/Internals.cpp:

(WebCore::Internals::resetToConsistentState):
(WebCore::Internals::setMaxCanvasArea):

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

• fast/canvas/canvas-crash.html:
• fast/canvas/canvas-skia-excessive-size.html:
• platform/ios-simulator/fast/canvas/canvas-crash-expected.txt: Removed.
• platform/ios-simulator/fast/canvas/canvas-skia-excessive-size-expected.txt: Removed.

Delete the iOS-specific results, and adopt the new overrides in these two tests.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-crash.html (modified) (2 diffs)
• LayoutTests/fast/canvas/canvas-skia-excessive-size.html (modified) (1 diff)
• LayoutTests/platform/ios-simulator/fast/canvas (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLCanvasElement.cpp (modified) (4 diffs)
• Source/WebCore/html/HTMLCanvasElement.h (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-08-05  Tim Horton  <timothy_horton@apple.com>
+
+        fast/canvas/canvas-crash.html doesn't test what it intends to on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=228747
+
+        Reviewed by Simon Fraser.
+
+        * fast/canvas/canvas-crash.html:
+        * fast/canvas/canvas-skia-excessive-size.html:
+        * platform/ios-simulator/fast/canvas/canvas-crash-expected.txt: Removed.
+        * platform/ios-simulator/fast/canvas/canvas-skia-excessive-size-expected.txt: Removed.
+        Delete the iOS-specific results, and adopt the new overrides in these two tests.
+
 2021-08-05  Arcady Goldmints-Orlov  <agoldmints@igalia.com>
 

trunk/LayoutTests/fast/canvas/canvas-crash.html

@@ -5 +5 @@
 
 <a id="a"></a>
-<canvas id="c" class="output" width="100" height="50"></canvas>
 
 <script>
@@ -13 +12 @@
 function canvastest()
 {
+    if (window.internals) {
+        window.internals.setMaxCanvasPixelMemory(16384 * 16384 * 4);
+        window.internals.setMaxCanvasArea(13951 * 11138);
+    }
     var ctx = document.getCSSCanvasContext("2d", "canvastest", 13951, 11138);
     ctx.putImageData(ctx.getImageData(1431655766, document.getElementById("a").appendChild(document.createElement("media")).clientWidth, 4096, -1024), 128, -65535, 127, -2147483648, 2147483647, -2147483648);
+
+    // Resize the context to ensure the large canvas doesn't leak into the next test.
+    document.getCSSCanvasContext("2d", "canvastest", 1, 1);
 }
 

trunk/LayoutTests/fast/canvas/canvas-skia-excessive-size.html

@@ -12 +12 @@
         testRunner.dumpAsText();
 
+    if (window.internals) {
+        window.internals.setMaxCanvasPixelMemory(16384 * 16384 * 4);
+        window.internals.setMaxCanvasArea(134217728);
+    }
+
     var canvas = document.getElementById("bigCanvas");
     var width = canvas.width;
     // We need to perform a context fetch to force allocation of
     // canvas resources.
-    if (canvas.getContext)
-    {
-      var ctx = canvas.getContext("2d");
-      if (ctx == null)
-      {
-        print("Canvas 2d context = null!");
-      }
+    if (canvas.getContext) {
+        var ctx = canvas.getContext("2d");
+        if (ctx == null)
+            print("Canvas 2d context = null!");
     }
 
     print("Survived canvas creation attempt. Width = " + width);
+
+    // Resize the canvas to ensure the large canvas doesn't leak into the next test.
+    canvas.width = 1;
 }
 </script>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-05  Tim Horton  <timothy_horton@apple.com>
+
+        fast/canvas/canvas-crash.html doesn't test what it intends to on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=228747
+
+        Reviewed by Simon Fraser.
+
+        The test fast/canvas/canvas-crash.html intends to test changes made
+        to actual canvas code (see r215632); however, on the iOS simulator
+        the test doesn't even manage to make a canvas context because of
+        "maximum area" and "maximum backing store size" limits, which differ
+        per-platform. This results in unique test results for iOS, as well
+        as the test not actually exercising the code it was intended to.
+
+        Fix this by adding an override for the maximum area limit (we already
+        had one for maximum backing store size), and overriding them in
+        this test (and another similarly afflicted test).
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::maxCanvasArea):
+        (WebCore::HTMLCanvasElement::setMaxCanvasAreaForTesting):
+        (WebCore::HTMLCanvasElement::createImageBuffer const):
+        * html/HTMLCanvasElement.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::resetToConsistentState):
+        (WebCore::Internals::setMaxCanvasArea):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2021-08-05  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/html/HTMLCanvasElement.cpp

@@ -112 +112 @@
 const int defaultHeight = 150;
 
-// Firefox limits width/height to 32767 pixels, but slows down dramatically before it
-// reaches that limit. We limit by area instead, giving us larger maximum dimensions,
-// in exchange for a smaller maximum canvas size. The maximum canvas size is in device pixels.
-#if PLATFORM(IOS_FAMILY)
-const unsigned maxCanvasArea = 4096 * 4096;
-#else
-const unsigned maxCanvasArea = 16384 * 16384;
-#endif
-
-static size_t maxActivePixelMemoryForTesting = 0;
+static std::optional<size_t> maxCanvasAreaForTesting;
+static std::optional<size_t> maxActivePixelMemoryForTesting;
 
 HTMLCanvasElement::HTMLCanvasElement(const QualifiedName& tagName, Document& document)
@@ -213 +205 @@
 {
     if (maxActivePixelMemoryForTesting)
-        return maxActivePixelMemoryForTesting;
+        return *maxActivePixelMemoryForTesting;
 
     static size_t maxPixelMemory;
@@ -228 +220 @@
 }
 
-void HTMLCanvasElement::setMaxPixelMemoryForTesting(size_t size)
+void HTMLCanvasElement::setMaxPixelMemoryForTesting(std::optional<size_t> size)
 {
     maxActivePixelMemoryForTesting = size;
+}
+
+static inline size_t maxCanvasArea()
+{
+    if (maxCanvasAreaForTesting)
+        return *maxCanvasAreaForTesting;
+
+    // Firefox limits width/height to 32767 pixels, but slows down dramatically before it
+    // reaches that limit. We limit by area instead, giving us larger maximum dimensions,
+    // in exchange for a smaller maximum canvas size. The maximum canvas size is in device pixels.
+#if PLATFORM(IOS_FAMILY)
+    return 4096 * 4096;
+#else
+    return 16384 * 16384;
+#endif
+}
+
+void HTMLCanvasElement::setMaxCanvasAreaForTesting(std::optional<size_t> size)
+{
+    maxCanvasAreaForTesting = size;
 }
 
@@ -867 +879 @@
     auto checkedArea = size().area<RecordOverflow>();
 
-    if (checkedArea.hasOverflowed() || checkedArea > maxCanvasArea) {
-        auto message = makeString("Canvas area exceeds the maximum limit (width * height > ", maxCanvasArea, ").");
+    if (checkedArea.hasOverflowed() || checkedArea > maxCanvasArea()) {
+        auto message = makeString("Canvas area exceeds the maximum limit (width * height > ", maxCanvasArea(), ").");
         document().addConsoleMessage(MessageSource::JS, MessageLevel::Warning, message);
         return;

trunk/Source/WebCore/html/HTMLCanvasElement.h

@@ -129 +129 @@
     void setImageBufferAndMarkDirty(RefPtr<ImageBuffer>&&);
 
-    WEBCORE_EXPORT static void setMaxPixelMemoryForTesting(size_t);
+    WEBCORE_EXPORT static void setMaxPixelMemoryForTesting(std::optional<size_t>);
+    WEBCORE_EXPORT static void setMaxCanvasAreaForTesting(std::optional<size_t>);
 
     bool needsPreparationForDisplay();

trunk/Source/WebCore/testing/Internals.cpp

@@ -601 +601 @@
 #endif
 
-    HTMLCanvasElement::setMaxPixelMemoryForTesting(0); // This means use the default value.
+    HTMLCanvasElement::setMaxPixelMemoryForTesting(std::nullopt);
+    HTMLCanvasElement::setMaxCanvasAreaForTesting(std::nullopt);
     DOMWindow::overrideTransientActivationDurationForTesting(std::nullopt);
 
@@ -6010 +6011 @@
 }
 
+void Internals::setMaxCanvasArea(unsigned size)
+{
+    HTMLCanvasElement::setMaxCanvasAreaForTesting(size);
+}
+
 int Internals::processIdentifier() const
 {

trunk/Source/WebCore/testing/Internals.h

@@ -347 +347 @@
 
     void setMaxCanvasPixelMemory(unsigned);
+    void setMaxCanvasArea(unsigned);
 
     ExceptionOr<unsigned> wheelEventHandlerCount();

trunk/Source/WebCore/testing/Internals.idl

@@ -938 +938 @@
 
     undefined setMaxCanvasPixelMemory(unsigned long size);
+    undefined setMaxCanvasArea(unsigned long size);
 
     [Conditional=VIDEO] readonly attribute NowPlayingState nowPlayingState;