Changeset 280646 in webkit

Timestamp:

Aug 4, 2021, 11:39:37 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, reverting r280630.
​https://bugs.webkit.org/show_bug.cgi?id=228788

broke some downstream tests

Reverted changeset:

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-crash.html (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-skia-excessive-size.html (modified) (1 diff)
• LayoutTests/platform/ios-simulator/fast/canvas (added)
• LayoutTests/platform/ios-simulator/fast/canvas/canvas-crash-expected.txt (added)
• LayoutTests/platform/ios-simulator/fast/canvas/canvas-skia-excessive-size-expected.txt (added)
• 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-04  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r280630.
+        https://bugs.webkit.org/show_bug.cgi?id=228788
+
+        broke some downstream tests
+
+        Reverted changeset:
+
+        "fast/canvas/canvas-crash.html doesn't test what it intends to
+        on iOS"
+        https://bugs.webkit.org/show_bug.cgi?id=228747
+        https://commits.webkit.org/r280630
+
 2021-08-04  Arcady Goldmints-Orlov  <agoldmints@igalia.com>
 

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

@@ -13 +13 @@
 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);

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

@@ -11 +11 @@
     if (window.testRunner)
         testRunner.dumpAsText();
-
-    if (window.internals) {
-        window.internals.setMaxCanvasPixelMemory(16384 * 16384 * 4);
-        window.internals.setMaxCanvasArea(134217728);
-    }
 
     var canvas = document.getElementById("bigCanvas");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-04  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r280630.
+        https://bugs.webkit.org/show_bug.cgi?id=228788
+
+        broke some downstream tests
+
+        Reverted changeset:
+
+        "fast/canvas/canvas-crash.html doesn't test what it intends to
+        on iOS"
+        https://bugs.webkit.org/show_bug.cgi?id=228747
+        https://commits.webkit.org/r280630
+
 2021-08-04  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/html/HTMLCanvasElement.cpp

@@ -112 +112 @@
 const int defaultHeight = 150;
 
-static std::optional<size_t> maxCanvasAreaForTesting;
-static std::optional<size_t> maxActivePixelMemoryForTesting;
+// 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;
 
 HTMLCanvasElement::HTMLCanvasElement(const QualifiedName& tagName, Document& document)
@@ -205 +213 @@
 {
     if (maxActivePixelMemoryForTesting)
-        return *maxActivePixelMemoryForTesting;
+        return maxActivePixelMemoryForTesting;
 
     static size_t maxPixelMemory;
@@ -220 +228 @@
 }
 
-void HTMLCanvasElement::setMaxPixelMemoryForTesting(std::optional<size_t> size)
+void HTMLCanvasElement::setMaxPixelMemoryForTesting(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;
 }
 
@@ -879 +867 @@
     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(std::optional<size_t>);
-    WEBCORE_EXPORT static void setMaxCanvasAreaForTesting(std::optional<size_t>);
+    WEBCORE_EXPORT static void setMaxPixelMemoryForTesting(size_t);
 
     bool needsPreparationForDisplay();

trunk/Source/WebCore/testing/Internals.cpp

@@ -601 +601 @@
 #endif
 
-    HTMLCanvasElement::setMaxPixelMemoryForTesting(std::nullopt);
-    HTMLCanvasElement::setMaxCanvasAreaForTesting(std::nullopt);
+    HTMLCanvasElement::setMaxPixelMemoryForTesting(0); // This means use the default value.
     DOMWindow::overrideTransientActivationDurationForTesting(std::nullopt);
 
@@ -6011 +6010 @@
 }
 
-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;