Unreviewed, rolling out r148923.
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 23 Apr 2013 07:48:49 +0000 (07:48 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 23 Apr 2013 07:48:49 +0000 (07:48 +0000)
http://trac.webkit.org/changeset/148923
https://bugs.webkit.org/show_bug.cgi?id=115020

The patch causes multiple failures in CSS, canvas tests
(Requested by zdobersek on #webkit).

Source/WebCore:

* platform/graphics/cairo/PlatformContextCairo.cpp:
(WebCore::PlatformContextCairo::drawSurfaceToContext):

LayoutTests:

* fast/canvas/script-tests/shadow-image.js: Removed.
* fast/canvas/shadow-image-expected.txt: Removed.
* fast/canvas/shadow-image.html: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@148947 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/canvas/script-tests/shadow-image.js [deleted file]
LayoutTests/fast/canvas/shadow-image-expected.txt [deleted file]
LayoutTests/fast/canvas/shadow-image.html [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/cairo/PlatformContextCairo.cpp

index 8a8cb929eb86e8344d43a216b29843029cb75603..edd065ccaab97954a2ab80a02260d9ccd837c236 100644 (file)
@@ -1,3 +1,16 @@
+2013-04-23  Commit Queue  <rniwa@webkit.org>
+
+        Unreviewed, rolling out r148923.
+        http://trac.webkit.org/changeset/148923
+        https://bugs.webkit.org/show_bug.cgi?id=115020
+
+        The patch causes multiple failures in CSS, canvas tests
+        (Requested by zdobersek on #webkit).
+
+        * fast/canvas/script-tests/shadow-image.js: Removed.
+        * fast/canvas/shadow-image-expected.txt: Removed.
+        * fast/canvas/shadow-image.html: Removed.
+
 2013-04-22  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 
         Unreviewed EFL gardening.
diff --git a/LayoutTests/fast/canvas/script-tests/shadow-image.js b/LayoutTests/fast/canvas/script-tests/shadow-image.js
deleted file mode 100755 (executable)
index ce6f924..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-description("Test to verify the shadow of an image drawn on canvas");
-
-// Create an auxiliary canvas to draw to and create an image from.
-// This is done instead of simply loading an image from the file system
-// because that would throw a SECURITY_ERR DOM Exception.
-var aCanvas = document.createElement('canvas');
-aCanvas.setAttribute('width', '200');
-aCanvas.setAttribute('height', '200');
-var aCtx = aCanvas.getContext('2d');
-
-// Draw a rectangle on the same canvas.
-aCtx.fillStyle = 'rgb(0, 255, 0)';
-aCtx.rect(0, 0, 100, 50);
-aCtx.fill();
-
-// Create the image object to be drawn on the master canvas.
-var img = new Image();
-img.onload = draw;
-img.src = aCanvas.toDataURL();
-
-function draw()
-{
-var canvas = document.getElementById('myCanvas');
-var ctx = canvas.getContext('2d');
-ctx.shadowOffsetX = 200;
-ctx.shadowOffsetY = 50;
-ctx.fillStyle=ctx.createPattern(img, 'repeat-x');
-ctx.shadowColor = 'rgba(255, 0, 0, 1.0)';
-ctx.fillRect(0, 0, 200, 200);
-
-var imageData = ctx.getImageData(10, 10, 1, 1);
-imgdata = imageData.data;
-shouldBe("imgdata[0]", "0");
-shouldBe("imgdata[1]", "255");
-shouldBe("imgdata[2]", "0");
-
-imageData = ctx.getImageData(290, 60, 1, 1);
-imgdata = imageData.data;
-shouldBe("imgdata[0]", "255");
-shouldBe("imgdata[1]", "0");
-shouldBe("imgdata[2]", "0");
-
-imageData = ctx.getImageData(90, 60, 1, 1);
-imgdata = imageData.data;
-shouldBe("imgdata[0]", "0");
-shouldBe("imgdata[1]", "0");
-shouldBe("imgdata[2]", "0");
-}
diff --git a/LayoutTests/fast/canvas/shadow-image-expected.txt b/LayoutTests/fast/canvas/shadow-image-expected.txt
deleted file mode 100644 (file)
index d41220b..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-Test to verify the shadow of an image drawn on canvas
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS imgdata[0] is 0
-PASS imgdata[1] is 255
-PASS imgdata[2] is 0
-PASS imgdata[0] is 255
-PASS imgdata[1] is 0
-PASS imgdata[2] is 0
-PASS imgdata[0] is 0
-PASS imgdata[1] is 0
-PASS imgdata[2] is 0
-
diff --git a/LayoutTests/fast/canvas/shadow-image.html b/LayoutTests/fast/canvas/shadow-image.html
deleted file mode 100644 (file)
index c3b476c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src="../js/resources/js-test-pre.js"></script>
-</head>
-<body>
-<canvas id="myCanvas" width="400" height="400"></canvas>
-<script src="script-tests/shadow-image.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
-</body>
-</html>
index e7fc90d06a8a02acad50a7c0f89b98d534fdc22a..70eb8fdf4e3963742e66af8ecfb0f4340f52da6d 100644 (file)
@@ -1,3 +1,15 @@
+2013-04-23  Commit Queue  <rniwa@webkit.org>
+
+        Unreviewed, rolling out r148923.
+        http://trac.webkit.org/changeset/148923
+        https://bugs.webkit.org/show_bug.cgi?id=115020
+
+        The patch causes multiple failures in CSS, canvas tests
+        (Requested by zdobersek on #webkit).
+
+        * platform/graphics/cairo/PlatformContextCairo.cpp:
+        (WebCore::PlatformContextCairo::drawSurfaceToContext):
+
 2013-04-22  Noam Rosenthal  <noam@webkit.org>
 
         [EFL] Assertion Failures in Coordinated Graphics after r148433
index 5d774192798b06f38f3d04349a436a101da80e6e..147dc15adfe139c216088dbf878f2361db7236f9 100644 (file)
@@ -191,7 +191,7 @@ void PlatformContextCairo::drawSurfaceToContext(cairo_surface_t* surface, const
         cairo_pattern_set_filter(pattern.get(), CAIRO_FILTER_BILINEAR);
         break;
     }
-    cairo_pattern_set_extend(pattern.get(), CAIRO_EXTEND_NONE);
+    cairo_pattern_set_extend(pattern.get(), CAIRO_EXTEND_PAD);
 
     // The pattern transformation properly scales the pattern for when the source rectangle is a
     // different size than the destination rectangle. We also account for any offset we introduced