[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mrobinson at webkit.org
mrobinson at webkit.org
Wed Dec 22 11:35:49 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 129b099e2ce6eff7e4023be37507d49ec45cce44
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 30 06:44:10 2010 +0000
2010-07-29 Martin Robinson <mrobinson at igalia.com>
Reviewed by Dirk Schulze.
Cairo: Need to implement GraphicsContext::clipConvexPolygon()
https://bugs.webkit.org/show_bug.cgi?id=41308
Enable tests for path based borders.
* platform/gtk/fast/borders/border-radius-circle-expected.checksum: Added.
* platform/gtk/fast/borders/border-radius-circle-expected.png: Added.
* platform/gtk/fast/borders/border-radius-circle-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/border-radius-circle-expected.txt.
* platform/gtk/fast/borders/border-radius-groove-01-expected.checksum: Added.
* platform/gtk/fast/borders/border-radius-groove-01-expected.png: Added.
* platform/gtk/fast/borders/border-radius-groove-01-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/border-radius-groove-01-expected.txt.
* platform/gtk/fast/borders/border-radius-groove-02-expected.checksum: Added.
* platform/gtk/fast/borders/border-radius-groove-02-expected.png: Added.
* platform/gtk/fast/borders/border-radius-groove-02-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/border-radius-groove-02-expected.txt.
* platform/gtk/fast/borders/border-radius-groove-03-expected.checksum: Added.
* platform/gtk/fast/borders/border-radius-groove-03-expected.png: Added.
* platform/gtk/fast/borders/border-radius-groove-03-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/border-radius-groove-03-expected.txt.
* platform/gtk/fast/borders/border-radius-wide-border-01-expected.checksum: Added.
* platform/gtk/fast/borders/border-radius-wide-border-01-expected.png: Added.
* platform/gtk/fast/borders/border-radius-wide-border-01-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/border-radius-wide-border-01-expected.txt.
* platform/gtk/fast/borders/border-radius-wide-border-02-expected.checksum: Added.
* platform/gtk/fast/borders/border-radius-wide-border-02-expected.png: Added.
* platform/gtk/fast/borders/border-radius-wide-border-02-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/border-radius-wide-border-02-expected.txt.
* platform/gtk/fast/borders/border-radius-wide-border-03-expected.checksum: Added.
* platform/gtk/fast/borders/border-radius-wide-border-03-expected.png: Added.
* platform/gtk/fast/borders/border-radius-wide-border-03-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/border-radius-wide-border-03-expected.txt.
* platform/gtk/fast/borders/border-radius-wide-border-04-expected.checksum: Added.
* platform/gtk/fast/borders/border-radius-wide-border-04-expected.png: Added.
* platform/gtk/fast/borders/border-radius-wide-border-04-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/border-radius-wide-border-04-expected.txt.
* platform/gtk/fast/borders/borderRadiusDashed04-expected.checksum: Added.
* platform/gtk/fast/borders/borderRadiusDashed04-expected.png: Added.
* platform/gtk/fast/borders/borderRadiusDashed04-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDashed04-expected.txt.
* platform/gtk/fast/borders/borderRadiusDashed05-expected.checksum: Added.
* platform/gtk/fast/borders/borderRadiusDashed05-expected.png: Added.
* platform/gtk/fast/borders/borderRadiusDashed05-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDashed05-expected.txt.
* platform/gtk/fast/borders/borderRadiusDashed06-expected.checksum: Added.
* platform/gtk/fast/borders/borderRadiusDashed06-expected.png: Added.
* platform/gtk/fast/borders/borderRadiusDashed06-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDashed06-expected.txt.
* platform/gtk/fast/borders/borderRadiusDotted04-expected.checksum: Added.
* platform/gtk/fast/borders/borderRadiusDotted04-expected.png: Added.
* platform/gtk/fast/borders/borderRadiusDotted04-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDotted04-expected.txt.
* platform/gtk/fast/borders/borderRadiusDotted05-expected.checksum: Added.
* platform/gtk/fast/borders/borderRadiusDotted05-expected.png: Added.
* platform/gtk/fast/borders/borderRadiusDotted05-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDotted05-expected.txt.
* platform/gtk/fast/borders/borderRadiusDotted06-expected.checksum: Added.
* platform/gtk/fast/borders/borderRadiusDotted06-expected.png: Added.
* platform/gtk/fast/borders/borderRadiusDotted06-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDotted06-expected.txt.
* platform/gtk/fast/borders/borderRadiusDouble04-expected.checksum: Added.
* platform/gtk/fast/borders/borderRadiusDouble04-expected.png: Added.
* platform/gtk/fast/borders/borderRadiusDouble04-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDouble04-expected.txt.
* platform/gtk/fast/borders/borderRadiusDouble05-expected.checksum: Added.
* platform/gtk/fast/borders/borderRadiusDouble05-expected.png: Added.
* platform/gtk/fast/borders/borderRadiusDouble05-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDouble05-expected.txt.
* platform/gtk/fast/borders/borderRadiusDouble06-expected.checksum: Added.
* platform/gtk/fast/borders/borderRadiusDouble06-expected.png: Added.
* platform/gtk/fast/borders/borderRadiusDouble06-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDouble06-expected.txt.
* platform/gtk/fast/borders/borderRadiusDouble07-expected.checksum: Added.
* platform/gtk/fast/borders/borderRadiusDouble07-expected.png: Added.
* platform/gtk/fast/borders/borderRadiusDouble07-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDouble07-expected.txt.
* platform/gtk/fast/borders/borderRadiusDouble08-expected.checksum: Added.
* platform/gtk/fast/borders/borderRadiusDouble08-expected.png: Added.
* platform/gtk/fast/borders/borderRadiusDouble08-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDouble08-expected.txt.
* platform/gtk/fast/borders/borderRadiusDouble09-expected.checksum: Added.
* platform/gtk/fast/borders/borderRadiusDouble09-expected.png: Added.
* platform/gtk/fast/borders/borderRadiusDouble09-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDouble09-expected.txt.
* platform/gtk/fast/borders/different-color-borders-expected.checksum: Added.
* platform/gtk/fast/borders/different-color-borders-expected.png: Added.
* platform/gtk/fast/borders/different-color-borders-expected.txt: Added.
2010-07-29 Ryosuke Niwa <rniwa at webkit.org>
Reviewed by Darin Adler.
InsertOrderedList does not switch the list type properly when it has an inner list.
https://bugs.webkit.org/show_bug.cgi?id=43166
The bug was caused by forcedCreateList was not set to true when the start and the end
of the selection lies in the same list. Added selectionHasListOfType to fix this problem.
WebKit used not to convert the outer lists even when the list is fully selected.
Corrected this behavior by converting the entire list at once when the list is fully selected.
To decide whether or not a list is fully selected, added currentSelection argument to doApplyForSingleParagraph.
Tests: editing/execCommand/switch-list-type-with-inner-list.html
editing/execCommand/switch-list-type-with-orphaned-li.html
* editing/InsertListCommand.cpp:
(WebCore::InsertListCommand::mergeWithNeighboringLists): Extracted the code to merge lists.
(WebCore::InsertListCommand::selectionHasListOfType): attachment.cgi
(WebCore::InsertListCommand::doApply): Calls selectionHasListOfType.
(WebCore::InsertListCommand::doApplyForSingleParagraph): See above.
(WebCore::InsertListCommand::listifyParagraph): Calls mergeWithNeighboringLists.
* editing/InsertListCommand.h:
* editing/htmlediting.cpp:
(WebCore::canMergeLists): Ensures lists being merged are instances of HTMLElement.
(WebCore::isNodeVisiblyContainedWithin): Works properly when one end is inside the range.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64338 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2e433af..d8ce0c0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,76 @@
+2010-07-29 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Dirk Schulze.
+
+ Cairo: Need to implement GraphicsContext::clipConvexPolygon()
+ https://bugs.webkit.org/show_bug.cgi?id=41308
+
+ Enable tests for path based borders.
+
+ * platform/gtk/fast/borders/border-radius-circle-expected.checksum: Added.
+ * platform/gtk/fast/borders/border-radius-circle-expected.png: Added.
+ * platform/gtk/fast/borders/border-radius-circle-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/border-radius-circle-expected.txt.
+ * platform/gtk/fast/borders/border-radius-groove-01-expected.checksum: Added.
+ * platform/gtk/fast/borders/border-radius-groove-01-expected.png: Added.
+ * platform/gtk/fast/borders/border-radius-groove-01-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/border-radius-groove-01-expected.txt.
+ * platform/gtk/fast/borders/border-radius-groove-02-expected.checksum: Added.
+ * platform/gtk/fast/borders/border-radius-groove-02-expected.png: Added.
+ * platform/gtk/fast/borders/border-radius-groove-02-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/border-radius-groove-02-expected.txt.
+ * platform/gtk/fast/borders/border-radius-groove-03-expected.checksum: Added.
+ * platform/gtk/fast/borders/border-radius-groove-03-expected.png: Added.
+ * platform/gtk/fast/borders/border-radius-groove-03-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/border-radius-groove-03-expected.txt.
+ * platform/gtk/fast/borders/border-radius-wide-border-01-expected.checksum: Added.
+ * platform/gtk/fast/borders/border-radius-wide-border-01-expected.png: Added.
+ * platform/gtk/fast/borders/border-radius-wide-border-01-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/border-radius-wide-border-01-expected.txt.
+ * platform/gtk/fast/borders/border-radius-wide-border-02-expected.checksum: Added.
+ * platform/gtk/fast/borders/border-radius-wide-border-02-expected.png: Added.
+ * platform/gtk/fast/borders/border-radius-wide-border-02-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/border-radius-wide-border-02-expected.txt.
+ * platform/gtk/fast/borders/border-radius-wide-border-03-expected.checksum: Added.
+ * platform/gtk/fast/borders/border-radius-wide-border-03-expected.png: Added.
+ * platform/gtk/fast/borders/border-radius-wide-border-03-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/border-radius-wide-border-03-expected.txt.
+ * platform/gtk/fast/borders/border-radius-wide-border-04-expected.checksum: Added.
+ * platform/gtk/fast/borders/border-radius-wide-border-04-expected.png: Added.
+ * platform/gtk/fast/borders/border-radius-wide-border-04-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/border-radius-wide-border-04-expected.txt.
+ * platform/gtk/fast/borders/borderRadiusDashed04-expected.checksum: Added.
+ * platform/gtk/fast/borders/borderRadiusDashed04-expected.png: Added.
+ * platform/gtk/fast/borders/borderRadiusDashed04-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDashed04-expected.txt.
+ * platform/gtk/fast/borders/borderRadiusDashed05-expected.checksum: Added.
+ * platform/gtk/fast/borders/borderRadiusDashed05-expected.png: Added.
+ * platform/gtk/fast/borders/borderRadiusDashed05-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDashed05-expected.txt.
+ * platform/gtk/fast/borders/borderRadiusDashed06-expected.checksum: Added.
+ * platform/gtk/fast/borders/borderRadiusDashed06-expected.png: Added.
+ * platform/gtk/fast/borders/borderRadiusDashed06-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDashed06-expected.txt.
+ * platform/gtk/fast/borders/borderRadiusDotted04-expected.checksum: Added.
+ * platform/gtk/fast/borders/borderRadiusDotted04-expected.png: Added.
+ * platform/gtk/fast/borders/borderRadiusDotted04-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDotted04-expected.txt.
+ * platform/gtk/fast/borders/borderRadiusDotted05-expected.checksum: Added.
+ * platform/gtk/fast/borders/borderRadiusDotted05-expected.png: Added.
+ * platform/gtk/fast/borders/borderRadiusDotted05-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDotted05-expected.txt.
+ * platform/gtk/fast/borders/borderRadiusDotted06-expected.checksum: Added.
+ * platform/gtk/fast/borders/borderRadiusDotted06-expected.png: Added.
+ * platform/gtk/fast/borders/borderRadiusDotted06-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDotted06-expected.txt.
+ * platform/gtk/fast/borders/borderRadiusDouble04-expected.checksum: Added.
+ * platform/gtk/fast/borders/borderRadiusDouble04-expected.png: Added.
+ * platform/gtk/fast/borders/borderRadiusDouble04-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDouble04-expected.txt.
+ * platform/gtk/fast/borders/borderRadiusDouble05-expected.checksum: Added.
+ * platform/gtk/fast/borders/borderRadiusDouble05-expected.png: Added.
+ * platform/gtk/fast/borders/borderRadiusDouble05-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDouble05-expected.txt.
+ * platform/gtk/fast/borders/borderRadiusDouble06-expected.checksum: Added.
+ * platform/gtk/fast/borders/borderRadiusDouble06-expected.png: Added.
+ * platform/gtk/fast/borders/borderRadiusDouble06-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDouble06-expected.txt.
+ * platform/gtk/fast/borders/borderRadiusDouble07-expected.checksum: Added.
+ * platform/gtk/fast/borders/borderRadiusDouble07-expected.png: Added.
+ * platform/gtk/fast/borders/borderRadiusDouble07-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDouble07-expected.txt.
+ * platform/gtk/fast/borders/borderRadiusDouble08-expected.checksum: Added.
+ * platform/gtk/fast/borders/borderRadiusDouble08-expected.png: Added.
+ * platform/gtk/fast/borders/borderRadiusDouble08-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDouble08-expected.txt.
+ * platform/gtk/fast/borders/borderRadiusDouble09-expected.checksum: Added.
+ * platform/gtk/fast/borders/borderRadiusDouble09-expected.png: Added.
+ * platform/gtk/fast/borders/borderRadiusDouble09-expected.txt: Copied from LayoutTests/platform/mac/fast/borders/borderRadiusDouble09-expected.txt.
+ * platform/gtk/fast/borders/different-color-borders-expected.checksum: Added.
+ * platform/gtk/fast/borders/different-color-borders-expected.png: Added.
+ * platform/gtk/fast/borders/different-color-borders-expected.txt: Added.
+
2010-07-29 Ryosuke Niwa <rniwa at webkit.org>
Reviewed by Darin Adler.
diff --git a/LayoutTests/platform/gtk/fast/borders/border-radius-circle-expected.checksum b/LayoutTests/platform/gtk/fast/borders/border-radius-circle-expected.checksum
new file mode 100644
index 0000000..aac1c5d
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/border-radius-circle-expected.checksum
@@ -0,0 +1 @@
+42e8f825041e9535fe2a6f65fc83855b
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/border-radius-circle-expected.png b/LayoutTests/platform/gtk/fast/borders/border-radius-circle-expected.png
new file mode 100644
index 0000000..c5812f7
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/border-radius-circle-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/border-radius-circle-expected.txt b/LayoutTests/platform/gtk/fast/borders/border-radius-circle-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/border-radius-circle-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/border-radius-circle-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/border-radius-groove-01-expected.checksum b/LayoutTests/platform/gtk/fast/borders/border-radius-groove-01-expected.checksum
new file mode 100644
index 0000000..8ea2bed
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/border-radius-groove-01-expected.checksum
@@ -0,0 +1 @@
+8ac18908ad7ab524ae0f9f5671828842
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/border-radius-groove-01-expected.png b/LayoutTests/platform/gtk/fast/borders/border-radius-groove-01-expected.png
new file mode 100644
index 0000000..4cd331a
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/border-radius-groove-01-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/border-radius-groove-01-expected.txt b/LayoutTests/platform/gtk/fast/borders/border-radius-groove-01-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/border-radius-groove-01-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/border-radius-groove-01-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/border-radius-groove-02-expected.checksum b/LayoutTests/platform/gtk/fast/borders/border-radius-groove-02-expected.checksum
new file mode 100644
index 0000000..d720e9c
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/border-radius-groove-02-expected.checksum
@@ -0,0 +1 @@
+d7ec2fdede54f2adf54abd136f1ee44a
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/border-radius-groove-02-expected.png b/LayoutTests/platform/gtk/fast/borders/border-radius-groove-02-expected.png
new file mode 100644
index 0000000..8cdd1b4
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/border-radius-groove-02-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/border-radius-groove-02-expected.txt b/LayoutTests/platform/gtk/fast/borders/border-radius-groove-02-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/border-radius-groove-02-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/border-radius-groove-02-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/border-radius-groove-03-expected.checksum b/LayoutTests/platform/gtk/fast/borders/border-radius-groove-03-expected.checksum
new file mode 100644
index 0000000..248e47b
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/border-radius-groove-03-expected.checksum
@@ -0,0 +1 @@
+cbc799ee7f409e8d373721473d62776e
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/border-radius-groove-03-expected.png b/LayoutTests/platform/gtk/fast/borders/border-radius-groove-03-expected.png
new file mode 100644
index 0000000..cba876a
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/border-radius-groove-03-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/border-radius-groove-03-expected.txt b/LayoutTests/platform/gtk/fast/borders/border-radius-groove-03-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/border-radius-groove-03-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/border-radius-groove-03-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-01-expected.checksum b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-01-expected.checksum
new file mode 100644
index 0000000..73deeb2
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-01-expected.checksum
@@ -0,0 +1 @@
+5bff41c2d475b9145d06cda40a740991
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-01-expected.png b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-01-expected.png
new file mode 100644
index 0000000..8d77e34
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-01-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/border-radius-wide-border-01-expected.txt b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-01-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/border-radius-wide-border-01-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-01-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-02-expected.checksum b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-02-expected.checksum
new file mode 100644
index 0000000..c7591a2
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-02-expected.checksum
@@ -0,0 +1 @@
+18a55aba8e70db3c19cc8bc698f6c839
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-02-expected.png b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-02-expected.png
new file mode 100644
index 0000000..1cc3154
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-02-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/border-radius-wide-border-02-expected.txt b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-02-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/border-radius-wide-border-02-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-02-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-03-expected.checksum b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-03-expected.checksum
new file mode 100644
index 0000000..4809482
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-03-expected.checksum
@@ -0,0 +1 @@
+32fa641c6846dd907569d4e9251f5275
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-03-expected.png b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-03-expected.png
new file mode 100644
index 0000000..fd6bdef
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-03-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/border-radius-wide-border-03-expected.txt b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-03-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/border-radius-wide-border-03-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-03-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-04-expected.checksum b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-04-expected.checksum
new file mode 100644
index 0000000..56e7259
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-04-expected.checksum
@@ -0,0 +1 @@
+84c94f1c597b90711dff7f2d71fcb3d7
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-04-expected.png b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-04-expected.png
new file mode 100644
index 0000000..55b7738
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-04-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/border-radius-wide-border-04-expected.txt b/LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-04-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/border-radius-wide-border-04-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/border-radius-wide-border-04-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed04-expected.checksum b/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed04-expected.checksum
new file mode 100644
index 0000000..8a2a6d9
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed04-expected.checksum
@@ -0,0 +1 @@
+e225ce65c14e47fec2cd2550b38416da
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed04-expected.png b/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed04-expected.png
new file mode 100644
index 0000000..51d0804
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed04-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/borderRadiusDashed04-expected.txt b/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed04-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/borderRadiusDashed04-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/borderRadiusDashed04-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed05-expected.checksum b/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed05-expected.checksum
new file mode 100644
index 0000000..43bdef3
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed05-expected.checksum
@@ -0,0 +1 @@
+6e0352f60889677b281420ee0d5efe85
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed05-expected.png b/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed05-expected.png
new file mode 100644
index 0000000..ccfd5b5
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed05-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/borderRadiusDashed05-expected.txt b/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed05-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/borderRadiusDashed05-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/borderRadiusDashed05-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed06-expected.checksum b/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed06-expected.checksum
new file mode 100644
index 0000000..57255f1
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed06-expected.checksum
@@ -0,0 +1 @@
+376df4fabb12afbb3d71cf65b2086500
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed06-expected.png b/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed06-expected.png
new file mode 100644
index 0000000..ccc8f67
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed06-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/borderRadiusDashed06-expected.txt b/LayoutTests/platform/gtk/fast/borders/borderRadiusDashed06-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/borderRadiusDashed06-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/borderRadiusDashed06-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted04-expected.checksum b/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted04-expected.checksum
new file mode 100644
index 0000000..fb96da5
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted04-expected.checksum
@@ -0,0 +1 @@
+99882af9055570544f21c8eddc36c771
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted04-expected.png b/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted04-expected.png
new file mode 100644
index 0000000..e6525e8
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted04-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/borderRadiusDotted04-expected.txt b/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted04-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/borderRadiusDotted04-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/borderRadiusDotted04-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted05-expected.checksum b/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted05-expected.checksum
new file mode 100644
index 0000000..3580866
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted05-expected.checksum
@@ -0,0 +1 @@
+724f75524bd4273fd2caa0b0074cb18f
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted05-expected.png b/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted05-expected.png
new file mode 100644
index 0000000..b30734b
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted05-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/borderRadiusDotted05-expected.txt b/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted05-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/borderRadiusDotted05-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/borderRadiusDotted05-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted06-expected.checksum b/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted06-expected.checksum
new file mode 100644
index 0000000..22b288c
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted06-expected.checksum
@@ -0,0 +1 @@
+90996cba0b3e00e93076ce1a08ad2065
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted06-expected.png b/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted06-expected.png
new file mode 100644
index 0000000..0e07c90
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted06-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/borderRadiusDotted06-expected.txt b/LayoutTests/platform/gtk/fast/borders/borderRadiusDotted06-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/borderRadiusDotted06-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/borderRadiusDotted06-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble04-expected.checksum b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble04-expected.checksum
new file mode 100644
index 0000000..4a5caa8
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble04-expected.checksum
@@ -0,0 +1 @@
+acf60233c084918ffb345e3672cf8822
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble04-expected.png b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble04-expected.png
new file mode 100644
index 0000000..342f22a
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble04-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/borderRadiusDouble04-expected.txt b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble04-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/borderRadiusDouble04-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/borderRadiusDouble04-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble05-expected.checksum b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble05-expected.checksum
new file mode 100644
index 0000000..7175636
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble05-expected.checksum
@@ -0,0 +1 @@
+d4e037b5f4d815d7191598f8ec991559
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble05-expected.png b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble05-expected.png
new file mode 100644
index 0000000..e392dc2
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble05-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/borderRadiusDouble05-expected.txt b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble05-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/borderRadiusDouble05-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/borderRadiusDouble05-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble06-expected.checksum b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble06-expected.checksum
new file mode 100644
index 0000000..94652e4
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble06-expected.checksum
@@ -0,0 +1 @@
+631517c6201b47044efba92979edbd07
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble06-expected.png b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble06-expected.png
new file mode 100644
index 0000000..065f051
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble06-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/borderRadiusDouble06-expected.txt b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble06-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/borderRadiusDouble06-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/borderRadiusDouble06-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble07-expected.checksum b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble07-expected.checksum
new file mode 100644
index 0000000..456cd2e
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble07-expected.checksum
@@ -0,0 +1 @@
+e3f23b7acc51b9683ae76cce272d48ed
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble07-expected.png b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble07-expected.png
new file mode 100644
index 0000000..eaae927
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble07-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/borderRadiusDouble07-expected.txt b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble07-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/borderRadiusDouble07-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/borderRadiusDouble07-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble08-expected.checksum b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble08-expected.checksum
new file mode 100644
index 0000000..be58f7f
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble08-expected.checksum
@@ -0,0 +1 @@
+b66b4b67e630f666148a37c154557ba5
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble08-expected.png b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble08-expected.png
new file mode 100644
index 0000000..ba703c1
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble08-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/borderRadiusDouble08-expected.txt b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble08-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/borderRadiusDouble08-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/borderRadiusDouble08-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble09-expected.checksum b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble09-expected.checksum
new file mode 100644
index 0000000..6cd378b
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble09-expected.checksum
@@ -0,0 +1 @@
+5cbed3facd6c29b3edf11bc529186135
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble09-expected.png b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble09-expected.png
new file mode 100644
index 0000000..de90024
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble09-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/borders/borderRadiusDouble09-expected.txt b/LayoutTests/platform/gtk/fast/borders/borderRadiusDouble09-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/borders/borderRadiusDouble09-expected.txt
copy to LayoutTests/platform/gtk/fast/borders/borderRadiusDouble09-expected.txt
diff --git a/LayoutTests/platform/gtk/fast/borders/different-color-borders-expected.checksum b/LayoutTests/platform/gtk/fast/borders/different-color-borders-expected.checksum
new file mode 100644
index 0000000..967cf56
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/different-color-borders-expected.checksum
@@ -0,0 +1 @@
+592bf344f3592fcddd609035b06eb9ff
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fast/borders/different-color-borders-expected.png b/LayoutTests/platform/gtk/fast/borders/different-color-borders-expected.png
new file mode 100644
index 0000000..dbbc2f8
Binary files /dev/null and b/LayoutTests/platform/gtk/fast/borders/different-color-borders-expected.png differ
diff --git a/LayoutTests/platform/gtk/fast/borders/different-color-borders-expected.txt b/LayoutTests/platform/gtk/fast/borders/different-color-borders-expected.txt
new file mode 100644
index 0000000..2db144d
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/borders/different-color-borders-expected.txt
@@ -0,0 +1,13 @@
+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 (8,8) size 784x572
+ RenderBlock {P} at (0,0) size 784x40
+ RenderText {#text} at (0,0) size 774x40
+ text run at (0,0) width 774: "When two border sides have different colors, the edge joining them should be anti-aliased. When two border sides have the"
+ text run at (0,20) width 619: "same color, the edge joining them should not be anti-aliased and no corner joints should be visible."
+ RenderBlock {DIV} at (20,60) size 240x80 [border: (20px solid #FF0000) (20px solid #000000)]
+ RenderBlock {DIV} at (20,160) size 240x80 [border: (20px solid #FF0000) (20px solid #000000) (20px solid #FF0000)]
+ RenderBlock {DIV} at (20,260) size 240x80 [border: (20px solid #FF0000) (20px solid #000000)]
+ RenderBlock {DIV} at (20,360) size 240x80 [border: (20px solid #FF0000) (20px solid #000000) (20px solid #FF0000)]
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bc0d8df..7fde796 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -30,6 +30,22 @@
Reviewed by Dirk Schulze.
+ Cairo: Need to implement GraphicsContext::clipConvexPolygon()
+ https://bugs.webkit.org/show_bug.cgi?id=41308
+
+ Implement clipConvexPolygon for Cairo ports and enable new path based
+ borders for that port as well.
+
+ * platform/graphics/cairo/GraphicsContextCairo.cpp:
+ (WebCore::addConvexPolygonToContext): Add this helper method.
+ (WebCore::GraphicsContext::drawConvexPolygon): Use the new addConvexPolygonToContext helper.
+ (WebCore::GraphicsContext::clipConvexPolygon): Implement this method.
+ * rendering/RenderObject.h: Enable path based borders for Cairo.
+
+2010-07-29 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Dirk Schulze.
+
[Cairo] Bring behavior of paths on the Cairo GraphicsContext into line with the CoreGraphics port
https://bugs.webkit.org/show_bug.cgi?id=41732
diff --git a/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp b/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
index ca468ad..93daee3 100644
--- a/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
+++ b/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
@@ -165,6 +165,14 @@ static void appendWebCorePathToCairoContext(cairo_t* context, const Path& path)
appendPathToCairoContext(context, path.platformPath()->m_cr);
}
+static void addConvexPolygonToContext(cairo_t* context, size_t numPoints, const FloatPoint* points)
+{
+ cairo_move_to(context, points[0].x(), points[0].y());
+ for (size_t i = 1; i < numPoints; i++)
+ cairo_line_to(context, points[i].x(), points[i].y());
+ cairo_close_path(context);
+}
+
void GraphicsContext::calculateShadowBufferDimensions(IntSize& shadowBufferSize, FloatRect& shadowRect, float& kernelSize, const FloatRect& sourceRect, const FloatSize& shadowSize, float shadowBlur)
{
#if ENABLE(FILTERS)
@@ -520,10 +528,7 @@ void GraphicsContext::drawConvexPolygon(size_t npoints, const FloatPoint* points
cairo_save(cr);
cairo_set_antialias(cr, shouldAntialias ? CAIRO_ANTIALIAS_DEFAULT : CAIRO_ANTIALIAS_NONE);
- cairo_move_to(cr, points[0].x(), points[0].y());
- for (size_t i = 1; i < npoints; i++)
- cairo_line_to(cr, points[i].x(), points[i].y());
- cairo_close_path(cr);
+ addConvexPolygonToContext(cr, npoints, points);
if (fillColor().alpha()) {
setColor(cr, fillColor());
@@ -548,8 +553,20 @@ void GraphicsContext::clipConvexPolygon(size_t numPoints, const FloatPoint* poin
if (numPoints <= 1)
return;
-
- // FIXME: IMPLEMENT!
+
+ cairo_t* cr = m_data->cr;
+
+ cairo_new_path(cr);
+ cairo_fill_rule_t savedFillRule = cairo_get_fill_rule(cr);
+ cairo_antialias_t savedAntialiasRule = cairo_get_antialias(cr);
+
+ cairo_set_antialias(cr, CAIRO_ANTIALIAS_DEFAULT);
+ cairo_set_fill_rule(cr, CAIRO_FILL_RULE_WINDING);
+ addConvexPolygonToContext(cr, numPoints, points);
+ cairo_clip(cr);
+
+ cairo_set_antialias(cr, savedAntialiasRule);
+ cairo_set_fill_rule(cr, savedFillRule);
}
void GraphicsContext::fillPath()
diff --git a/WebCore/rendering/RenderObject.h b/WebCore/rendering/RenderObject.h
index 3f78e45..46169d0 100644
--- a/WebCore/rendering/RenderObject.h
+++ b/WebCore/rendering/RenderObject.h
@@ -38,7 +38,7 @@
#include "TransformationMatrix.h"
#include <wtf/UnusedParam.h>
-#if PLATFORM(CG)
+#if PLATFORM(CG) || PLATFORM(CAIRO)
#define HAVE_PATH_BASED_BORDER_RADIUS_DRAWING 1
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list