[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
rniwa at webkit.org
rniwa at webkit.org
Wed Dec 22 13:59:14 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 051912060a490f2902784c9c81ab008321a11d28
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 30 22:11:18 2010 +0000
2010-09-30 Ryosuke Niwa <rniwa at webkit.org>
Unreviewed rebaseline for Qt and Windows platforms required by r68830.
* platform/qt/editing/execCommand/toggle-compound-styles-expected.txt: Merged b elements.
* platform/win/editing/execCommand/toggle-compound-styles-expected.txt: Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68840 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4ffe4c7..5fc12a2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-30 Ryosuke Niwa <rniwa at webkit.org>
+
+ Unreviewed rebaseline for Qt and Windows platforms required by r68830.
+
+ * platform/qt/editing/execCommand/toggle-compound-styles-expected.txt: Merged b elements.
+ * platform/win/editing/execCommand/toggle-compound-styles-expected.txt: Ditto.
+
2010-09-30 James Simonsen <simonjam at chromium.org>
Reviewed by Adam Barth.
diff --git a/LayoutTests/platform/qt/editing/execCommand/toggle-compound-styles-expected.txt b/LayoutTests/platform/qt/editing/execCommand/toggle-compound-styles-expected.txt
index 98f7000..c2e7986 100644
--- a/LayoutTests/platform/qt/editing/execCommand/toggle-compound-styles-expected.txt
+++ b/LayoutTests/platform/qt/editing/execCommand/toggle-compound-styles-expected.txt
@@ -6,7 +6,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PLATFORM-DEPENDENT TESTS
one bold command converted <u><b>hello</b> world</u> to <u><b>hello world</b></u>
one bold command converted <b>hello </b>world to <b>hello world</b>
-one bold command converted <u><b>hello </b></u>world to <u><b>hello </b></u><b>world</b>
+one bold command converted <u><b>hello </b></u>world to <b><u>hello </u>world</b>
one italic command converted <i>hello</i> <img> to <i>hello <img></i>
one italic command converted <s><b>hello<i> world</i></b></s> to <s><b><i>hello world</i></b></s>
PLATFORM-INDEPENDENT TESTS
diff --git a/LayoutTests/platform/win/editing/execCommand/toggle-compound-styles-expected.txt b/LayoutTests/platform/win/editing/execCommand/toggle-compound-styles-expected.txt
index 98f7000..c2e7986 100644
--- a/LayoutTests/platform/win/editing/execCommand/toggle-compound-styles-expected.txt
+++ b/LayoutTests/platform/win/editing/execCommand/toggle-compound-styles-expected.txt
@@ -6,7 +6,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PLATFORM-DEPENDENT TESTS
one bold command converted <u><b>hello</b> world</u> to <u><b>hello world</b></u>
one bold command converted <b>hello </b>world to <b>hello world</b>
-one bold command converted <u><b>hello </b></u>world to <u><b>hello </b></u><b>world</b>
+one bold command converted <u><b>hello </b></u>world to <b><u>hello </u>world</b>
one italic command converted <i>hello</i> <img> to <i>hello <img></i>
one italic command converted <s><b>hello<i> world</i></b></s> to <s><b><i>hello world</i></b></s>
PLATFORM-INDEPENDENT TESTS
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list