Changeset 232113 in webkit

Timestamp:

May 23, 2018 9:09:54 AM (6 years ago)

Author:

Antti Koivisto

Message:

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 Simon Fraser.

Source/WebCore:

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.

LayoutTests:

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios-simulator/fast/canvas/canvas-crash-expected.txt (modified) (1 diff)
• 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) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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 Simon Fraser.
+
+        * 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>
 

trunk/LayoutTests/platform/ios-simulator/fast/canvas/canvas-crash-expected.txt

@@ -1 @@
-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')
+

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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 Simon Fraser.
+
+        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-23  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/html/HTMLCanvasElement.cpp

@@ -197 +197 @@
     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;