[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 16:17:13 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9fc97da0919fe2690d88f63d7b04f543a9e1614e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Nov 21 04:19:55 2010 +0000
2010-11-20 Helder Correia <helder at sencha.com>
Reviewed by Andreas Kling.
[Qt] Path stroke lacks blur shadow support
https://bugs.webkit.org/show_bug.cgi?id=49490
Add new test for checking path stroke blur shadow.
* fast/canvas/canvas-strokePath-shadow-expected.txt: Added.
* fast/canvas/canvas-strokePath-shadow.html: Added.
* fast/canvas/script-tests/canvas-strokePath-shadow.js: Added.
2010-11-20 Helder Correia <helder at sencha.com>
Reviewed by Andreas Kling.
[Qt] Path stroke lacks blur shadow support
https://bugs.webkit.org/show_bug.cgi?id=49490
Add blur shadow support to strokePath().
Test: fast/canvas/canvas-strokePath-shadow.html
* platform/graphics/qt/GraphicsContextQt.cpp:
(WebCore::GraphicsContext::strokePath):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72490 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 937da66..25cc888 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-20 Helder Correia <helder at sencha.com>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Path stroke lacks blur shadow support
+ https://bugs.webkit.org/show_bug.cgi?id=49490
+
+ Add new test for checking path stroke blur shadow.
+
+ * fast/canvas/canvas-strokePath-shadow-expected.txt: Added.
+ * fast/canvas/canvas-strokePath-shadow.html: Added.
+ * fast/canvas/script-tests/canvas-strokePath-shadow.js: Added.
+
2010-11-19 Peter Varga <pvarga at inf.u-szeged.hu>
Reviewed by Gavin Barraclough.
diff --git a/LayoutTests/fast/canvas/canvas-strokePath-shadow-expected.txt b/LayoutTests/fast/canvas/canvas-strokePath-shadow-expected.txt
new file mode 100644
index 0000000..552bdaf
--- /dev/null
+++ b/LayoutTests/fast/canvas/canvas-strokePath-shadow-expected.txt
@@ -0,0 +1,37 @@
+Ensure correct behavior of canvas with path stroke shadow
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS data[0] is 255
+PASS data[1] is 20
+PASS data[2] is 0
+PASS data[0] is 255
+PASS data[1] is 20
+PASS data[2] is 0
+PASS data[0] is 255
+PASS data[1] is 20
+PASS data[2] is 0
+PASS data[0] is 255
+PASS data[1] is 20
+PASS data[2] is 0
+PASS data[0] is 255
+PASS data[1] is 0
+PASS data[2] is 0
+PASS data[3] should not be 255 and it's not.
+PASS data[0] is 255
+PASS data[1] is 0
+PASS data[2] is 0
+PASS data[3] should not be 255 and it's not.
+PASS data[0] is 255
+PASS data[1] is 0
+PASS data[2] is 0
+PASS data[3] should not be 255 and it's not.
+PASS data[0] is 255
+PASS data[1] is 0
+PASS data[2] is 0
+PASS data[3] should not be 255 and it's not.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/canvas/canvas-strokePath-shadow.html b/LayoutTests/fast/canvas/canvas-strokePath-shadow.html
new file mode 100644
index 0000000..f1a1fc3
--- /dev/null
+++ b/LayoutTests/fast/canvas/canvas-strokePath-shadow.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../js/resources/js-test-style.css">
+<script src="../js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src="script-tests/canvas-strokePath-shadow.js"></script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/fast/canvas/script-tests/canvas-strokePath-shadow.js b/LayoutTests/fast/canvas/script-tests/canvas-strokePath-shadow.js
new file mode 100644
index 0000000..9d3a0d6
--- /dev/null
+++ b/LayoutTests/fast/canvas/script-tests/canvas-strokePath-shadow.js
@@ -0,0 +1,116 @@
+description("Ensure correct behavior of canvas with path stroke shadow");
+
+function print(message, color)
+{
+ var paragraph = document.createElement("div");
+ paragraph.appendChild(document.createTextNode(message));
+ paragraph.style.fontFamily = "monospace";
+ if (color)
+ paragraph.style.color = color;
+ document.getElementById("console").appendChild(paragraph);
+}
+
+function shouldNotBe(a, b)
+{
+ var evalA;
+ try {
+ evalA = eval(a);
+ } catch(e) {
+ evalA = e;
+ }
+
+ if (evalA != b)
+ print("PASS " + a + " should not be " + b + " and it's not.", "green")
+ else
+ print("FAIL " + a + " should not be " + b + " but it is.", "red");
+}
+
+var canvas = document.createElement('canvas');
+document.body.appendChild(canvas);
+canvas.setAttribute('width', '700');
+canvas.setAttribute('height', '700');
+var ctx = canvas.getContext('2d');
+
+ctx.beginPath();
+ctx.moveTo(300, 300);
+ctx.lineTo(300, 50);
+ctx.bezierCurveTo(200, 40, 75, 150, 30, 30);
+ctx.quadraticCurveTo(250, 75, 50, 300);
+ctx.shadowOffsetX = 350;
+ctx.shadowColor = 'rgba(255, 20, 0, 0.5)';
+ctx.shadowBlur = 0;
+ctx.strokeStyle = 'rgba(0, 0, 255, 1)';
+ctx.lineWidth = 30;
+ctx.closePath();
+ctx.stroke();
+
+ctx.beginPath();
+ctx.moveTo(300,650);
+ctx.lineTo(300,400);
+ctx.bezierCurveTo(200, 390, 75, 500, 30, 380);
+ctx.quadraticCurveTo(250, 425, 50, 650);
+ctx.shadowOffsetX = 350;
+ctx.shadowColor = 'rgba(255, 0, 0, 0.5)';
+ctx.shadowBlur = 30;
+ctx.strokeStyle = 'rgba(0, 0, 255, 1)';
+ctx.lineWidth = 30;
+ctx.closePath();
+ctx.stroke();
+
+var imageData, data;
+
+// Verify solid shadow.
+imageData = ctx.getImageData(650, 300, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+shouldBe('data[1]', '20');
+shouldBe('data[2]', '0');
+
+imageData = ctx.getImageData(650, 50, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+shouldBe('data[1]', '20');
+shouldBe('data[2]', '0');
+
+imageData = ctx.getImageData(380, 30, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+shouldBe('data[1]', '20');
+shouldBe('data[2]', '0');
+
+imageData = ctx.getImageData(400, 40, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+shouldBe('data[1]', '20');
+shouldBe('data[2]', '0');
+
+// Verify blurry shadow.
+imageData = ctx.getImageData(640, 640, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+shouldBe('data[1]', '0');
+shouldBe('data[2]', '0');
+shouldNotBe('data[3]', '255');
+
+imageData = ctx.getImageData(650, 400, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+shouldBe('data[1]', '0');
+shouldBe('data[2]', '0');
+shouldNotBe('data[3]', '255');
+
+imageData = ctx.getImageData(380, 380, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+shouldBe('data[1]', '0');
+shouldBe('data[2]', '0');
+shouldNotBe('data[3]', '255');
+
+imageData = ctx.getImageData(350, 380, 1, 1);
+data = imageData.data;
+shouldBe('data[0]', '255');
+shouldBe('data[1]', '0');
+shouldBe('data[2]', '0');
+shouldNotBe('data[3]', '255');
+
+var successfullyParsed = true;
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 47855ae..142a2f2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-20 Helder Correia <helder at sencha.com>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Path stroke lacks blur shadow support
+ https://bugs.webkit.org/show_bug.cgi?id=49490
+
+ Add blur shadow support to strokePath().
+
+ Test: fast/canvas/canvas-strokePath-shadow.html
+
+ * platform/graphics/qt/GraphicsContextQt.cpp:
+ (WebCore::GraphicsContext::strokePath):
+
2010-11-20 Kwang Yul Seo <skyul at company100.net>
Reviewed by David Kilzer.
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index fc57b14..a4e49da 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -554,12 +554,28 @@ void GraphicsContext::strokePath()
path.setFillRule(toQtFillRule(fillRule()));
if (m_data->hasShadow()) {
- p->translate(m_data->shadow.offset());
- QPen shadowPen(pen);
- shadowPen.setColor(m_data->shadow.m_color);
- p->strokePath(path, shadowPen);
- p->translate(-m_data->shadow.offset());
+ ContextShadow* shadow = contextShadow();
+
+ if (shadow->m_type != ContextShadow::BlurShadow
+ && !m_common->state.strokePattern && !m_common->state.strokeGradient)
+ {
+ QPen shadowPen(pen);
+ shadowPen.setColor(m_data->shadow.m_color);
+ p->translate(m_data->shadow.offset());
+ p->strokePath(path, shadowPen);
+ p->translate(-m_data->shadow.offset());
+ } else {
+ FloatRect boundingRect = path.controlPointRect();
+ boundingRect.inflate(pen.miterLimit() + pen.widthF());
+ QPainter* shadowPainter = shadow->beginShadowLayer(p, boundingRect);
+ if (shadowPainter) {
+ shadowPainter->setOpacity(static_cast<qreal>(m_data->shadow.m_color.alpha()) / 255);
+ shadowPainter->strokePath(path, pen);
+ shadow->endShadowLayer(p);
+ }
+ }
}
+
if (m_common->state.strokePattern) {
AffineTransform affine;
pen.setBrush(QBrush(m_common->state.strokePattern->createPlatformPattern(affine)));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list