Skip to site navigation (Press enter)

[webkit-changes] [135210] branches/chromium/1312

cevans Mon, 19 Nov 2012 16:30:34 -0800

Title: [135210] branches/chromium/1312

Revision: 135210
Author: [email protected]
Date: 2012-11-19 16:32:12 -0800 (Mon, 19 Nov 2012)

Log Message

Merge 132844
BUG=157845

Modified Paths

branches/chromium/1312/Source/WebCore/platform/graphics/skia/ImageSkia.cpp


Added Paths

branches/chromium/1312/LayoutTests/fast/images/mask-box-image-crash-expected.png
branches/chromium/1312/LayoutTests/fast/images/mask-box-image-crash-expected.txt
branches/chromium/1312/LayoutTests/fast/images/mask-box-image-crash.html

Diff

Copied: branches/chromium/1312/LayoutTests/fast/images/mask-box-image-crash-expected.png (from rev 132844, trunk/LayoutTests/fast/images/mask-box-image-crash-expected.png) (0 => 135210)


--- branches/chromium/1312/LayoutTests/fast/images/mask-box-image-crash-expected.png	                        (rev 0)
+++ branches/chromium/1312/LayoutTests/fast/images/mask-box-image-crash-expected.png	2012-11-20 00:32:12 UTC (rev 135210)
@@ -0,0 +1,6 @@
+\x89PNG
+
+
+IHDR X')tEXtchecksum853de00567d121bea0b7bece66a5d61c`7\xFF\xFB
+\xAAIDATx\x9C\xED\xD6\xC1	 \xC00u\xFF\x9D\xCF%
+\x82$\xF4\xD9=3\x80\xCEy\xF0\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X1\x833X\xB1d\xAD4\xD1ӅIEND\xAEB`\x82
\ No newline at end of file

Copied: branches/chromium/1312/LayoutTests/fast/images/mask-box-image-crash-expected.txt (from rev 132844, trunk/LayoutTests/fast/images/mask-box-image-crash-expected.txt) (0 => 135210)


--- branches/chromium/1312/LayoutTests/fast/images/mask-box-image-crash-expected.txt	                        (rev 0)
+++ branches/chromium/1312/LayoutTests/fast/images/mask-box-image-crash-expected.txt	2012-11-20 00:32:12 UTC (rev 135210)
@@ -0,0 +1 @@
+

Copied: branches/chromium/1312/LayoutTests/fast/images/mask-box-image-crash.html (from rev 132844, trunk/LayoutTests/fast/images/mask-box-image-crash.html) (0 => 135210)


--- branches/chromium/1312/LayoutTests/fast/images/mask-box-image-crash.html	                        (rev 0)
+++ branches/chromium/1312/LayoutTests/fast/images/mask-box-image-crash.html	2012-11-20 00:32:12 UTC (rev 135210)
@@ -0,0 +1,16 @@
+<script>
+if (window.testRunner)
+    testRunner.dumpAsText(true);
+</script>
+<fieldset style="-webkit-margin-end: 99999;
+                 -webkit-mask-box-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAE\
+                 IAAABCAQAAAADLLz1FAAAACXZwQWcAAABCAAAAQgCVDTvpAAAAFElEQVQoz2P4DwUHGEZZo6xBwQI\
+                 ANWY/j0PofaAAAAAASUVORK5CYII=') 10000% 10000 9999999999%;">
+</fieldset>
+<div style="position: absolute;
+            top: 0px;
+            left: 0px;
+            width: 100px;
+            height: 100px;
+            z-index: 1;
+            background-color: white;"></div>

Modified: branches/chromium/1312/Source/WebCore/platform/graphics/skia/ImageSkia.cpp (135209 => 135210)


--- branches/chromium/1312/Source/WebCore/platform/graphics/skia/ImageSkia.cpp	2012-11-20 00:26:00 UTC (rev 135209)
+++ branches/chromium/1312/Source/WebCore/platform/graphics/skia/ImageSkia.cpp	2012-11-20 00:32:12 UTC (rev 135210)
@@ -472,14 +472,15 @@
 #if PLATFORM(CHROMIUM)
     TRACE_EVENT0("skia", "Image::drawPattern");
 #endif
+    NativeImageSkia* bitmap = nativeImageForCurrentFrame();
+    if (!bitmap)
+        return;
+
     FloatRect normSrcRect = normalizeRect(floatSrcRect);
+    normSrcRect.intersect(FloatRect(0, 0, bitmap->bitmap().width(), bitmap->bitmap().height()));
     if (destRect.isEmpty() || normSrcRect.isEmpty())
         return; // nothing to draw
 
-    NativeImageSkia* bitmap = nativeImageForCurrentFrame();
-    if (!bitmap)
-        return;
-
     SkMatrix ctm = context->platformContext()->canvas()->getTotalMatrix();
     SkMatrix totalMatrix;
     totalMatrix.setConcat(ctm, patternTransform);
@@ -605,6 +606,7 @@
 
     FloatRect normDstRect = normalizeRect(dstRect);
     FloatRect normSrcRect = normalizeRect(srcRect);
+    normSrcRect.intersect(FloatRect(0, 0, bm->bitmap().width(), bm->bitmap().height()));
 
     if (normSrcRect.isEmpty() || normDstRect.isEmpty())
         return; // Nothing to draw.
@@ -650,6 +652,7 @@
 {
     FloatRect normDstRect = normalizeRect(dstRect);
     FloatRect normSrcRect = normalizeRect(srcRect);
+    normSrcRect.intersect(FloatRect(0, 0, m_nativeImage.bitmap().width(), m_nativeImage.bitmap().height()));
 
     if (normSrcRect.isEmpty() || normDstRect.isEmpty())
         return; // Nothing to draw.

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes