[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
commit-queue at webkit.org
commit-queue at webkit.org
Sun Feb 20 23:05:41 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit fd84b4d180e8e910b52a98b1d8fe51ddc59ef2a9
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 17 09:25:46 2011 +0000
2011-01-17 Helder Correia <helder at sencha.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] fast/canvas/canvas-fillPath-gradient-shadow.html does not pass
https://bugs.webkit.org/show_bug.cgi?id=52556
The shadow color opacity needs to be set on the shadow painter.
Additionally, the gradient brush should be transformed.
* platform/qt/Skipped: Remove test from skipped list.
2011-01-17 Helder Correia <helder at sencha.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] fast/canvas/canvas-fillPath-gradient-shadow.html does not pass
https://bugs.webkit.org/show_bug.cgi?id=52556
The shadow color opacity needs to be set on the shadow painter.
Additionally, the gradient brush should be transformed.
* platform/graphics/qt/GraphicsContextQt.cpp:
(WebCore::GraphicsContext::fillPath):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75927 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index deb090c..3fbe91e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-17 Helder Correia <helder at sencha.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] fast/canvas/canvas-fillPath-gradient-shadow.html does not pass
+ https://bugs.webkit.org/show_bug.cgi?id=52556
+
+ The shadow color opacity needs to be set on the shadow painter.
+ Additionally, the gradient brush should be transformed.
+
+ * platform/qt/Skipped: Remove test from skipped list.
+
2011-01-17 Philippe Normand <pnormand at igalia.com>
Unreviewed, rolling out r75914.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 5058a15..938a5c7 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -2372,7 +2372,6 @@ 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
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c94c74c..26944c0 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-17 Helder Correia <helder at sencha.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] fast/canvas/canvas-fillPath-gradient-shadow.html does not pass
+ https://bugs.webkit.org/show_bug.cgi?id=52556
+
+ The shadow color opacity needs to be set on the shadow painter.
+ Additionally, the gradient brush should be transformed.
+
+ * platform/graphics/qt/GraphicsContextQt.cpp:
+ (WebCore::GraphicsContext::fillPath):
+
2011-01-17 No'am Rosenthal <noam.rosenthal at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index e237fc0..59022cb 100644
--- a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -496,8 +496,13 @@ void GraphicsContext::fillPath(const Path& path)
{
QPainter* shadowPainter = shadow->beginShadowLayer(this, platformPath.controlPointRect());
if (shadowPainter) {
- shadowPainter->setCompositionMode(QPainter::CompositionMode_Source);
- shadowPainter->fillPath(platformPath, QColor(m_data->shadow.m_color));
+ if (m_state.fillGradient) {
+ QBrush brush(*m_state.fillGradient->platformGradient());
+ brush.setTransform(m_state.fillGradient->gradientSpaceTransform());
+ shadowPainter->setOpacity(static_cast<qreal>(shadow->m_color.alpha()) / 255);
+ shadowPainter->fillPath(platformPath, brush);
+ } else
+ shadowPainter->fillPath(platformPath, QColor(shadow->m_color));
shadow->endShadowLayer(this);
}
} else {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list