Changeset 63219 in webkit

Timestamp:

Jul 13, 2010 10:19:26 AM (14 years ago)

Author:

jschuh@chromium.org

Message:

2010-07-13 W. James MacLean <​wjmaclean@chromium.org>

Reviewed by Darin Fisher

Bug 41962 Limit html canvas element dimensions to 32767 for Skia platform
​https://bugs.webkit.org/show_bug.cgi?id=41962

Test: fast/canvas/canvas-skia-excessive-size.html

• WebCore/html/HTMLCanvasElement.cpp (WebCore::HTMLCanvasElement::convertLogicalToDevice):

2010-07-13 W. James MacLean <​wjmaclean@chromium.org>

Reviewed by Darin Fisher

Bug 41962 Limit html canvas element dimensions to 32767 for Skia platform
​https://bugs.webkit.org/show_bug.cgi?id=41962

• fast/canvas/canvas-skia-excessive-size.html: Added.
• fast/canvas/canvas-skia-excessive-size-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-skia-excessive-size-expected.txt (added)
• LayoutTests/fast/canvas/canvas-skia-excessive-size.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLCanvasElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-07-13  W. James MacLean <wjmaclean@chromium.org>
+
+        Reviewed by Darin Fisher
+
+        Bug 41962 Limit html canvas element dimensions to 32767 for Skia platform
+        https://bugs.webkit.org/show_bug.cgi?id=41962
+
+        * fast/canvas/canvas-skia-excessive-size.html: Added.
+        * fast/canvas/canvas-skia-excessive-size-expected.txt: Added.
+
 2010-07-13  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-13  W. James MacLean <wjmaclean@chromium.org>
+
+        Reviewed by Darin Fisher
+
+        Bug 41962 Limit html canvas element dimensions to 32767 for Skia platform
+        https://bugs.webkit.org/show_bug.cgi?id=41962
+
+        Test: fast/canvas/canvas-skia-excessive-size.html
+
+        * WebCore/html/HTMLCanvasElement.cpp
+        (WebCore::HTMLCanvasElement::convertLogicalToDevice):
+
 2010-07-10  Zhenyao Mo  <zmo@google.com>
 

trunk/WebCore/html/HTMLCanvasElement.cpp

@@ -67 +67 @@
 static const float MaxCanvasArea = 32768 * 8192; // Maximum canvas area in CSS pixels
 
+//In Skia, we will also limit width/height to 32767.
+static const float MaxSkiaDim = 32767.0F; // Maximum width/height in CSS pixels.
+
 HTMLCanvasElement::HTMLCanvasElement(const QualifiedName& tagName, Document* document)
     : HTMLElement(tagName, document)
@@ -345 +348 @@
         return IntSize();
 
+#if PLATFORM(SKIA)
+    if (wf > MaxSkiaDim || hf > MaxSkiaDim)
+        return IntSize();
+#endif
+
     return IntSize(static_cast<unsigned>(wf), static_cast<unsigned>(hf));
 }