Title: [183131] branches/safari-600.7-branch/Source/WebCore
- Revision
- 183131
- Author
- [email protected]
- Date
- 2015-04-22 13:55:36 -0700 (Wed, 22 Apr 2015)
Log Message
Merge r180520. rdar://problem/20545427
Modified Paths
Diff
Modified: branches/safari-600.7-branch/Source/WebCore/ChangeLog (183130 => 183131)
--- branches/safari-600.7-branch/Source/WebCore/ChangeLog 2015-04-22 20:55:31 UTC (rev 183130)
+++ branches/safari-600.7-branch/Source/WebCore/ChangeLog 2015-04-22 20:55:36 UTC (rev 183131)
@@ -1,5 +1,23 @@
2015-04-22 Matthew Hanson <[email protected]>
+ Merge r180520. rdar://problem/20545427
+
+ 2015-02-22 Dean Jackson <[email protected]>
+
+ [iOS] Max canvas size is lower than expected
+ https://bugs.webkit.org/show_bug.cgi?id=141886
+ <rdar://problem/19729246>
+
+ Reviewed by Tim Horton.
+
+ Use the same maximum canvas area for all ports,
+ which bumps the iOS limit up from 4580 * 1145
+ to 16k * 16k.
+
+ * html/HTMLCanvasElement.cpp: Update MaxCanvasArea.
+
+2015-04-22 Matthew Hanson <[email protected]>
+
Merge r179850. rdar://problem/20545362
2015-02-09 Timothy Horton <[email protected]>
Modified: branches/safari-600.7-branch/Source/WebCore/html/HTMLCanvasElement.cpp (183130 => 183131)
--- branches/safari-600.7-branch/Source/WebCore/html/HTMLCanvasElement.cpp 2015-04-22 20:55:31 UTC (rev 183130)
+++ branches/safari-600.7-branch/Source/WebCore/html/HTMLCanvasElement.cpp 2015-04-22 20:55:36 UTC (rev 183131)
@@ -61,18 +61,14 @@
using namespace HTMLNames;
-// These values come from the WhatWG spec.
+// These values come from the WhatWG/W3C HTML spec.
static const int DefaultWidth = 300;
static const int DefaultHeight = 150;
// Firefox limits width/height to 32767 pixels, but slows down dramatically before it
// reaches that limit. We limit by area instead, giving us larger maximum dimensions,
-// in exchange for a smaller maximum canvas size. The maximum canvas size is in CSS pixels.
-#if PLATFORM(IOS)
-static const float MaxCanvasArea = 4580 * 1145; // 20 MB assuming 4 bytes per pixel
-#else
-static const float MaxCanvasArea = 32768 * 8192;
-#endif
+// in exchange for a smaller maximum canvas size. The maximum canvas size is in device pixels.
+static const float MaxCanvasArea = 16384 * 16384;
HTMLCanvasElement::HTMLCanvasElement(const QualifiedName& tagName, Document& document)
: HTMLElement(tagName, document)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
