Title: [166300] trunk/Source/WebCore
- Revision
- 166300
- Author
- bfulg...@apple.com
- Date
- 2014-03-26 10:02:15 -0700 (Wed, 26 Mar 2014)
Log Message
Avoid duplicate size checks when creating empty image
https://bugs.webkit.org/show_bug.cgi?id=130730
Reviewed by Dean Jackson.
Merged from Blink (patch by ch.du...@samsung.com):
https://chromium.googlesource.com/chromium/blink/+/4861a71bc1f284fc97417f405ab7d08dc6947b88
http://crbug.com/190633011
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::createEmptyImageData): Don't perform overflow calculation twice.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (166299 => 166300)
--- trunk/Source/WebCore/ChangeLog 2014-03-26 16:45:21 UTC (rev 166299)
+++ trunk/Source/WebCore/ChangeLog 2014-03-26 17:02:15 UTC (rev 166300)
@@ -1,3 +1,17 @@
+2014-03-25 Brent Fulgham <bfulg...@apple.com>
+
+ Avoid duplicate size checks when creating empty image
+ https://bugs.webkit.org/show_bug.cgi?id=130730
+
+ Reviewed by Dean Jackson.
+
+ Merged from Blink (patch by ch.du...@samsung.com):
+ https://chromium.googlesource.com/chromium/blink/+/4861a71bc1f284fc97417f405ab7d08dc6947b88
+ http://crbug.com/190633011
+
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::createEmptyImageData): Don't perform overflow calculation twice.
+
2014-03-26 Sergio Villar Senin <svil...@igalia.com>
[CSS Grid Layout] getComputedStyle() must return the specified value for positioning properties
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (166299 => 166300)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-03-26 16:45:21 UTC (rev 166299)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-03-26 17:02:15 UTC (rev 166300)
@@ -1827,15 +1827,12 @@
static PassRefPtr<ImageData> createEmptyImageData(const IntSize& size)
{
- Checked<int, RecordOverflow> dataSize = 4;
- dataSize *= size.width();
- dataSize *= size.height();
- if (dataSize.hasOverflowed())
- return 0;
+ if (RefPtr<ImageData> data = "" {
+ data->data()->zeroFill();
+ return data.release();
+ }
- RefPtr<ImageData> data = ""
- data->data()->zeroFill();
- return data.release();
+ return nullptr;
}
PassRefPtr<ImageData> CanvasRenderingContext2D::createImageData(PassRefPtr<ImageData> imageData, ExceptionCode& ec) const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
