Changeset 185779 in webkit

Timestamp:

Jun 19, 2015, 4:45:35 PM (11 years ago)

Author:

dino@apple.com

Message:

Extremely large canvas crashes on pre-El Capitan machines
​https://bugs.webkit.org/show_bug.cgi?id=146169
<rdar://problem/21410046>

Reviewed by Tim Horton.

Source/WebCore:

On machines before El Capitan, make the maximum canvas size
8k by 8k.

Covered by existing tests.

• html/HTMLCanvasElement.cpp:

LayoutTests:

Un-skip fast/canvas/canvas-too-large-to-draw.html.

• platform/mac/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLCanvasElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-06-19  Dean Jackson  <dino@apple.com>
+
+        Extremely large canvas crashes on pre-El Capitan machines
+        https://bugs.webkit.org/show_bug.cgi?id=146169
+        <rdar://problem/21410046>
+
+        Reviewed by Tim Horton.
+
+        Un-skip fast/canvas/canvas-too-large-to-draw.html.
+
+        * platform/mac/TestExpectations:
+
 2015-06-19  Matt Baker  <mattbaker@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1292 +1292 @@
 [ ElCapitan+ ] http/tests/media/video-throttled-load-metadata.html [ Failure ]
 [ ElCapitan+ ] http/tests/security/contentSecurityPolicy/media-src-allowed.html [ Skip ]
-
-# rdar://problem/20575487, rdar://problem/21409769
-[ Mavericks Yosemite ] fast/canvas/canvas-too-large-to-draw.html [ Skip ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-19  Dean Jackson  <dino@apple.com>
+
+        Extremely large canvas crashes on pre-El Capitan machines
+        https://bugs.webkit.org/show_bug.cgi?id=146169
+        <rdar://problem/21410046>
+
+        Reviewed by Tim Horton.
+
+        On machines before El Capitan, make the maximum canvas size
+        8k by 8k.
+
+        Covered by existing tests.
+
+        * html/HTMLCanvasElement.cpp:
+
 2015-06-19  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/html/HTMLCanvasElement.cpp

@@ -70 +70 @@
 #if PLATFORM(IOS)
 static const unsigned MaxCanvasArea = 4096 * 4096;
+#elif PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
+static const unsigned MaxCanvasArea = 8192 * 8192;
 #else
 static const unsigned MaxCanvasArea = 16384 * 16384;