[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
carlosgc at webkit.org
carlosgc at webkit.org
Sun Feb 20 23:54:10 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 6a09ab814532a007b795ade85b1fbbdb31a74501
Author: carlosgc at webkit.org <carlosgc at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 26 18:17:00 2011 +0000
2011-01-26 Carlos Garcia Campos <cgarcia at igalia.com>
Reviewed by Martin Robinson.
[cairo] Use CAIRO_OPERATOR_DARKEN when available
https://bugs.webkit.org/show_bug.cgi?id=53084
* platform/gtk/Skipped: Unskip test.
* platform/gtk/fast/canvas/canvas-composite-expected.checksum: Added.
* platform/gtk/fast/canvas/canvas-composite-expected.png: Added.
* platform/gtk/fast/canvas/canvas-composite-expected.txt: Added.
2011-01-26 Carlos Garcia Campos <cgarcia at igalia.com>
Reviewed by Martin Robinson.
[cairo] Use CAIRO_OPERATOR_DARKEN when available
https://bugs.webkit.org/show_bug.cgi?id=53084
Use CAIRO_OPERATOR_DARKEN for CompositePlusDarker instead of
CAIRO_OPERATOR_SATURATE when building with cairo version >= 1.10.
* platform/graphics/cairo/CairoUtilities.cpp:
(WebCore::toCairoOperator):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76697 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 60e5e75..5249fc0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-26 Carlos Garcia Campos <cgarcia at igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [cairo] Use CAIRO_OPERATOR_DARKEN when available
+ https://bugs.webkit.org/show_bug.cgi?id=53084
+
+ * platform/gtk/Skipped: Unskip test.
+ * platform/gtk/fast/canvas/canvas-composite-expected.checksum: Added.
+ * platform/gtk/fast/canvas/canvas-composite-expected.png: Added.
+ * platform/gtk/fast/canvas/canvas-composite-expected.txt: Added.
+
2011-01-26 Ryosuke Niwa <rniwa at webkit.org>
Unreviewed Chromium rebaselines for r76688.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 001b409..3c15c91 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -1438,7 +1438,6 @@ fast/box-sizing/box-sizing.html
fast/box-sizing/panels-one.html
fast/box-sizing/panels-two.html
fast/box-sizing/percentage-height.html
-fast/canvas/canvas-composite.html
fast/canvas/canvas-incremental-repaint.html
fast/canvas/canvas-text-alignment.html
fast/clip/001.html
diff --git a/LayoutTests/platform/gtk/fast/canvas/canvas-composite-expected.checksum b/LayoutTests/platform/gtk/fast/canvas/canvas-composite-expected.checksum
new file mode 100644
index 0000000..c0cb0dd
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/canvas/canvas-composite-expected.checksum
@@ -0,0 +1 @@
+87103d6f293d8fac94c33e65e6a7d37e
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/canvas/canvas-composite-expected.png b/LayoutTests/platform/gtk/fast/canvas/canvas-composite-expected.png
new file mode 100644
index 0000000..bcd40c5
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/canvas/canvas-composite-expected.png differ
diff --git a/LayoutTests/platform/gtk/fast/canvas/canvas-composite-expected.txt b/LayoutTests/platform/gtk/fast/canvas/canvas-composite-expected.txt
new file mode 100644
index 0000000..2451686
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/canvas/canvas-composite-expected.txt
@@ -0,0 +1,83 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (20,20) size 760x560 [bgcolor=#FFFFFF]
+ RenderBlock {DIV} at (0,0) size 760x509
+ RenderTable {TABLE} at (0,0) size 582x509
+ RenderTableSection {TBODY} at (0,0) size 582x509
+ RenderTableRow {TR} at (0,2) size 582x167
+ RenderTableCell {TD} at (2,2) size 143x167 [r=0 c=0 rs=1 cs=1]
+ RenderHTMLCanvas {CANVAS} at (7,7) size 129x129 [border: (2px solid #000000)]
+ RenderBR {BR} at (136,141) size 0x0
+ RenderInline {LABEL} at (0,0) size 84x19
+ RenderText {#text} at (7,141) size 84x19
+ text run at (7,141) width 84: "source-over"
+ RenderTableCell {TD} at (147,2) size 143x167 [r=0 c=1 rs=1 cs=1]
+ RenderHTMLCanvas {CANVAS} at (7,7) size 129x129 [border: (2px solid #000000)]
+ RenderBR {BR} at (136,141) size 0x0
+ RenderInline {LABEL} at (0,0) size 66x19
+ RenderText {#text} at (7,141) size 66x19
+ text run at (7,141) width 66: "source-in"
+ RenderTableCell {TD} at (292,2) size 143x167 [r=0 c=2 rs=1 cs=1]
+ RenderHTMLCanvas {CANVAS} at (7,7) size 129x129 [border: (2px solid #000000)]
+ RenderBR {BR} at (136,141) size 0x0
+ RenderInline {LABEL} at (0,0) size 75x19
+ RenderText {#text} at (7,141) size 75x19
+ text run at (7,141) width 75: "source-out"
+ RenderTableCell {TD} at (437,2) size 143x167 [r=0 c=3 rs=1 cs=1]
+ RenderHTMLCanvas {CANVAS} at (7,7) size 129x129 [border: (2px solid #000000)]
+ RenderBR {BR} at (136,141) size 0x0
+ RenderInline {LABEL} at (0,0) size 84x19
+ RenderText {#text} at (7,141) size 84x19
+ text run at (7,141) width 84: "source-atop"
+ RenderTableRow {TR} at (0,171) size 582x167
+ RenderTableCell {TD} at (2,171) size 143x167 [r=1 c=0 rs=1 cs=1]
+ RenderHTMLCanvas {CANVAS} at (7,7) size 129x129 [border: (2px solid #000000)]
+ RenderBR {BR} at (136,141) size 0x0
+ RenderInline {LABEL} at (0,0) size 114x19
+ RenderText {#text} at (7,141) size 114x19
+ text run at (7,141) width 114: "destination-over"
+ RenderTableCell {TD} at (147,171) size 143x167 [r=1 c=1 rs=1 cs=1]
+ RenderHTMLCanvas {CANVAS} at (7,7) size 129x129 [border: (2px solid #000000)]
+ RenderBR {BR} at (136,141) size 0x0
+ RenderInline {LABEL} at (0,0) size 96x19
+ RenderText {#text} at (7,141) size 96x19
+ text run at (7,141) width 96: "destination-in"
+ RenderTableCell {TD} at (292,171) size 143x167 [r=1 c=2 rs=1 cs=1]
+ RenderHTMLCanvas {CANVAS} at (7,7) size 129x129 [border: (2px solid #000000)]
+ RenderBR {BR} at (136,141) size 0x0
+ RenderInline {LABEL} at (0,0) size 105x19
+ RenderText {#text} at (7,141) size 105x19
+ text run at (7,141) width 105: "destination-out"
+ RenderTableCell {TD} at (437,171) size 143x167 [r=1 c=3 rs=1 cs=1]
+ RenderHTMLCanvas {CANVAS} at (7,7) size 129x129 [border: (2px solid #000000)]
+ RenderBR {BR} at (136,141) size 0x0
+ RenderInline {LABEL} at (0,0) size 114x19
+ RenderText {#text} at (7,141) size 114x19
+ text run at (7,141) width 114: "destination-atop"
+ RenderTableRow {TR} at (0,340) size 582x167
+ RenderTableCell {TD} at (2,340) size 143x167 [r=2 c=0 rs=1 cs=1]
+ RenderHTMLCanvas {CANVAS} at (7,7) size 129x129 [border: (2px solid #000000)]
+ RenderBR {BR} at (136,141) size 0x0
+ RenderInline {LABEL} at (0,0) size 44x19
+ RenderText {#text} at (7,141) size 44x19
+ text run at (7,141) width 44: "lighter"
+ RenderTableCell {TD} at (147,340) size 143x167 [r=2 c=1 rs=1 cs=1]
+ RenderHTMLCanvas {CANVAS} at (7,7) size 129x129 [border: (2px solid #000000)]
+ RenderBR {BR} at (136,141) size 0x0
+ RenderInline {LABEL} at (0,0) size 45x19
+ RenderText {#text} at (7,141) size 45x19
+ text run at (7,141) width 45: "darker"
+ RenderTableCell {TD} at (292,340) size 143x167 [r=2 c=2 rs=1 cs=1]
+ RenderHTMLCanvas {CANVAS} at (7,7) size 129x129 [border: (2px solid #000000)]
+ RenderBR {BR} at (136,141) size 0x0
+ RenderInline {LABEL} at (0,0) size 34x19
+ RenderText {#text} at (7,141) size 34x19
+ text run at (7,141) width 34: "copy"
+ RenderTableCell {TD} at (437,340) size 143x167 [r=2 c=3 rs=1 cs=1]
+ RenderHTMLCanvas {CANVAS} at (7,7) size 129x129 [border: (2px solid #000000)]
+ RenderBR {BR} at (136,141) size 0x0
+ RenderInline {LABEL} at (0,0) size 22x19
+ RenderText {#text} at (7,141) size 22x19
+ text run at (7,141) width 22: "xor"
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 1445bcc..c205fe9 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-26 Carlos Garcia Campos <cgarcia at igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [cairo] Use CAIRO_OPERATOR_DARKEN when available
+ https://bugs.webkit.org/show_bug.cgi?id=53084
+
+ Use CAIRO_OPERATOR_DARKEN for CompositePlusDarker instead of
+ CAIRO_OPERATOR_SATURATE when building with cairo version >= 1.10.
+
+ * platform/graphics/cairo/CairoUtilities.cpp:
+ (WebCore::toCairoOperator):
+
2011-01-26 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp b/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp
index 013a4af..ee159a1 100644
--- a/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp
+++ b/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp
@@ -106,7 +106,11 @@ cairo_operator_t toCairoOperator(CompositeOperator op)
case CompositeXOR:
return CAIRO_OPERATOR_XOR;
case CompositePlusDarker:
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
+ return CAIRO_OPERATOR_DARKEN;
+#else
return CAIRO_OPERATOR_SATURATE;
+#endif
case CompositeHighlight:
// There is no Cairo equivalent for CompositeHighlight.
return CAIRO_OPERATOR_OVER;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list