Extremely large canvas crashes on pre-El Capitan machines
authordino@apple.com <dino@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Jun 2015 23:45:35 +0000 (23:45 +0000)
committerdino@apple.com <dino@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Jun 2015 23:45:35 +0000 (23:45 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@185779 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/mac/TestExpectations
Source/WebCore/ChangeLog
Source/WebCore/html/HTMLCanvasElement.cpp

index 3ca8f14..5c6a031 100644 (file)
@@ -1,3 +1,15 @@
+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>
 
         Web Inspector: TimelineAgent needs to handle nested runloops
index 6a75983..b471e33 100644 (file)
@@ -1291,6 +1291,3 @@ webkit.org/b/145432 media/video-transformed-by-javascript.html [ Failure ]
 [ ElCapitan+ ] http/tests/media/video-served-as-text.html [ Failure ]
 [ 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 ]
index a018fd9..0cd6ae5 100644 (file)
@@ -1,3 +1,18 @@
+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>
 
         Selection services cannot be invoked when force click is enabled
index 78ca351..b4fd201 100644 (file)
@@ -69,6 +69,8 @@ static const int DefaultHeight = 150;
 // in exchange for a smaller maximum canvas size. The maximum canvas size is in device pixels.
 #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;
 #endif