[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 02:22:27 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit a9995b4f96ebb5c01062d6de741ad2979ad35010
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Mar 15 14:34:25 2010 +0000
2010-03-15 Shu Chang <Chang.Shu at nokia.com>
Reviewed by Holger Freyther.
[Qt] Change and add expected results after the fix and also remove the test from Skipped.
https://bugs.webkit.org/show_bug.cgi?id=36060
* platform/qt/Skipped:
* platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.checksum: Added.
* platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.png: Added.
* platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.txt:
2010-03-15 Shu Chang <Chang.Shu at nokia.com>
Reviewed by Holger Freyther.
[Qt] The behavior of QGradient with no stops is defined differently from HTML5 spec,
where the latter requires the gradient to be transparent black. Explicitly added a
transparent black color stop to match the HTML5 behavior.
https://bugs.webkit.org/show_bug.cgi?id=36060
* platform/graphics/qt/GradientQt.cpp:
(WebCore::Gradient::platformGradient):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55993 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e31a0c3..cf845ba 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-15 Shu Chang <Chang.Shu at nokia.com>
+
+ Reviewed by Holger Freyther.
+
+ [Qt] Change and add expected results after the fix and also remove the test from Skipped.
+ https://bugs.webkit.org/show_bug.cgi?id=36060
+
+ * platform/qt/Skipped:
+ * platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.checksum: Added.
+ * platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.png: Added.
+ * platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.txt:
+
2010-03-15 MORITA Hajime <morrita at google.com>
Reviewed by Alexey Proskuryakov.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index df9c045..4eac087 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -2457,7 +2457,6 @@ fast/canvas/canvas-incremental-repaint.html
fast/canvas/canvas-text-alignment.html
fast/canvas/canvas-text-baseline.html
fast/canvas/fillrect_gradient.html
-fast/canvas/fillrect-gradient-zero-stops.html
fast/canvas/fill-stroke-clip-reset-path.html
fast/canvas/image-object-in-canvas.html
fast/canvas/patternfill-repeat.html
diff --git a/LayoutTests/platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.checksum b/LayoutTests/platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.checksum
new file mode 100644
index 0000000..40f10ed
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.checksum
@@ -0,0 +1 @@
+22115c742ce4a0005ce98fecd4544a08
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.png b/LayoutTests/platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.png
new file mode 100644
index 0000000..6be4eba
Binary files /dev/null and b/LayoutTests/platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.png differ
diff --git a/LayoutTests/platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.txt b/LayoutTests/platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.txt
index 3baa348..572fda9 100644
--- a/LayoutTests/platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.txt
+++ b/LayoutTests/platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.txt
@@ -3,15 +3,15 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x57
- RenderText {#text} at (0,0) size 750x38
- text run at (0,0) width 750: "The canvas below should show a gradient with zero stops, which according to the specification is filled with transparant"
- text run at (0,19) width 196: "black, ie. not visible. This tests "
- RenderInline {A} at (0,0) size 751x38 [color=#0000EE]
- RenderText {#text} at (196,19) size 751x38
- text run at (196,19) width 555: "Bug 13784, REGRESSION (r13744-13750): Crash with empty gradient when drawing to"
- text run at (0,38) width 45: "canvas"
- RenderBlock (anonymous) at (0,71) size 784x150
+ RenderBlock {P} at (0,0) size 784x60
+ RenderText {#text} at (0,0) size 756x40
+ text run at (0,0) width 756: "The canvas below should show a gradient with zero stops, which according to the specification is filled with"
+ text run at (0,20) width 303: "transparant black, ie. not visible. This tests "
+ RenderInline {A} at (0,0) size 742x40 [color=#0000EE]
+ RenderText {#text} at (303,20) size 742x40
+ text run at (303,20) width 439: "Bug 13784, REGRESSION (r13744-13750): Crash with empty"
+ text run at (0,40) width 234: "gradient when drawing to canvas"
+ RenderBlock (anonymous) at (0,76) size 784x150
RenderHTMLCanvas {CANVAS} at (0,0) size 300x150
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4b71910..3de22e1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-15 Shu Chang <Chang.Shu at nokia.com>
+
+ Reviewed by Holger Freyther.
+
+ [Qt] The behavior of QGradient with no stops is defined differently from HTML5 spec,
+ where the latter requires the gradient to be transparent black. Explicitly added a
+ transparent black color stop to match the HTML5 behavior.
+ https://bugs.webkit.org/show_bug.cgi?id=36060
+
+ * platform/graphics/qt/GradientQt.cpp:
+ (WebCore::Gradient::platformGradient):
+
2010-03-11 Antonio Gomes <tonikitoo at webkit.org>
Rubber-stamped by Holger Freyther.
diff --git a/WebCore/platform/graphics/qt/GradientQt.cpp b/WebCore/platform/graphics/qt/GradientQt.cpp
index 9b9acc2..94d3c25 100644
--- a/WebCore/platform/graphics/qt/GradientQt.cpp
+++ b/WebCore/platform/graphics/qt/GradientQt.cpp
@@ -67,6 +67,12 @@ QGradient* Gradient::platformGradient()
++stopIterator;
}
+ if (m_stops.isEmpty()) {
+ // The behavior of QGradient with no stops is defined differently from HTML5 spec,
+ // where the latter requires the gradient to be transparent black.
+ m_gradient->setColorAt(0.0, QColor(0, 0, 0, 0));
+ }
+
switch (m_spreadMethod) {
case SpreadMethodPad:
m_gradient->setSpread(QGradient::PadSpread);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list