[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:15:04 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3072994bfb4b277c034e32657137e8e2cb5e487f
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 9 21:17:29 2010 +0000
2010-09-09 Ryosuke Niwa <rniwa at webkit.org>
Reviewed by James Robinson.
REGRESSION (r67101): query-font-size.html fails on qt and gtk builds
https://bugs.webkit.org/show_bug.cgi?id=45484
Removed the computed style's font size from the result.
This is fine because the expected result still contains queryCommandValue('fontSize')
along with the markup on which queryCommandValue is called,
which is sufficient to ensure the bug 21033 does not regress.
* editing/execCommand/query-font-size.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67116 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7f5324d..32108e2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-09 Ryosuke Niwa <rniwa at webkit.org>
+
+ Reviewed by James Robinson.
+
+ REGRESSION (r67101): query-font-size.html fails on qt and gtk builds
+ https://bugs.webkit.org/show_bug.cgi?id=45484
+
+ Removed the computed style's font size from the result.
+
+ This is fine because the expected result still contains queryCommandValue('fontSize')
+ along with the markup on which queryCommandValue is called,
+ which is sufficient to ensure the bug 21033 does not regress.
+
+ * editing/execCommand/query-font-size.html:
+
2010-09-09 Brian Weinstein <bweinstein at apple.com>
Rubber-stamped by Adam Roben.
diff --git a/LayoutTests/editing/execCommand/query-font-size-expected.txt b/LayoutTests/editing/execCommand/query-font-size-expected.txt
index 9c4d14d..9c9aea5 100644
--- a/LayoutTests/editing/execCommand/query-font-size-expected.txt
+++ b/LayoutTests/editing/execCommand/query-font-size-expected.txt
@@ -1,31 +1,31 @@
-test html queryCommandValue result getComputedStyle result
-execCommand('FontSize', -2) <span class="Apple-style-span" style="font-size: x-small;">test</span> 1 10px
-execCommand('FontSize', -1) <span class="Apple-style-span" style="font-size: small;">test</span> 2 13px
-execCommand('FontSize', 0) <span>test</span> 3 16px
-execCommand('FontSize', 1) <span class="Apple-style-span" style="font-size: x-small;">test</span> 1 10px
-execCommand('FontSize', 2) <span class="Apple-style-span" style="font-size: small;">test</span> 2 13px
-execCommand('FontSize', 3) <span>test</span> 3 16px
-execCommand('FontSize', 4) <span class="Apple-style-span" style="font-size: large;">test</span> 4 18px
-execCommand('FontSize', 5) <span class="Apple-style-span" style="font-size: x-large;">test</span> 5 24px
-execCommand('FontSize', 6) <span class="Apple-style-span" style="font-size: xx-large;">test</span> 6 32px
-execCommand('FontSize', 7) <span class="Apple-style-span" style="font-size: -webkit-xxx-large;">test</span> 7 48px
-execCommand('FontSize', '8px') <span class="Apple-style-span" style="font-size: -webkit-xxx-large;">test</span> 7 48px
-execCommand('FontSize', '2px') <span class="Apple-style-span" style="font-size: small;">test</span> 2 13px
-manual CSS font-size: 3px <span style="font-size: 3px">test</span> 1 3px
-manual CSS font-size: 0.2em <span style="font-size: 0.2em">test</span> 1 9px
-manual CSS font-size: 17px <span style="font-size: 17px">test</span> 4 17px
-manual CSS font-size: 31px <span style="font-size: 31px">test</span> 6 31px
-manual CSS font-size: 50px <span style="font-size: 50px">test</span> 7 50px
-manual CSS font-size: 5em <span style="font-size: 5em">test</span> 7 80px
-manual CSS font-size: 10px <span style="font-size: 10px">test</span> 1 10px
-monospace tests to show bug 19161
-execCommand('FontSize', -2) <span class="Apple-style-span" style="font-size: x-small;"><font class="Apple-style-span" face="monospace">test</font></span> 1 10px
-execCommand('FontSize', -1) <span class="Apple-style-span" style="font-size: small;"><font class="Apple-style-span" face="monospace">test</font></span> 2 13px
-execCommand('FontSize', 0) <span><font class="Apple-style-span" face="monospace">test</font></span> 3 16px
-execCommand('FontSize', 1) <span class="Apple-style-span" style="font-size: x-small;"><font class="Apple-style-span" face="monospace">test</font></span> 1 10px
-execCommand('FontSize', 2) <span class="Apple-style-span" style="font-size: small;"><font class="Apple-style-span" face="monospace">test</font></span> 2 13px
-execCommand('FontSize', 3) <span><font class="Apple-style-span" face="monospace">test</font></span> 3 16px
-execCommand('FontSize', 4) <span class="Apple-style-span" style="font-size: large;"><font class="Apple-style-span" face="monospace">test</font></span> 4 18px
-execCommand('FontSize', 5) <span class="Apple-style-span" style="font-size: x-large;"><font class="Apple-style-span" face="monospace">test</font></span> 5 24px
-execCommand('FontSize', 6) <span class="Apple-style-span" style="font-size: xx-large;"><font class="Apple-style-span" face="monospace">test</font></span> 6 32px
-execCommand('FontSize', 7) <span class="Apple-style-span" style="font-size: -webkit-xxx-large;"><font class="Apple-style-span" face="monospace">test</font></span> 7 48px
+test html queryCommandValue result
+execCommand('FontSize', -2) <span class="Apple-style-span" style="font-size: x-small;">test</span> 1
+execCommand('FontSize', -1) <span class="Apple-style-span" style="font-size: small;">test</span> 2
+execCommand('FontSize', 0) <span>test</span> 3
+execCommand('FontSize', 1) <span class="Apple-style-span" style="font-size: x-small;">test</span> 1
+execCommand('FontSize', 2) <span class="Apple-style-span" style="font-size: small;">test</span> 2
+execCommand('FontSize', 3) <span>test</span> 3
+execCommand('FontSize', 4) <span class="Apple-style-span" style="font-size: large;">test</span> 4
+execCommand('FontSize', 5) <span class="Apple-style-span" style="font-size: x-large;">test</span> 5
+execCommand('FontSize', 6) <span class="Apple-style-span" style="font-size: xx-large;">test</span> 6
+execCommand('FontSize', 7) <span class="Apple-style-span" style="font-size: -webkit-xxx-large;">test</span> 7
+execCommand('FontSize', '8px') <span class="Apple-style-span" style="font-size: -webkit-xxx-large;">test</span> 7
+execCommand('FontSize', '2px') <span class="Apple-style-span" style="font-size: small;">test</span> 2
+manual CSS font-size: 3px <span style="font-size: 3px">test</span> 1
+manual CSS font-size: 0.2em <span style="font-size: 0.2em">test</span> 1
+manual CSS font-size: 17px <span style="font-size: 17px">test</span> 4
+manual CSS font-size: 31px <span style="font-size: 31px">test</span> 6
+manual CSS font-size: 50px <span style="font-size: 50px">test</span> 7
+manual CSS font-size: 5em <span style="font-size: 5em">test</span> 7
+manual CSS font-size: 10px <span style="font-size: 10px">test</span> 1
+monospace tests to ensure the bug 19161 does not affect queryCommandValue's values
+execCommand('FontSize', -2) <span class="Apple-style-span" style="font-size: x-small;"><font class="Apple-style-span" face="monospace">test</font></span> 1
+execCommand('FontSize', -1) <span class="Apple-style-span" style="font-size: small;"><font class="Apple-style-span" face="monospace">test</font></span> 2
+execCommand('FontSize', 0) <span><font class="Apple-style-span" face="monospace">test</font></span> 3
+execCommand('FontSize', 1) <span class="Apple-style-span" style="font-size: x-small;"><font class="Apple-style-span" face="monospace">test</font></span> 1
+execCommand('FontSize', 2) <span class="Apple-style-span" style="font-size: small;"><font class="Apple-style-span" face="monospace">test</font></span> 2
+execCommand('FontSize', 3) <span><font class="Apple-style-span" face="monospace">test</font></span> 3
+execCommand('FontSize', 4) <span class="Apple-style-span" style="font-size: large;"><font class="Apple-style-span" face="monospace">test</font></span> 4
+execCommand('FontSize', 5) <span class="Apple-style-span" style="font-size: x-large;"><font class="Apple-style-span" face="monospace">test</font></span> 5
+execCommand('FontSize', 6) <span class="Apple-style-span" style="font-size: xx-large;"><font class="Apple-style-span" face="monospace">test</font></span> 6
+execCommand('FontSize', 7) <span class="Apple-style-span" style="font-size: -webkit-xxx-large;"><font class="Apple-style-span" face="monospace">test</font></span> 7
diff --git a/LayoutTests/editing/execCommand/query-font-size.html b/LayoutTests/editing/execCommand/query-font-size.html
index 38d0df9..e902299 100644
--- a/LayoutTests/editing/execCommand/query-font-size.html
+++ b/LayoutTests/editing/execCommand/query-font-size.html
@@ -59,10 +59,8 @@ function reportSizeForSpan(span, comment)
var tableRow = addRow(table);
addCellWithTextContents(tableRow, comment);
addCellWithTextContents(tableRow, span.parentNode.innerHTML); // sill FF has no outerHTML
-
window.getSelection().selectAllChildren(span.parentNode);
addCellWithTextContents(tableRow, "" + document.queryCommandValue("FontSize"));
- addCellWithTextContents(tableRow, "" + window.getComputedStyle(span, null).fontSize);
}
function testExecCommandFontSize(size, fontFamily)
@@ -98,7 +96,6 @@ var tableRow = addRow(table);
addHeaderWithTextContents(tableRow, "test");
addHeaderWithTextContents(tableRow, "html");
addHeaderWithTextContents(tableRow, "queryCommandValue result");
-addHeaderWithTextContents(tableRow, "getComputedStyle result");
for (var size = -2; size < 8; size++) {
testExecCommandFontSize(size);
@@ -115,7 +112,7 @@ testManualFontSize("5em");
testManualFontSize("10px");
tableRow = addRow(table);
-addHeaderWithTextContents(tableRow, "monospace tests to show bug 19161");
+addHeaderWithTextContents(tableRow, "monospace tests to ensure the bug 19161 does not affect queryCommandValue's values");
for (var size = -2; size < 8; size++) {
testExecCommandFontSize(size, 'monospace');
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list