Commit 7240bdcc authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

2011-01-14 Helder Correia <helder@sencha.com>

        Reviewed by Simon Fraser.

        Shadow is not drawn when filling a path with a gradient
        https://bugs.webkit.org/show_bug.cgi?id=51982

        This happens in CG and is related to bug 51869, this time to be fixed
        in GraphicsContext::fillPath(const Path& path). We need to draw the
        gradient clipped to the path on a CGLayer first, and then draw the
        layer on the GraphicsContext.

        * fast/canvas/canvas-fillPath-gradient-shadow-expected.txt: Added.
        * fast/canvas/canvas-fillPath-gradient-shadow.html: Added.
        * fast/canvas/script-tests/canvas-fillPath-gradient-shadow.js: Added.
        * platform/chromium/test_expectations.txt: Skipping new test since it fails.
        * platform/qt/Skipped: Ditto.
2011-01-14  Helder Correia  <helder@sencha.com>

        Reviewed by Simon Fraser.

        Shadow is not drawn when filling a path with a gradient
        https://bugs.webkit.org/show_bug.cgi?id=51982

        This happens in CG and is related to bug 51869, this time to be fixed
        in GraphicsContext::fillPath(const Path& path). We need to draw the
        gradient clipped to the path on a CGLayer first, and then draw the
        layer on the GraphicsContext.

        Test: fast/canvas/canvas-fillPath-gradient-shadow.html

        * platform/graphics/cg/GraphicsContextCG.cpp:
        (WebCore::GraphicsContext::fillPath):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75833 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 73e897ba
2011-01-14 Helder Correia <helder@sencha.com>
Reviewed by Simon Fraser.
Shadow is not drawn when filling a path with a gradient
https://bugs.webkit.org/show_bug.cgi?id=51982
This happens in CG and is related to bug 51869, this time to be fixed
in GraphicsContext::fillPath(const Path& path). We need to draw the
gradient clipped to the path on a CGLayer first, and then draw the
layer on the GraphicsContext.
* fast/canvas/canvas-fillPath-gradient-shadow-expected.txt: Added.
* fast/canvas/canvas-fillPath-gradient-shadow.html: Added.
* fast/canvas/script-tests/canvas-fillPath-gradient-shadow.js: Added.
* platform/chromium/test_expectations.txt: Skipping new test since it fails.
* platform/qt/Skipped: Ditto.
2011-01-14 Mihai Parparita <mihaip@chromium.org>
 
Update the pixel expectations for the chromium-mac port.
......
Ensure correct behavior of canvas with fillPath using a gradient fillStyle and a shadow
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
Verifying alpha shadow...
PASS data[0] is 0
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is 0
PASS data[0] is 255
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is around 64
PASS data[0] is 255
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is around 64
PASS data[0] is 255
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is around 64
PASS data[0] is 255
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is around 64
Verifying blurry shadow...
PASS data[0] is 0
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is 0
PASS data[0] is 255
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is around 31
PASS data[0] is 255
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is around 31
PASS data[0] is 255
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is around 31
PASS data[0] is 255
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is around 31
Verifying rotated alpha shadow...
PASS data[0] is 0
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is 0
PASS data[0] is 255
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is around 64
PASS data[0] is 255
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is around 64
PASS data[0] is 255
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is around 64
PASS data[0] is 255
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is around 64
Verifying rotated blurry shadow...
PASS data[0] is 0
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is 0
PASS data[0] is 255
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is around 31
PASS data[0] is 255
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is around 31
PASS data[0] is 255
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is around 31
PASS data[0] is 255
PASS data[1] is 0
PASS data[2] is 0
PASS data[3] is around 31
PASS successfullyParsed is true
TEST COMPLETE
<!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-fillPath-gradient-shadow.js"></script>
<script src="../js/resources/js-test-post.js"></script>
</body>
</html>
description("Ensure correct behavior of canvas with fillPath using a gradient fillStyle and a 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 shouldBeAround(a, b)
{
var evalA;
try {
evalA = eval(a);
} catch(e) {
evalA = e;
}
if (Math.abs(evalA - b) < 15)
print("PASS " + a + " is around " + b , "green")
else
print("FAIL " + a + " is not around " + b + " (actual: " + evalA + ")", "red");
}
var canvas = document.createElement('canvas');
document.body.appendChild(canvas);
canvas.setAttribute('width', '600');
canvas.setAttribute('height', '1100');
var ctx = canvas.getContext('2d');
var gradient = ctx.createLinearGradient(0, 0, 300, 0);
gradient.addColorStop(0, 'rgba(0, 0, 255, 0.5)');
gradient.addColorStop(1, 'rgba(0, 0, 255, 0.5)');
ctx.save();
ctx.fillStyle = gradient;
ctx.shadowColor = 'rgba(255, 0, 0, 0.5)';
ctx.shadowOffsetX = 250;
function fillShape(x, y) {
ctx.beginPath();
ctx.arc(x, y, 100, 0, Math.PI*2, true);
ctx.arc(x, y, 50, 0, Math.PI*2, false);
ctx.fill();
}
// Alpha shadow.
ctx.shadowBlur = 0;
fillShape(150, 150);
// Blurry shadow.
ctx.shadowBlur = 10;
fillShape(150, 400);
ctx.rotate(Math.PI/2);
// Rotated alpha shadow.
ctx.shadowBlur = 0;
fillShape(650, -150);
// Rotated blurry shadow.
ctx.shadowBlur = 10;
fillShape(900, -150);
ctx.restore();
var imageData, data;
ctx.fillStyle = 'black';
function test(alphaTestFunction, x, y, r, g, b, a) {
// Get pixel.
imageData = ctx.getImageData(x, y, 1, 1);
data = imageData.data;
// Test pixel color components.
shouldBe('data[0]', r+'');
shouldBe('data[1]', g+'');
shouldBe('data[2]', b+'');
alphaTestFunction('data[3]', a+'');
// Plot test point.
ctx.fillRect(x, y, 3, 3);
}
print('Verifying alpha shadow...');
test(shouldBe, 400, 150, 0, 0, 0, 0);
test(shouldBeAround, 400, 75, 255, 0, 0, 64);
test(shouldBeAround, 400, 225, 255, 0, 0, 64);
test(shouldBeAround, 325, 150, 255, 0, 0, 64);
test(shouldBeAround, 475, 150, 255, 0, 0, 64);
print(' ');
print('Verifying blurry shadow...');
test(shouldBe, 400, 400, 0, 0, 0, 0);
test(shouldBeAround, 400, 300, 255, 0, 0, 31);
test(shouldBeAround, 400, 500, 255, 0, 0, 31);
test(shouldBeAround, 300, 400, 255, 0, 0, 31);
test(shouldBeAround, 500, 400, 255, 0, 0, 31);
print(' ');
print('Verifying rotated alpha shadow...');
test(shouldBe, 400, 650, 0, 0, 0, 0);
test(shouldBeAround, 400, 575, 255, 0, 0, 64);
test(shouldBeAround, 400, 725, 255, 0, 0, 64);
test(shouldBeAround, 325, 650, 255, 0, 0, 64);
test(shouldBeAround, 475, 650, 255, 0, 0, 64);
print(' ');
print('Verifying rotated blurry shadow...');
test(shouldBe, 400, 900, 0, 0, 0, 0);
test(shouldBeAround, 400, 800, 255, 0, 0, 31);
test(shouldBeAround, 400, 1000, 255, 0, 0, 31);
test(shouldBeAround, 300, 900, 255, 0, 0, 31);
test(shouldBeAround, 500, 900, 255, 0, 0, 31);
print(' ');
var successfullyParsed = true;
......@@ -1297,6 +1297,7 @@ BUGCR23477 MAC : fast/canvas/canvas-as-image-incremental-repaint.html = IMAGE
BUGCR23477 MAC : fast/canvas/canvas-incremental-repaint.html = IMAGE
BUGCR23477 MAC : fast/canvas/fill-stroke-clip-reset-path.html = IMAGE
BUGCR23477 MAC : fast/dynamic/containing-block-change.html = IMAGE
BUGWK51982 LINUX WIN : fast/canvas/canvas-fillPath-gradient-shadow.html = FAIL
// Unexpected gray
BUGCR23476 MAC : fast/forms/listbox-clip.html = IMAGE
......
......@@ -2367,6 +2367,7 @@ fast/text/large-text-composed-char-dos.html
fast/text/international/002.html
fast/block/positioning/absolute-in-inline-rtl-4.html
fast/canvas/canvas-gradient-addStop-error.html
fast/canvas/canvas-fillPath-gradient-shadow.html
fast/css/zoom-body-scroll.html
fast/dom/Element/getBoundingClientRect.html
fast/dom/Element/getClientRects.html
......
2011-01-14 Helder Correia <helder@sencha.com>
Reviewed by Simon Fraser.
Shadow is not drawn when filling a path with a gradient
https://bugs.webkit.org/show_bug.cgi?id=51982
This happens in CG and is related to bug 51869, this time to be fixed
in GraphicsContext::fillPath(const Path& path). We need to draw the
gradient clipped to the path on a CGLayer first, and then draw the
layer on the GraphicsContext.
Test: fast/canvas/canvas-fillPath-gradient-shadow.html
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::fillPath):
2011-01-14 Simon Fraser <simon.fraser@apple.com>
 
Reviewed by Adam Roben.
......
......@@ -546,21 +546,46 @@ void GraphicsContext::fillPath(const Path& path)
CGContextRef context = platformContext();
CGContextBeginPath(context);
CGContextAddPath(context, path.platformPath());
if (m_state.fillGradient) {
CGContextSaveGState(context);
if (fillRule() == RULE_EVENODD)
CGContextEOClip(context);
else
CGContextClip(context);
CGContextConcatCTM(context, m_state.fillGradient->gradientSpaceTransform());
m_state.fillGradient->paint(this);
CGContextRestoreGState(context);
if (hasShadow()) {
FloatRect rect = path.boundingRect();
CGLayerRef layer = CGLayerCreateWithContext(context, CGSizeMake(rect.width(), rect.height()), 0);
CGContextRef layerContext = CGLayerGetContext(layer);
CGContextTranslateCTM(layerContext, -rect.x(), -rect.y());
CGContextBeginPath(layerContext);
CGContextAddPath(layerContext, path.platformPath());
CGContextConcatCTM(layerContext, m_state.fillGradient->gradientSpaceTransform());
if (fillRule() == RULE_EVENODD)
CGContextEOClip(layerContext);
else
CGContextClip(layerContext);
m_state.fillGradient->paint(layerContext);
CGContextDrawLayerAtPoint(context, CGPointMake(rect.left(), rect.top()), layer);
CGLayerRelease(layer);
} else {
CGContextBeginPath(context);
CGContextAddPath(context, path.platformPath());
CGContextSaveGState(context);
CGContextConcatCTM(context, m_state.fillGradient->gradientSpaceTransform());
if (fillRule() == RULE_EVENODD)
CGContextEOClip(context);
else
CGContextClip(context);
m_state.fillGradient->paint(this);
CGContextRestoreGState(context);
}
return;
}
CGContextBeginPath(context);
CGContextAddPath(context, path.platformPath());
if (m_state.fillPattern)
applyFillPattern();
fillPathWithFillRule(context, fillRule());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment