Changeset 62460 in webkit


Ignore:
Timestamp:
Jul 3, 2010 10:09:51 PM (14 years ago)
Author:
abarth@webkit.org
Message:

2010-07-03 Adam Barth <​abarth@webkit.org>

Reviewed by Maciej Stachowiak.

Implement AfterAfterFramesetMode
​https://bugs.webkit.org/show_bug.cgi?id=41561

Test coverage of this mode was a bit ... lacking, shall we say? This
patch adds a test for it.

  • html5lib/resources/webkit01.dat:
  • html5lib/runner-expected-html5.txt:
  • html5lib/runner-expected.txt:
  • html5lib/webkit-resumer-expected.txt:

2010-07-03 Adam Barth <​abarth@webkit.org>

Reviewed by Maciej Stachowiak.

Implement AfterAfterFramesetMode
​https://bugs.webkit.org/show_bug.cgi?id=41561

This mode is almost unobservable. The main way to observe it seems to
be seeing where comment nodes get attached to the DOM.

  • html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::processStartTag): (WebCore::HTMLTreeBuilder::processEndTag): (WebCore::HTMLTreeBuilder::processComment): (WebCore::HTMLTreeBuilder::processCharacter): (WebCore::HTMLTreeBuilder::processEndOfFile):
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r62458 r62460  
     12010-07-03  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Maciej Stachowiak.
     4
     5        Implement AfterAfterFramesetMode
     6        https://bugs.webkit.org/show_bug.cgi?id=41561
     7
     8        Test coverage of this mode was a bit ... lacking, shall we say?  This
     9        patch adds a test for it.
     10
     11        * html5lib/resources/webkit01.dat:
     12        * html5lib/runner-expected-html5.txt:
     13        * html5lib/runner-expected.txt:
     14        * html5lib/webkit-resumer-expected.txt:
     15
    1162010-07-03  Zhenyao Mo  <zmo@google.com>
    217

  • trunk/LayoutTests/html5lib/resources/webkit01.dat

    r62436 r62460  
    334334|       <rt>
    335335|         "xx"
     336
     337#data
     338<html><frameset><!--1--><noframes>A</noframes><!--2--></frameset><!--3--><noframes>B</noframes><!--4--></html><!--5--><noframes>C</noframes><!--6-->
     339#errors
     340#document
     341| <html>
     342|   <head>
     343|   <frameset>
     344|     <!-- 1 -->
     345|     <noframes>
     346|       "A"
     347|     <!-- 2 -->
     348|   <!-- 3 -->
     349|   <noframes>
     350|     "B"
     351|   <!-- 4 -->
     352|   <noframes>
     353|     "C"
     354| <!-- 5 -->
     355| <!-- 6 -->

  • trunk/LayoutTests/html5lib/runner-expected-html5.txt

    r62440 r62460  
    5438543817
    54395439
    5440 Test 17 of 29 in resources/webkit01.dat failed. Input:
     5440Test 17 of 30 in resources/webkit01.dat failed. Input:
    54415441<A>test< /A>
    54425442Got:

  • trunk/LayoutTests/html5lib/runner-expected.txt

    r62436 r62460  
    4695469528
    4696469629
    4697 
    4698 Test 17 of 29 in resources/webkit01.dat failed. Input:
     469730
     4698
     4699Test 17 of 30 in resources/webkit01.dat failed. Input:
    46994700<A>test< /A>
    47004701Got:
    … …  
    47124713|       "test< /A>"
    47134714
    4714 Test 20 of 29 in resources/webkit01.dat failed. Input:
     4715Test 20 of 30 in resources/webkit01.dat failed. Input:
    47154716<body></br foo="bar"></body>
    47164717Got:
    … …  
    47264727|     <br>
    47274728
    4728 Test 22 of 29 in resources/webkit01.dat failed. Input:
     4729Test 22 of 30 in resources/webkit01.dat failed. Input:
    47294730<body></body></br foo="bar">
    47304731Got:
    … …  
    47404741|     <br>
    47414742
    4742 Test 24 of 29 in resources/webkit01.dat failed. Input:
     4743Test 24 of 30 in resources/webkit01.dat failed. Input:
    47434744<html><body></body></html><!-- Hi there -->
    47444745Got:
    … …  
    47534754| <!--  Hi there  -->
    47544755
    4755 Test 26 of 29 in resources/webkit01.dat failed. Input:
     4756Test 26 of 30 in resources/webkit01.dat failed. Input:
    47564757<html><body></body></html>x<!-- Hi there --></html><!-- Again -->
    47574758Got:
    … …  
    47704771| <!--  Again  -->
    47714772
    4772 Test 27 of 29 in resources/webkit01.dat failed. Input:
     4773Test 27 of 30 in resources/webkit01.dat failed. Input:
    47734774<html><body></body></html>x<!-- Hi there --></body></html><!-- Again -->
    47744775Got:
    … …  
    47874788| <!--  Again  -->
    47884789
    4789 Test 28 of 29 in resources/webkit01.dat failed. Input:
     4790Test 28 of 30 in resources/webkit01.dat failed. Input:
    47904791<html><body><ruby><div><rp>xx</rp></div></ruby></body></html>
    47914792Got:
    … …  
    48064807|         "xx"
    48074808
    4808 Test 29 of 29 in resources/webkit01.dat failed. Input:
     4809Test 29 of 30 in resources/webkit01.dat failed. Input:
    48094810<html><body><ruby><div><rt>xx</rt></div></ruby></body></html>
    48104811Got:
    … …  
    48244825|       <rt>
    48254826|         "xx"
     4827
     4828Test 30 of 30 in resources/webkit01.dat failed. Input:
     4829<html><frameset><!--1--><noframes>A</noframes><!--2--></frameset><!--3--><noframes>B</noframes><!--4--></html><!--5--><noframes>C</noframes><!--6-->
     4830Got:
     4831| <html>
     4832|   <frameset>
     4833|     <!-- 1 -->
     4834|     <!-- 2 -->
     4835|   <!-- 3 -->
     4836|   <noframes>
     4837|   <!-- 4 -->
     4838|   <!-- 5 -->
     4839|   <noframes>
     4840|   <!-- 6 -->
     4841Expected:
     4842| <html>
     4843|   <head>
     4844|   <frameset>
     4845|     <!-- 1 -->
     4846|     <noframes>
     4847|       "A"
     4848|     <!-- 2 -->
     4849|   <!-- 3 -->
     4850|   <noframes>
     4851|     "B"
     4852|   <!-- 4 -->
     4853|   <noframes>
     4854|     "C"
     4855| <!-- 5 -->
     4856| <!-- 6 -->
    48264857resources/doctype01.dat: PASS
    48274858

  • trunk/LayoutTests/html5lib/webkit-resumer-expected.txt

    r62436 r62460  
    5205201090.59
    5215211091.60
     5221092.1
     5231093.2
     5241094.3
     5251095.4
     5261096.5
     5271097.6
     5281098.7
     5291099.8
     5301100.9
     5311101.10
     5321102.11
     5331103.12
     5341104.13
     5351105.14
     5361106.15
     5371107.16
     5381108.17
     5391109.18
     5401110.19
     5411111.20
     5421112.21
     5431113.22
     5441114.23
     5451115.24
     5461116.25
     5471117.26
     5481118.27
     5491119.28
     5501120.29
     5511121.30
     5521122.31
     5531123.32
     5541124.33
     5551125.34
     5561126.35
     5571127.36
     5581128.37
     5591129.38
     5601130.39
     5611131.40
     5621132.41
     5631133.42
     5641134.43
     5651135.44
     5661136.45
     5671137.46
     5681138.47
     5691139.48
     5701140.49
     5711141.50
     5721142.51
     5731143.52
     5741144.53
     5751145.54
     5761146.55
     5771147.56
     5781148.57
     5791149.58
     5801150.59
     5811151.60
     5821152.61
     5831153.62
     5841154.63
     5851155.64
     5861156.65
     5871157.66
     5881158.67
     5891159.68
     5901160.69
     5911161.70
     5921162.71
     5931163.72
     5941164.73
     5951165.74
     5961166.75
     5971167.76
     5981168.77
     5991169.78
     6001170.79
     6011171.80
     6021172.81
     6031173.82
     6041174.83
     6051175.84
     6061176.85
     6071177.86
     6081178.87
     6091179.88
     6101180.89
     6111181.90
     6121182.91
     6131183.92
     6141184.93
     6151185.94
     6161186.95
     6171187.96
     6181188.97
     6191189.98
     6201190.99
     6211191.100
     6221192.101
     6231193.102
     6241194.103
     6251195.104
     6261196.105
     6271197.106
     6281198.107
     6291199.108
     6301200.109
     6311201.110
     6321202.111
     6331203.112
     6341204.113
     6351205.114
     6361206.115
     6371207.116
     6381208.117
     6391209.118
     6401210.119
     6411211.120
     6421212.121
     6431213.122
     6441214.123
     6451215.124
     6461216.125
     6471217.126
     6481218.127
     6491219.128
     6501220.129
     6511221.130
     6521222.131
     6531223.132
     6541224.133
     6551225.134
     6561226.135
     6571227.136
     6581228.137
     6591229.138
     6601230.139
     6611231.140
     6621232.141
     6631233.142
     6641234.143
     6651235.144
     6661236.145
     6671237.146
     6681238.147

  • trunk/WebCore/ChangeLog

    r62458 r62460  
     12010-07-03  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Maciej Stachowiak.
     4
     5        Implement AfterAfterFramesetMode
     6        https://bugs.webkit.org/show_bug.cgi?id=41561
     7
     8        This mode is almost unobservable.  The main way to observe it seems to
     9        be seeing where comment nodes get attached to the DOM.
     10
     11        * html/HTMLTreeBuilder.cpp:
     12        (WebCore::HTMLTreeBuilder::processStartTag):
     13        (WebCore::HTMLTreeBuilder::processEndTag):
     14        (WebCore::HTMLTreeBuilder::processComment):
     15        (WebCore::HTMLTreeBuilder::processCharacter):
     16        (WebCore::HTMLTreeBuilder::processEndOfFile):
     17
    1182010-07-03  Zhenyao Mo  <zmo@google.com>
    219

  • trunk/WebCore/html/HTMLTreeBuilder.cpp

    r62440 r62460  
    646646        break;
    647647    case AfterFramesetMode:
    648         ASSERT(insertionMode() == AfterFramesetMode);
     648    case AfterAfterFramesetMode:
     649        ASSERT(insertionMode() == AfterFramesetMode || insertionMode() == AfterAfterFramesetMode);
    649650        if (token.name() == htmlTag) {
    650651            insertHTMLStartTagInBody(token);
    … …  
    903904            return;
    904905        }
     906        // Fall through.
     907    case AfterAfterFramesetMode:
     908        ASSERT(insertionMode() == AfterFramesetMode || insertionMode() == AfterAfterFramesetMode);
    905909        parseError(token);
    906910        break;
    … …  
    912916void HTMLTreeBuilder::processComment(AtomicHTMLToken& token)
    913917{
    914     if (m_insertionMode == InitialMode || m_insertionMode == BeforeHTMLMode || m_insertionMode == AfterAfterBodyMode) {
     918    if (m_insertionMode == InitialMode || m_insertionMode == BeforeHTMLMode || m_insertionMode == AfterAfterBodyMode || m_insertionMode == AfterAfterFramesetMode) {
    915919        insertCommentOnDocument(token);
    916920        return;
    … …  
    975979    case InFramesetMode:
    976980    case AfterFramesetMode:
    977         ASSERT(insertionMode() == InFramesetMode || insertionMode() == AfterFramesetMode);
     981    case AfterAfterFramesetMode:
     982        ASSERT(insertionMode() == InFramesetMode || insertionMode() == AfterFramesetMode || insertionMode() == AfterAfterFramesetMode);
    978983        parseError(token);
    979984        break;
    … …  
    10261031        break;
    10271032    case AfterFramesetMode:
    1028         ASSERT(insertionMode() == AfterFramesetMode);
     1033    case AfterAfterFramesetMode:
     1034        ASSERT(insertionMode() == AfterFramesetMode || insertionMode() == AfterAfterFramesetMode);
    10291035        break;
    10301036    default:
Note: See TracChangeset for help on using the changeset viewer.