Changeset 67116 in webkit


Ignore:
Timestamp:
Sep 9, 2010 2:17:29 PM (14 years ago)
Author:
rniwa@webkit.org
Message:

2010-09-09 Ryosuke Niwa <rniwa@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:
Location:
trunk/LayoutTests
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r67113 r67116  
     12010-09-09  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by James Robinson.
     4
     5        REGRESSION (r67101): query-font-size.html fails on qt and gtk builds
     6        https://bugs.webkit.org/show_bug.cgi?id=45484
     7
     8        Removed the computed style's font size from the result.
     9
     10        This is fine because the expected result still contains queryCommandValue('fontSize')
     11        along with the markup on which queryCommandValue is called,
     12        which is sufficient to ensure the bug 21033 does not regress.
     13
     14        * editing/execCommand/query-font-size.html:
     15
    1162010-09-09  Brian Weinstein  <bweinstein@apple.com>
    217
  • trunk/LayoutTests/editing/execCommand/query-font-size-expected.txt

    r67102 r67116  
    1 test    html    queryCommandValue result        getComputedStyle result
    2 execCommand('FontSize', -2)     <span class="Apple-style-span" style="font-size: x-small;">test</span>  1       10px
    3 execCommand('FontSize', -1)     <span class="Apple-style-span" style="font-size: small;">test</span>    2       13px
    4 execCommand('FontSize', 0)      <span>test</span>       3       16px
    5 execCommand('FontSize', 1)      <span class="Apple-style-span" style="font-size: x-small;">test</span>  1       10px
    6 execCommand('FontSize', 2)      <span class="Apple-style-span" style="font-size: small;">test</span>    2       13px
    7 execCommand('FontSize', 3)      <span>test</span>       3       16px
    8 execCommand('FontSize', 4)      <span class="Apple-style-span" style="font-size: large;">test</span>    4       18px
    9 execCommand('FontSize', 5)      <span class="Apple-style-span" style="font-size: x-large;">test</span>  5       24px
    10 execCommand('FontSize', 6)      <span class="Apple-style-span" style="font-size: xx-large;">test</span> 6       32px
    11 execCommand('FontSize', 7)      <span class="Apple-style-span" style="font-size: -webkit-xxx-large;">test</span>        7       48px
    12 execCommand('FontSize', '8px')  <span class="Apple-style-span" style="font-size: -webkit-xxx-large;">test</span>        7       48px
    13 execCommand('FontSize', '2px')  <span class="Apple-style-span" style="font-size: small;">test</span>    2       13px
    14 manual CSS font-size: 3px       <span style="font-size: 3px">test</span>        1       3px
    15 manual CSS font-size: 0.2em     <span style="font-size: 0.2em">test</span>      1       9px
    16 manual CSS font-size: 17px      <span style="font-size: 17px">test</span>       4       17px
    17 manual CSS font-size: 31px      <span style="font-size: 31px">test</span>       6       31px
    18 manual CSS font-size: 50px      <span style="font-size: 50px">test</span>       7       50px
    19 manual CSS font-size: 5em       <span style="font-size: 5em">test</span>        7       80px
    20 manual CSS font-size: 10px      <span style="font-size: 10px">test</span>       1       10px
    21 monospace tests to show bug 19161
    22 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
    23 execCommand('FontSize', -1)     <span class="Apple-style-span" style="font-size: small;"><font class="Apple-style-span" face="monospace">test</font></span>     2       13px
    24 execCommand('FontSize', 0)      <span><font class="Apple-style-span" face="monospace">test</font></span>        3       16px
    25 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
    26 execCommand('FontSize', 2)      <span class="Apple-style-span" style="font-size: small;"><font class="Apple-style-span" face="monospace">test</font></span>     2       13px
    27 execCommand('FontSize', 3)      <span><font class="Apple-style-span" face="monospace">test</font></span>        3       16px
    28 execCommand('FontSize', 4)      <span class="Apple-style-span" style="font-size: large;"><font class="Apple-style-span" face="monospace">test</font></span>     4       18px
    29 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
    30 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
    31 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
     1test    html    queryCommandValue result
     2execCommand('FontSize', -2)     <span class="Apple-style-span" style="font-size: x-small;">test</span>  1
     3execCommand('FontSize', -1)     <span class="Apple-style-span" style="font-size: small;">test</span>    2
     4execCommand('FontSize', 0)      <span>test</span>       3
     5execCommand('FontSize', 1)      <span class="Apple-style-span" style="font-size: x-small;">test</span>  1
     6execCommand('FontSize', 2)      <span class="Apple-style-span" style="font-size: small;">test</span>    2
     7execCommand('FontSize', 3)      <span>test</span>       3
     8execCommand('FontSize', 4)      <span class="Apple-style-span" style="font-size: large;">test</span>    4
     9execCommand('FontSize', 5)      <span class="Apple-style-span" style="font-size: x-large;">test</span>  5
     10execCommand('FontSize', 6)      <span class="Apple-style-span" style="font-size: xx-large;">test</span> 6
     11execCommand('FontSize', 7)      <span class="Apple-style-span" style="font-size: -webkit-xxx-large;">test</span>        7
     12execCommand('FontSize', '8px')  <span class="Apple-style-span" style="font-size: -webkit-xxx-large;">test</span>        7
     13execCommand('FontSize', '2px')  <span class="Apple-style-span" style="font-size: small;">test</span>    2
     14manual CSS font-size: 3px       <span style="font-size: 3px">test</span>        1
     15manual CSS font-size: 0.2em     <span style="font-size: 0.2em">test</span>      1
     16manual CSS font-size: 17px      <span style="font-size: 17px">test</span>       4
     17manual CSS font-size: 31px      <span style="font-size: 31px">test</span>       6
     18manual CSS font-size: 50px      <span style="font-size: 50px">test</span>       7
     19manual CSS font-size: 5em       <span style="font-size: 5em">test</span>        7
     20manual CSS font-size: 10px      <span style="font-size: 10px">test</span>       1
     21monospace tests to ensure the bug 19161 does not affect queryCommandValue's values
     22execCommand('FontSize', -2)     <span class="Apple-style-span" style="font-size: x-small;"><font class="Apple-style-span" face="monospace">test</font></span>   1
     23execCommand('FontSize', -1)     <span class="Apple-style-span" style="font-size: small;"><font class="Apple-style-span" face="monospace">test</font></span>     2
     24execCommand('FontSize', 0)      <span><font class="Apple-style-span" face="monospace">test</font></span>        3
     25execCommand('FontSize', 1)      <span class="Apple-style-span" style="font-size: x-small;"><font class="Apple-style-span" face="monospace">test</font></span>   1
     26execCommand('FontSize', 2)      <span class="Apple-style-span" style="font-size: small;"><font class="Apple-style-span" face="monospace">test</font></span>     2
     27execCommand('FontSize', 3)      <span><font class="Apple-style-span" face="monospace">test</font></span>        3
     28execCommand('FontSize', 4)      <span class="Apple-style-span" style="font-size: large;"><font class="Apple-style-span" face="monospace">test</font></span>     4
     29execCommand('FontSize', 5)      <span class="Apple-style-span" style="font-size: x-large;"><font class="Apple-style-span" face="monospace">test</font></span>   5
     30execCommand('FontSize', 6)      <span class="Apple-style-span" style="font-size: xx-large;"><font class="Apple-style-span" face="monospace">test</font></span>  6
     31execCommand('FontSize', 7)      <span class="Apple-style-span" style="font-size: -webkit-xxx-large;"><font class="Apple-style-span" face="monospace">test</font></span> 7
  • trunk/LayoutTests/editing/execCommand/query-font-size.html

    r67102 r67116  
    6060    addCellWithTextContents(tableRow, comment);
    6161    addCellWithTextContents(tableRow, span.parentNode.innerHTML); // sill FF has no outerHTML
    62    
    6362    window.getSelection().selectAllChildren(span.parentNode);
    6463    addCellWithTextContents(tableRow, "" + document.queryCommandValue("FontSize"));
    65     addCellWithTextContents(tableRow, "" + window.getComputedStyle(span, null).fontSize);
    6664}
    6765
     
    9997addHeaderWithTextContents(tableRow, "html");
    10098addHeaderWithTextContents(tableRow, "queryCommandValue result");
    101 addHeaderWithTextContents(tableRow, "getComputedStyle result");
    10299
    103100for (var size = -2; size < 8; size++) {
     
    116113
    117114tableRow = addRow(table);
    118 addHeaderWithTextContents(tableRow, "monospace tests to show bug 19161");
     115addHeaderWithTextContents(tableRow, "monospace tests to ensure the bug 19161 does not affect queryCommandValue's values");
    119116
    120117for (var size = -2; size < 8; size++) {
Note: See TracChangeset for help on using the changeset viewer.