Attachment 341086 Details for Bug 185903 – patch

[patch] patch

canvas-memory-limit-ios-3.patch (text/plain), 3.60 KB, created by Antti Koivisto on 2018-05-23 04:55:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antti Koivisto

Created: 2018-05-23 04:55:55 PDT

Size: 3.60 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 232107)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2018-05-23  Antti Koivisto  <antti@apple.com>
>+
>+        Page keeps reloading when viewing photos in google drive (due to too high canvas memory limits)
>+        https://bugs.webkit.org/show_bug.cgi?id=185903
>+        <rdar://problem/38420562>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The canvas memory usage limits don't work on iOS since the current 2GB minimum limit is
>+        larger than the maximum process size.
>+
>+        * html/HTMLCanvasElement.cpp:
>+        (WebCore::maxActivePixelMemory):
>+
>+        Always base this on the reported ramSize() on iOS. Make it still fairly large to not risk breaking
>+        any currently working content. In practice the limit computes to 448MB on device at the moment.
>+
> 2018-05-22  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         Text can wrap between hyphens and commas
>Index: Source/WebCore/html/HTMLCanvasElement.cpp
>===================================================================
>--- Source/WebCore/html/HTMLCanvasElement.cpp	(revision 231847)
>+++ Source/WebCore/html/HTMLCanvasElement.cpp	(working copy)
>@@ -196,7 +196,11 @@ static inline size_t maxActivePixelMemor
>     static size_t maxPixelMemory;
>     static std::once_flag onceFlag;
>     std::call_once(onceFlag, [] {
>+#if PLATFORM(IOS)
>+        maxPixelMemory = ramSize() / 2;
>+#else
>         maxPixelMemory = std::max(ramSize() / 4, 2151 * MB);
>+#endif
>     });
>     return maxPixelMemory;
> }
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 232107)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2018-05-23  Antti Koivisto  <antti@apple.com>
>+
>+        Page keeps reloading when viewing photos in google drive (due to too high canvas memory limits)
>+        https://bugs.webkit.org/show_bug.cgi?id=185903
>+        <rdar://problem/38420562>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/ios-simulator/fast/canvas/canvas-crash-expected.txt:
>+        * platform/ios-simulator/fast/canvas/canvas-skia-excessive-size-expected.txt: Added.
>+
> 2018-05-22  Manuel Rego Casasnovas  <rego@igalia.com>
> 
>         [css-text] W3C test suite gardening
>Index: LayoutTests/platform/ios-simulator/fast/canvas/canvas-crash-expected.txt
>===================================================================
>--- LayoutTests/platform/ios-simulator/fast/canvas/canvas-crash-expected.txt	(revision 231847)
>+++ LayoutTests/platform/ios-simulator/fast/canvas/canvas-crash-expected.txt	(working copy)
>@@ -1,2 +1,3 @@
>-CONSOLE MESSAGE: line 16: Canvas area exceeds the maximum limit (width * height > 16777216).
>-PASSED 
>+CONSOLE MESSAGE: line 15: Total canvas memory use exceeds the maximum limit (256 MB).
>+CONSOLE MESSAGE: line 16: TypeError: null is not an object (evaluating 'ctx.putImageData')
>+
>Index: LayoutTests/platform/ios-simulator/fast/canvas/canvas-skia-excessive-size-expected.txt
>===================================================================
>--- LayoutTests/platform/ios-simulator/fast/canvas/canvas-skia-excessive-size-expected.txt	(nonexistent)
>+++ LayoutTests/platform/ios-simulator/fast/canvas/canvas-skia-excessive-size-expected.txt	(working copy)
>@@ -0,0 +1,6 @@
>+CONSOLE MESSAGE: line 20: Total canvas memory use exceeds the maximum limit (256 MB).
>+This test checks to see if the browser survives the attempted creation of an excessively large canvas.
>+
>+Canvas 2d context = null!
>+Survived canvas creation attempt. Width = 134217728
>+

Actions: View | Formatted Diff | Diff

Attachments on bug 185903: 341075 | 341076 | 341082 | 341086 | 341089