[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 11:24:01 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 593ec577156b878e024af513ecf92833f340a2cd
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 21 22:59:20 2010 +0000
2010-07-21 Peter Beverloo <peter at lvp-media.com>
Reviewed by Darin Adler.
Updated six more layout tests from -khtml to -webkit
https://bugs.webkit.org/show_bug.cgi?id=42788
This is a follow up to r63854 and r63857
* css3/khtml-background-size-0x0-bmp.html:
* editing/deleting/delete-3959464-fix.html:
* editing/deleting/delete-and-undo.html:
* editing/deleting/delete-at-paragraph-boundaries-001.html:
* editing/deleting/delete-at-paragraph-boundaries-002.html:
* editing/deleting/delete-at-paragraph-boundaries-003.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63861 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b8f5d63..562c292 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-07-21 Peter Beverloo <peter at lvp-media.com>
+
+ Reviewed by Darin Adler.
+
+ Updated six more layout tests from -khtml to -webkit
+ https://bugs.webkit.org/show_bug.cgi?id=42788
+
+ This is a follow up to r63854 and r63857
+
+ * css3/khtml-background-size-0x0-bmp.html:
+ * editing/deleting/delete-3959464-fix.html:
+ * editing/deleting/delete-and-undo.html:
+ * editing/deleting/delete-at-paragraph-boundaries-001.html:
+ * editing/deleting/delete-at-paragraph-boundaries-002.html:
+ * editing/deleting/delete-at-paragraph-boundaries-003.html:
+
2010-07-21 Adam Barth <abarth at webkit.org>
Skip html5lib/runner.html on these platforms because the
diff --git a/LayoutTests/css3/khtml-background-size-0x0-bmp.html b/LayoutTests/css3/khtml-background-size-0x0-bmp.html
index 2916b03..2b21203 100644
--- a/LayoutTests/css3/khtml-background-size-0x0-bmp.html
+++ b/LayoutTests/css3/khtml-background-size-0x0-bmp.html
@@ -7,7 +7,7 @@
<style>
body {
background-image:url("support/0x0.bmp");
- -khtml-background-size: 100 auto;
+ -webkit-background-size: 100 auto;
}
</style>
</head>
diff --git a/LayoutTests/editing/deleting/delete-3959464-fix.html b/LayoutTests/editing/deleting/delete-3959464-fix.html
index a5ddd44..2872600 100644
--- a/LayoutTests/editing/deleting/delete-3959464-fix.html
+++ b/LayoutTests/editing/deleting/delete-3959464-fix.html
@@ -38,7 +38,7 @@ Should see "foo" and "bar" each in a separate red box. Note that the "foo" text
There <b>must</b> be a space at the end of the line.
</div>
-<div contenteditable="true" id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;">
+<div contenteditable="true" id="root" style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">
<div id="test" class="editing">foo</div>
</div>
diff --git a/LayoutTests/editing/deleting/delete-and-undo.html b/LayoutTests/editing/deleting/delete-and-undo.html
index d9572c1..e323617 100644
--- a/LayoutTests/editing/deleting/delete-and-undo.html
+++ b/LayoutTests/editing/deleting/delete-and-undo.html
@@ -38,7 +38,7 @@ function editingTest() {
Should see "foo bar baz" in the red box. Insertion point should be between the "b" and "a" of "baz".
</div>
-<div id="root" contenteditable="true" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;">
+<div id="root" contenteditable="true" style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">
<div id="test" class="editing">foo bar baz</div></div>
<script>
diff --git a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-001.html b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-001.html
index 79a811c..bf7a9fc 100644
--- a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-001.html
+++ b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-001.html
@@ -47,12 +47,12 @@ be blinking on the second line (the first blank one).
</div>
</div>
-<div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;">
+<div contenteditable id="root" style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">
<div id="test" class="editing">
<p style="margin-top: 0; margin-bottom: 0">A</p>
-<p style="margin-top: 0; margin-bottom: 0"><BR class="khtml-block-placeholder"></p>
+<p style="margin-top: 0; margin-bottom: 0"><BR class="webkit-block-placeholder"></p>
<p style="margin-top: 0; margin-bottom: 0">A</p>
-<p style="margin-top: 0; margin-bottom: 0"><BR class="khtml-block-placeholder"></p>
+<p style="margin-top: 0; margin-bottom: 0"><BR class="webkit-block-placeholder"></p>
</div>
</div>
diff --git a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-002.html b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-002.html
index ae0e277..e704d10 100644
--- a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-002.html
+++ b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-002.html
@@ -47,12 +47,12 @@ be blinking on the second line (the first blank one).
</div>
</div>
-<div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;">
+<div contenteditable id="root" style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">
<div id="test" class="editing">
<p style="margin-top: 0; margin-bottom: 0">A</p>
<BR>
<p style="margin-top: 0; margin-bottom: 0">A</p>
-<p style="margin-top: 0; margin-bottom: 0"><BR class="khtml-block-placeholder"></p>
+<p style="margin-top: 0; margin-bottom: 0"><BR class="webkit-block-placeholder"></p>
</div>
</div>
diff --git a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-003.html b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-003.html
index 7e99047..80570ca 100644
--- a/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-003.html
+++ b/LayoutTests/editing/deleting/delete-at-paragraph-boundaries-003.html
@@ -48,10 +48,10 @@ be blinking at the start of the second line.
</div>
</div>
-<div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;">
+<div contenteditable id="root" style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">
<div id="test" class="editing">
<p style="margin-top: 0; margin-bottom: 0">A</p>
-<p style="margin-top: 0; margin-bottom: 0"><BR class="khtml-block-placeholder"></p>
+<p style="margin-top: 0; margin-bottom: 0"><BR class="webkit-block-placeholder"></p>
<p style="margin-top: 0; margin-bottom: 0">AA</p>
</div>
</div>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list