Title: [185779] trunk
- Revision
- 185779
- Author
- d...@apple.com
- Date
- 2015-06-19 16:45:35 -0700 (Fri, 19 Jun 2015)
Log 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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (185778 => 185779)
--- trunk/LayoutTests/ChangeLog 2015-06-19 23:40:32 UTC (rev 185778)
+++ trunk/LayoutTests/ChangeLog 2015-06-19 23:45:35 UTC (rev 185779)
@@ -1,3 +1,15 @@
+2015-06-19 Dean Jackson <d...@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 <mattba...@apple.com>
Web Inspector: TimelineAgent needs to handle nested runloops
Modified: trunk/LayoutTests/platform/mac/TestExpectations (185778 => 185779)
--- trunk/LayoutTests/platform/mac/TestExpectations 2015-06-19 23:40:32 UTC (rev 185778)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-06-19 23:45:35 UTC (rev 185779)
@@ -1291,6 +1291,3 @@
[ 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 ]
Modified: trunk/Source/WebCore/ChangeLog (185778 => 185779)
--- trunk/Source/WebCore/ChangeLog 2015-06-19 23:40:32 UTC (rev 185778)
+++ trunk/Source/WebCore/ChangeLog 2015-06-19 23:45:35 UTC (rev 185779)
@@ -1,3 +1,18 @@
+2015-06-19 Dean Jackson <d...@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_hor...@apple.com>
Selection services cannot be invoked when force click is enabled
Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (185778 => 185779)
--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2015-06-19 23:40:32 UTC (rev 185778)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2015-06-19 23:45:35 UTC (rev 185779)
@@ -69,6 +69,8 @@
// 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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
