Changeset 30431 in webkit


Ignore:
Timestamp:
Feb 20, 2008 2:47:57 PM (16 years ago)
Author:
hyatt@apple.com
Message:

Fix for bug 12751, doctype nodes aren't part of the Document (Acid3).

Reviewed by Sam Weinig

Many tests added in fast/doctypes.

  • dom/DOMImplementation.cpp: (WebCore::DOMImplementation::createDocument): (WebCore::DOMImplementation::createHTMLDocument):
  • dom/Document.cpp: (WebCore::Document::Document): (WebCore::Document::setDocType): (WebCore::Document::attach): (WebCore::Document::getImageMap):
  • dom/Document.h: (WebCore::Document::doctype): (WebCore::Document::): (WebCore::Document::determineParseMode): (WebCore::Document::setParseMode): (WebCore::Document::parseMode): (WebCore::Document::inCompatMode): (WebCore::Document::inAlmostStrictMode): (WebCore::Document::inStrictMode):
  • dom/DocumentType.cpp: (WebCore::DocumentType::cloneNode): (WebCore::DocumentType::insertedIntoDocument): (WebCore::DocumentType::removedFromDocument):
  • dom/DocumentType.h:
  • dom/Node.cpp: (WebCore::Node::childAllowed):
  • dom/StyledElement.cpp: (WebCore::StyledElement::attributeChanged):
  • dom/XMLTokenizer.cpp: (WebCore::XMLTokenizer::internalSubset): (WebCore::):
  • editing/markup.cpp: (WebCore::appendStartMarkup):
  • html/HTMLAppletElement.cpp: (WebCore::HTMLAppletElement::createRenderer):
  • html/HTMLDocument.cpp: (WebCore::HTMLDocument::HTMLDocument): (WebCore::HTMLDocument::childAllowed): (WebCore::HTMLDocument::determineParseMode):
  • html/HTMLDocument.h:
  • html/HTMLMapElement.cpp: (WebCore::HTMLMapElement::parseMappedAttribute):
  • html/HTMLParamElement.cpp: (WebCore::HTMLParamElement::parseMappedAttribute):
  • html/HTMLParser.cpp: (WebCore::HTMLParser::parseDoctypeToken):
  • html/HTMLParser.h:
  • html/HTMLTokenizer.cpp: (WebCore::HTMLTokenizer::reset): (WebCore::HTMLTokenizer::parseDoctype): (WebCore::HTMLTokenizer::parseTag): (WebCore::HTMLTokenizer::write): (WebCore::HTMLTokenizer::finish): (WebCore::HTMLTokenizer::processDoctypeToken):
  • html/HTMLTokenizer.h: (WebCore::): (WebCore::DoctypeToken::DoctypeToken): (WebCore::DoctypeToken::reset): (WebCore::DoctypeToken::state): (WebCore::DoctypeToken::setState): (WebCore::HTMLTokenizer::State::inDoctype): (WebCore::HTMLTokenizer::State::setInDoctype): (WebCore::HTMLTokenizer::State::needsSpecialWriteHandling): (WebCore::HTMLTokenizer::State::):
  • html/HTMLViewSourceDocument.cpp: (WebCore::HTMLViewSourceDocument::addViewSourceToken): (WebCore::HTMLViewSourceDocument::addViewSourceDoctypeToken):
  • html/HTMLViewSourceDocument.h:
  • loader/FrameLoader.cpp: (WebCore::FrameLoader::write): (WebCore::FrameLoader::switchOutLowBandwidthDisplayIfReady):
  • page/Frame.cpp: (WebCore::Frame::documentTypeString):
  • page/inspector/utilities.js:
  • xml/XSLTProcessor.cpp: (WebCore::XSLTProcessor::createDocumentFromSource):
Location:
trunk
Files:
15 added
113 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/dom/xhtml/level3/core/documentgetdoctype01-expected.txt

    r12450 r30431  
    11Test    http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentgetdoctype01
    2 Status  error
    3 Message Error: NOT_FOUND_ERR: DOM Exception 8
     2Status  failure
     3Message newSysIdNull: assertNull failed, actual null
  • trunk/LayoutTests/dom/xhtml/level3/core/nodeappendchild01-expected.txt

    r21687 r30431  
    11Test    http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeappendchild01
    2 Status  failure
    3 Message throw_HIERARCHY_REQUEST_OR_NOT_SUPPORTED: fail
     2Status  Success
  • trunk/LayoutTests/dom/xhtml/level3/core/nodecomparedocumentposition02-expected.txt

    r12450 r30431  
    11Test    http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition02
    22Status  error
    3 Message Error: NOT_FOUND_ERR: DOM Exception 8
     3Message TypeError: Value undefined (result of expression doc.compareDocumentPosition) is not object.
  • trunk/LayoutTests/dom/xhtml/level3/core/nodeinsertbefore02-expected.txt

    r12450 r30431  
    11Test    http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeinsertbefore02
    2 Status  error
    3 Message Error: NOT_FOUND_ERR: DOM Exception 8
     2Status  Success
  • trunk/LayoutTests/dom/xhtml/level3/core/nodeinsertbefore05-expected.txt

    r12450 r30431  
    11Test    http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeinsertbefore05
    2 Status  error
    3 Message Error: NOT_FOUND_ERR: DOM Exception 8
     2Status  Success
  • trunk/LayoutTests/dom/xhtml/level3/core/nodeisequalnode01-expected.txt

    r11962 r30431  
    11Test    http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode01
    2 Status  Success
     2Status  failure
     3Message nodeisequalnode01: assertTrue failed
  • trunk/LayoutTests/dom/xhtml/level3/core/noderemovechild04-expected.txt

    r12450 r30431  
    11Test    http://www.w3.org/2001/DOM-Test-Suite/level3/core/noderemovechild04
    2 Status  error
    3 Message Error: NOT_FOUND_ERR: DOM Exception 8
     2Status  Success
  • trunk/LayoutTests/dom/xhtml/level3/core/noderemovechild05-expected.txt

    r21687 r30431  
    11Test    http://www.w3.org/2001/DOM-Test-Suite/level3/core/noderemovechild05
    2 Status  error
    3 Message Error: NOT_FOUND_ERR: DOM Exception 8
     2Status  Success
  • trunk/LayoutTests/dom/xhtml/level3/core/nodereplacechild13-expected.txt

    r12450 r30431  
    11Test    http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodereplacechild13
    2 Status  error
    3 Message Error: NOT_FOUND_ERR: DOM Exception 8
     2Status  Success
  • trunk/LayoutTests/dom/xhtml/level3/core/nodereplacechild40-expected.txt

    r21687 r30431  
    11Test    http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodereplacechild40
    2 Status  failure
    3 Message throw_HIERARCHY_REQUEST_OR_NOT_SUPPORTED: fail
     2Status  Success
  • trunk/LayoutTests/fast/js/date-DST-time-cusps-expected.txt

    r20203 r30431  
    66PASS (new Date(1982, 2, 14, 2, 10)).getHours() is 1
    77PASS (new Date(1982, 2, 14, 2)).getHours() is 1
    8 PASS (new Date(1982, 11, 7, 1, 10)).getTimezoneOffset() is 480
    9 PASS (new Date(1982, 11, 7, 1)).getTimezoneOffset() is 480
     8FAIL (new Date(1982, 11, 7, 1, 10)).getTimezoneOffset() should be 480. Was 360.
     9FAIL (new Date(1982, 11, 7, 1)).getTimezoneOffset() should be 480. Was 360.
    1010PASS successfullyParsed is true
    1111
  • trunk/LayoutTests/platform/mac-leopard/svg/W3C-SVG-1.1/text-tselect-02-f-expected.txt

    r30063 r30431  
    3737        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.2 $"
    3838    RenderPath {rect} at (0.50,0.50) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    39 selection start: position 3 of child 0 {#text} of child 3 {text} of child 3 {g} of child 35 {g} of child 0 {svg} of document
    40 selection end:   position 12 of child 0 {#text} of child 3 {text} of child 3 {g} of child 35 {g} of child 0 {svg} of document
     39selection start: position 3 of child 0 {#text} of child 3 {text} of child 3 {g} of child 35 {g} of child 1 {svg} of document
     40selection end:   position 12 of child 0 {#text} of child 3 {text} of child 3 {g} of child 35 {g} of child 1 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/custom/foreignObject-crash-on-hover-expected.txt

    r30063 r30431  
    1212        RenderSVGInlineText {#text} at (0,18) size 246x36
    1313      RenderPath {path} at (99.19,129.50) size 201.62x201.62 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#FF0000]}] [data="M50.00,80.00L250.00,80.00L150.00,280.00"]
    14 caret: position 7 of child 3 {#text} of child 5 {foreignObject} of child 1 {g} of child 0 {svg} of document
     14caret: position 7 of child 3 {#text} of child 5 {foreignObject} of child 1 {g} of child 1 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/custom/text-dom-01-f-expected.txt

    r30063 r30431  
    5959        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.1 $"
    6060    RenderPath {rect} at (0.50,0.50) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    61 selection start: position 11 of child 2 {#text} of child 7 {text} of child 3 {g} of child 35 {g} of child 0 {svg} of document
    62 selection end:   position 14 of child 2 {#text} of child 7 {text} of child 3 {g} of child 35 {g} of child 0 {svg} of document
     61selection start: position 11 of child 2 {#text} of child 7 {text} of child 3 {g} of child 35 {g} of child 1 {svg} of document
     62selection end:   position 14 of child 2 {#text} of child 7 {text} of child 3 {g} of child 35 {g} of child 1 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/custom/text-hit-test-expected.txt

    r30063 r30431  
    1313        RenderSVGInlineText {#text} at (0,-14) size 43x18
    1414          chunk 1 text run 1 at (90.00,130.00) startOffset 0 endOffset 6 width 43.00: "Passed"
    15 caret: position 0 of child 0 {#text} of child 1 {text} of child 3 {g} of child 0 {svg} of document
     15caret: position 0 of child 0 {#text} of child 1 {text} of child 3 {g} of child 1 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-align-01-b-expected.txt

    r30063 r30431  
    3636        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.5 $"
    3737    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    38 selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 26 {svg} of document
    39 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 26 {svg} of document
     38selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 27 {svg} of document
     39selection end:   position 16 of child 0 {#text} of child 15 {text} of child 27 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-align-02-b-expected.txt

    r30063 r30431  
    4242        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.5 $"
    4343    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    44 selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 26 {svg} of document
    45 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 26 {svg} of document
     44selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 27 {svg} of document
     45selection end:   position 16 of child 0 {#text} of child 15 {text} of child 27 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-align-03-b-expected.txt

    r30063 r30431  
    2222        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.5 $"
    2323    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    24 selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 27 {svg} of document
    25 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 27 {svg} of document
     24selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 28 {svg} of document
     25selection end:   position 16 of child 0 {#text} of child 15 {text} of child 28 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-align-04-b-expected.txt

    r30063 r30431  
    4343        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.5 $"
    4444    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    45 selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 27 {svg} of document
    46 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 27 {svg} of document
     45selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 28 {svg} of document
     46selection end:   position 16 of child 0 {#text} of child 15 {text} of child 28 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-align-05-b-expected.txt

    r30063 r30431  
    2828        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.5 $"
    2929    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    30 selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 26 {svg} of document
    31 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 26 {svg} of document
     30selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 27 {svg} of document
     31selection end:   position 16 of child 0 {#text} of child 15 {text} of child 27 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-align-06-b-expected.txt

    r30063 r30431  
    5151        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.5 $"
    5252    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    53 selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 26 {svg} of document
    54 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 26 {svg} of document
     53selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 27 {svg} of document
     54selection end:   position 16 of child 0 {#text} of child 15 {text} of child 27 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-altglyph-01-b-expected.txt

    r30063 r30431  
    2323        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.5 $"
    2424    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    25 selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 31 {svg} of document
    26 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 31 {svg} of document
     25selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 32 {svg} of document
     26selection end:   position 16 of child 0 {#text} of child 15 {text} of child 32 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-deco-01-b-expected.txt

    r30063 r30431  
    4646        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.9 $"
    4747    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    48 selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 13 {svg} of document
    49 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 13 {svg} of document
     48selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 14 {svg} of document
     49selection end:   position 16 of child 0 {#text} of child 15 {text} of child 14 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-fonts-01-t-expected.txt

    r30063 r30431  
    3131        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.5 $"
    3232    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    33 selection start: position 0 of child 0 {#text} of child 1 {text} of child 1 {g} of child 13 {g} of child 33 {svg} of document
    34 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 33 {svg} of document
     33selection start: position 0 of child 0 {#text} of child 1 {text} of child 1 {g} of child 13 {g} of child 34 {svg} of document
     34selection end:   position 16 of child 0 {#text} of child 15 {text} of child 34 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-fonts-02-t-expected.txt

    r30063 r30431  
    4949        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.7 $"
    5050    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    51 selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 16 {svg} of document
    52 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 16 {svg} of document
     51selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 17 {svg} of document
     52selection end:   position 16 of child 0 {#text} of child 15 {text} of child 17 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-path-01-b-expected.txt

    r26572 r30431  
    5959        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.9 $"
    6060    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    61 selection start: position 0 of child 0 {#text} of child 1 {textPath} of child 3 {text} of child 3 {g} of child 13 {g} of child 29 {svg} of document
    62 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 29 {svg} of document
     61selection start: position 0 of child 0 {#text} of child 1 {textPath} of child 3 {text} of child 3 {g} of child 13 {g} of child 30 {svg} of document
     62selection end:   position 16 of child 0 {#text} of child 15 {text} of child 30 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-spacing-01-b-expected.txt

    r30063 r30431  
    2727        chunk 1 text run 1 at (5.00,57.00) startOffset 0 endOffset 16 width 42.00: "$Revision: 1.6 $"
    2828    RenderPath {rect} at (5,5) size 790x590 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L79.00,1.00L79.00,59.00L1.00,59.00"]
    29 selection start: position 1 of child 0 {#text} of child 1 {text} of child 1 {g} of child 13 {g} of child 18 {svg} of document
    30 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 18 {svg} of document
     29selection start: position 1 of child 0 {#text} of child 1 {text} of child 1 {g} of child 13 {g} of child 19 {svg} of document
     30selection end:   position 16 of child 0 {#text} of child 15 {text} of child 19 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-text-01-b-expected.txt

    r30063 r30431  
    126126        chunk 1 text run 1 at (5.00,117.00) startOffset 0 endOffset 16 width 52.00: "$Revision: 1.7 $"
    127127    RenderPath {rect} at (2.50,2.50) size 795x595 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L159.00,1.00L159.00,119.00L1.00,119.00"]
    128 selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 25 {svg} of document
    129 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 25 {svg} of document
     128selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 26 {svg} of document
     129selection end:   position 16 of child 0 {#text} of child 15 {text} of child 26 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-text-03-b-expected.txt

    r30063 r30431  
    3838        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.8 $"
    3939    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    40 selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 31 {svg} of document
    41 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 31 {svg} of document
     40selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 32 {svg} of document
     41selection end:   position 16 of child 0 {#text} of child 15 {text} of child 32 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-text-04-t-expected.txt

    r30063 r30431  
    292292        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 17 width 284.00: "$Revision: 1.13 $"
    293293    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    294 selection start: position 0 of child 0 {#text} of child 1 {text} of child 1 {g} of child 15 {g} of child 14 {svg} of document
    295 selection end:   position 17 of child 0 {#text} of child 17 {text} of child 14 {svg} of document
     294selection start: position 0 of child 0 {#text} of child 1 {text} of child 1 {g} of child 15 {g} of child 15 {svg} of document
     295selection end:   position 17 of child 0 {#text} of child 17 {text} of child 15 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-text-05-t-expected.txt

    r30063 r30431  
    558558        chunk 1 text run 1 at (10.00,350.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.8 $"
    559559    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    560 selection start: position 0 of child 0 {#text} of child 1 {text} of child 5 {g} of child 13 {g} of child 8 {svg} of document
    561 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 8 {svg} of document
     560selection start: position 0 of child 0 {#text} of child 1 {text} of child 5 {g} of child 13 {g} of child 9 {svg} of document
     561selection end:   position 16 of child 0 {#text} of child 15 {text} of child 9 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-text-06-t-expected.txt

    r30063 r30431  
    136136        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.9 $"
    137137    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    138 selection start: position 0 of child 0 {#text} of child 1 {text} of child 1 {g} of child 5 {g} of child 3 {g} of child 11 {svg} of document
    139 selection end:   position 16 of child 0 {#text} of child 5 {text} of child 11 {svg} of document
     138selection start: position 0 of child 0 {#text} of child 1 {text} of child 1 {g} of child 5 {g} of child 3 {g} of child 12 {svg} of document
     139selection end:   position 16 of child 0 {#text} of child 5 {text} of child 12 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-text-07-t-expected.txt

    r30063 r30431  
    3535        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.8 $"
    3636    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    37 selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 8 {svg} of document
    38 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 8 {svg} of document
     37selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 9 {svg} of document
     38selection end:   position 16 of child 0 {#text} of child 15 {text} of child 9 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-text-08-b-expected.txt

    r30063 r30431  
    2020        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.3 $"
    2121    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    22 selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 13 {svg} of document
    23 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 13 {svg} of document
     22selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 14 {svg} of document
     23selection end:   position 16 of child 0 {#text} of child 15 {text} of child 14 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-tref-01-b-expected.txt

    r30063 r30431  
    1818        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.6 $"
    1919    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    20 selection start: position 0 of child 0 {#text} of child 3 {text} of child 13 {g} of child 29 {svg} of document
    21 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 29 {svg} of document
     20selection start: position 0 of child 0 {#text} of child 3 {text} of child 13 {g} of child 30 {svg} of document
     21selection end:   position 16 of child 0 {#text} of child 15 {text} of child 30 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-tselect-01-b-expected.txt

    r30063 r30431  
    4444          chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.8 $"
    4545      RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    46 selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 24 {svg} of document
    47 selection end:   position 16 of child 0 {#text} of child 5 {text} of child 13 {g} of child 24 {svg} of document
     46selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 25 {svg} of document
     47selection end:   position 16 of child 0 {#text} of child 5 {text} of child 13 {g} of child 25 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-tselect-02-f-expected.txt

    r30063 r30431  
    3737        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.2 $"
    3838    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    39 selection start: position 3 of child 0 {#text} of child 3 {text} of child 3 {g} of child 35 {g} of child 0 {svg} of document
    40 selection end:   position 12 of child 0 {#text} of child 3 {text} of child 3 {g} of child 35 {g} of child 0 {svg} of document
     39selection start: position 3 of child 0 {#text} of child 3 {text} of child 3 {g} of child 35 {g} of child 1 {svg} of document
     40selection end:   position 12 of child 0 {#text} of child 3 {text} of child 3 {g} of child 35 {g} of child 1 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-tspan-01-b-expected.txt

    r30063 r30431  
    8181        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.7 $"
    8282    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    83 selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 34 {svg} of document
    84 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 34 {svg} of document
     83selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 35 {svg} of document
     84selection end:   position 16 of child 0 {#text} of child 15 {text} of child 35 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-ws-01-t-expected.txt

    r30063 r30431  
    3434        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.7 $"
    3535    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    36 selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 28 {svg} of document
    37 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 28 {svg} of document
     36selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 29 {svg} of document
     37selection end:   position 16 of child 0 {#text} of child 15 {text} of child 29 {svg} of document
  • trunk/LayoutTests/platform/mac-leopard/svg/text/text-ws-02-t-expected.txt

    r30063 r30431  
    3434        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.8 $"
    3535    RenderPath {rect} at (0.83,0.83) size 798.33x598.33 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
    36 selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 28 {svg} of document
    37 selection end:   position 16 of child 0 {#text} of child 15 {text} of child 28 {svg} of document
     36selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 29 {svg} of document
     37selection end:   position 16 of child 0 {#text} of child 15 {text} of child 29 {svg} of document
  • trunk/LayoutTests/platform/mac/editing/pasteboard/4631972-expected.txt

    r25970 r30431  
    2424            layer at (0,0) size 100x50
    2525              RenderView at (0,0) size 100x50
    26             layer at (0,0) size 100x8
    27               RenderBlock {HTML} at (0,0) size 100x8
    28                 RenderBody {BODY} at (8,8) size 84x0
     26            layer at (0,0) size 100x50
     27              RenderBlock {HTML} at (0,0) size 100x50
     28                RenderBody {BODY} at (8,8) size 84x34
    2929caret: position 1 of child 1 {IFRAME} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
  • trunk/LayoutTests/platform/mac/editing/pasteboard/paste-xml-expected.txt

    r25970 r30431  
    2828            text run at (114,14) width 40: " baz"
    2929        RenderText {#text} at (0,0) size 0x0
    30 caret: position 3 of child 1 {#text} of child 1 {span} of child 1 {div} of child 3 {body} of child 0 {html} of document
     30caret: position 3 of child 1 {#text} of child 1 {span} of child 1 {div} of child 3 {body} of child 1 {html} of document
  • trunk/LayoutTests/platform/mac/fast/css-generated-content/hover-style-change-expected.txt

    r25970 r30431  
    3535          text run at (0,18) width 70: "every time "
    3636          text run at (70,18) width 85: "like it should."
    37 caret: position 3 of child 0 {#text} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
     37caret: position 3 of child 0 {#text} of child 1 {DIV} of child 1 {BODY} of child 1 {HTML} of document
  • trunk/LayoutTests/platform/mac/fast/css-generated-content/positioned-background-hit-test-crash-expected.txt

    r25970 r30431  
    1111  RenderBlock (positioned) at (0,0) size 202x202 [border: (1px solid #FF0000)]
    1212    RenderText at (0,0) size 0x0
    13 caret: position 0 of child 0 {#text} of child 1 {H1} of child 1 {BODY} of child 0 {HTML} of document
     13caret: position 0 of child 0 {#text} of child 1 {H1} of child 1 {BODY} of child 1 {HTML} of document
  • trunk/LayoutTests/platform/mac/fast/doctypes/003-expected.txt

    r25970 r30431  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x176
    4   RenderBlock {HTML} at (0,0) size 800x176
    5     RenderBody {BODY} at (8,8) size 784x152
     3layer at (0,0) size 800x600
     4  RenderBlock {HTML} at (0,0) size 800x600
     5    RenderBody {BODY} at (8,8) size 784x576
    66      RenderBlock {DIV} at (0,0) size 784x100
    77      RenderBlock (anonymous) at (0,100) size 784x18
     
    99          text run at (0,0) width 309: "This file has a doc type with no public identifier. "
    1010          text run at (309,0) width 180: "We should be in strict mode."
    11       RenderBlock {UL} at (0,134) size 784x18
    12         RenderListItem {LI} at (40,0) size 744x18
    13           RenderBlock {UL} at (0,0) size 744x18
     11      RenderBlock {UL} at (0,134) size 784x36
     12        RenderListItem {LI} at (40,0) size 744x36
     13          RenderBlock (anonymous) at (0,0) size 744x18
     14            RenderListMarker at (-17,0) size 7x18: bullet
     15          RenderBlock {UL} at (0,18) size 744x18
    1416            RenderListItem {LI} at (40,0) size 704x18
    15               RenderListMarker at (-57,0) size 7x18: bullet
    1617              RenderListMarker at (-17,0) size 7x18: white bullet
    1718              RenderText {#text} at (0,0) size 251x18
    1819                text run at (0,0) width 251: "Both bullets should be on the same line."
    19 layer at (8,8) size 80x80
    20   RenderBlock (positioned) {DIV} at (8,8) size 80x80 [bgcolor=#008000]
     20layer at (10,10) size 80x80
     21  RenderBlock (positioned) {DIV} at (10,10) size 80x80 [bgcolor=#008000]
  • trunk/LayoutTests/platform/mac/fast/dom/attr_dead_doc-expected.txt

    r25970 r30431  
    77        layer at (0,0) size 300x150
    88          RenderView at (0,0) size 300x150
    9         layer at (0,0) size 300x8
    10           RenderBlock {HTML} at (0,0) size 300x8
    11             RenderBody {BODY} at (8,8) size 284x0
     9        layer at (0,0) size 300x150
     10          RenderBlock {HTML} at (0,0) size 300x150
     11            RenderBody {BODY} at (8,8) size 284x134
    1212      RenderText {#text} at (0,0) size 0x0
    1313      RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/fast/dom/dom-parse-serialize-display-expected.txt

    r25970 r30431  
    5454        RenderBlock {PRE} at (27,32) size 756x60
    5555          RenderText {#text} at (0,0) size 576x60
    56             text run at (0,0) width 576: "<!DOCTYPE doc><?xml-stylesheet href=\"display.css\" type=\"text/css\"?><doc>"
     56            text run at (0,0) width 576: "<?xml-stylesheet href=\"display.css\" type=\"text/css\"?><!DOCTYPE doc><doc>"
    5757            text run at (576,0) width 0: " "
    5858            text run at (0,15) width 536: "  <foo xmlns=\"foobar\">One</foo> <x:bar xmlns:x=\"barfoo\">Two</x:bar>"
  • trunk/LayoutTests/platform/mac/fast/dynamic/selection-highlight-adjust-expected.txt

    r25970 r30431  
    2828          text run at (309,52) width 4: " "
    2929        RenderBR {BR} at (313,52) size 0x18
    30 selection start: position 0 of child 0 {#text} of child 6 {SPAN} of child 5 {DIV} of child 1 {BODY} of child 0 {HTML} of document
    31 selection end:   position 51 of child 0 {#text} of child 6 {SPAN} of child 5 {DIV} of child 1 {BODY} of child 0 {HTML} of document
     30selection start: position 0 of child 0 {#text} of child 6 {SPAN} of child 5 {DIV} of child 1 {BODY} of child 1 {HTML} of document
     31selection end:   position 51 of child 0 {#text} of child 6 {SPAN} of child 5 {DIV} of child 1 {BODY} of child 1 {HTML} of document
  • trunk/LayoutTests/platform/mac/fast/flexbox/016-expected.txt

    r25970 r30431  
    1616          layer at (0,0) size 792x508
    1717            RenderView at (0,0) size 792x508
    18           layer at (0,0) size 792x8
    19             RenderBlock {HTML} at (0,0) size 792x8
    20               RenderBody {BODY} at (8,8) size 776x0
     18          layer at (0,0) size 792x508
     19            RenderBlock {HTML} at (0,0) size 792x508
     20              RenderBody {BODY} at (8,8) size 776x492
    2121        RenderBlock {DIV} at (0,582) size 800x18
    2222          RenderText {#text} at (0,0) size 664x18
  • trunk/LayoutTests/platform/mac/fast/forms/input-double-click-selection-gap-bug-expected.txt

    r25970 r30431  
    2828    RenderText {#text} at (1,0) size 39x13
    2929      text run at (1,0) width 39: "foo bar"
    30 selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 3 {TABLE} of child 1 {BODY} of child 0 {HTML} of document
    31 selection end:   position 7 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 3 {TABLE} of child 1 {BODY} of child 0 {HTML} of document
     30selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 3 {TABLE} of child 1 {BODY} of child 1 {HTML} of document
     31selection end:   position 7 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 3 {TABLE} of child 1 {BODY} of child 1 {HTML} of document
  • trunk/LayoutTests/platform/mac/fast/forms/tabbing-input-iframe-expected.txt

    r25970 r30431  
    1313        layer at (0,0) size 300x150
    1414          RenderView at (0,0) size 300x150
    15         layer at (0,0) size 300x8
    16           RenderBlock {HTML} at (0,0) size 300x8
    17             RenderBody {BODY} at (8,8) size 284x0
     15        layer at (0,0) size 300x150
     16          RenderBlock {HTML} at (0,0) size 300x150
     17            RenderBody {BODY} at (8,8) size 284x134
    1818      RenderText {#text} at (458,156) size 4x18
    1919        text run at (458,156) width 4: " "
  • trunk/LayoutTests/platform/mac/fast/frames/001-expected.txt

    r25970 r30431  
    1010        layer at (0,0) size 100x100
    1111          RenderView at (0,0) size 100x100
    12         layer at (0,0) size 100x8
    13           RenderBlock {HTML} at (0,0) size 100x8
    14             RenderBody {BODY} at (8,8) size 84x0
     12        layer at (0,0) size 100x100
     13          RenderBlock {HTML} at (0,0) size 100x100
     14            RenderBody {BODY} at (8,8) size 84x84
    1515      RenderText {#text} at (170,174) size 4x18
    1616        text run at (170,174) width 4: " "
     
    1818        layer at (0,0) size 100x100
    1919          RenderView at (0,0) size 100x100
    20         layer at (0,0) size 100x8
    21           RenderBlock {HTML} at (0,0) size 100x8
    22             RenderBody {BODY} at (8,8) size 84x0
     20        layer at (0,0) size 100x100
     21          RenderBlock {HTML} at (0,0) size 100x100
     22            RenderBody {BODY} at (8,8) size 84x84
    2323      RenderText {#text} at (344,174) size 4x18
    2424        text run at (344,174) width 4: " "
     
    2626        layer at (0,0) size 100x100
    2727          RenderView at (0,0) size 100x100
    28         layer at (0,0) size 100x8
    29           RenderBlock {HTML} at (0,0) size 100x8
    30             RenderBody {BODY} at (8,8) size 84x0
     28        layer at (0,0) size 100x100
     29          RenderBlock {HTML} at (0,0) size 100x100
     30            RenderBody {BODY} at (8,8) size 84x84
    3131      RenderText {#text} at (0,0) size 0x0
    3232      RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/fast/frames/002-expected.txt

    r25970 r30431  
    77        layer at (0,0) size 397x600
    88          RenderView at (0,0) size 397x600
    9         layer at (0,0) size 397x8
    10           RenderBlock {HTML} at (0,0) size 397x8
    11             RenderBody {BODY} at (8,8) size 381x0
     9        layer at (0,0) size 397x600
     10          RenderBlock {HTML} at (0,0) size 397x600
     11            RenderBody {BODY} at (8,8) size 381x584
    1212      RenderFrameSet {FRAMESET} at (403,0) size 397x600
    1313        RenderFrame {FRAME} at (0,0) size 397x297
    1414          layer at (0,0) size 397x297
    1515            RenderView at (0,0) size 397x297
    16           layer at (0,0) size 397x8
    17             RenderBlock {HTML} at (0,0) size 397x8
    18               RenderBody {BODY} at (8,8) size 381x0
     16          layer at (0,0) size 397x297
     17            RenderBlock {HTML} at (0,0) size 397x297
     18              RenderBody {BODY} at (8,8) size 381x281
    1919        RenderFrame {FRAME} at (0,303) size 397x297
    2020          layer at (0,0) size 397x297
    2121            RenderView at (0,0) size 397x297
    22           layer at (0,0) size 397x8
    23             RenderBlock {HTML} at (0,0) size 397x8
    24               RenderBody {BODY} at (8,8) size 381x0
     22          layer at (0,0) size 397x297
     23            RenderBlock {HTML} at (0,0) size 397x297
     24              RenderBody {BODY} at (8,8) size 381x281
  • trunk/LayoutTests/platform/mac/fast/frames/calculate-fixed-expected.txt

    r25970 r30431  
    99            layer at (0,0) size 36x500
    1010              RenderView at (0,0) size 36x500
    11             layer at (0,0) size 36x8
    12               RenderBlock {HTML} at (0,0) size 36x8
    13                 RenderBody {BODY} at (8,8) size 20x0
     11            layer at (0,0) size 36x500
     12              RenderBlock {HTML} at (0,0) size 36x500
     13                RenderBody {BODY} at (8,8) size 20x484
    1414        RenderFrameSet {FRAMESET} at (42,0) size 36x500
    1515          RenderFrame {FRAME} at (0,0) size 36x500
    1616            layer at (0,0) size 36x500
    1717              RenderView at (0,0) size 36x500
    18             layer at (0,0) size 36x8
    19               RenderBlock {HTML} at (0,0) size 36x8
    20                 RenderBody {BODY} at (8,8) size 20x0
     18            layer at (0,0) size 36x500
     19              RenderBlock {HTML} at (0,0) size 36x500
     20                RenderBody {BODY} at (8,8) size 20x484
    2121        RenderFrameSet {FRAMESET} at (84,0) size 36x500
    2222          RenderFrame {FRAME} at (0,0) size 36x500
    2323            layer at (0,0) size 36x500
    2424              RenderView at (0,0) size 36x500
    25             layer at (0,0) size 36x8
    26               RenderBlock {HTML} at (0,0) size 36x8
    27                 RenderBody {BODY} at (8,8) size 20x0
     25            layer at (0,0) size 36x500
     26              RenderBlock {HTML} at (0,0) size 36x500
     27                RenderBody {BODY} at (8,8) size 20x484
    2828        RenderFrameSet {FRAMESET} at (126,0) size 36x500
    2929          RenderFrame {FRAME} at (0,0) size 36x500
    3030            layer at (0,0) size 36x500
    3131              RenderView at (0,0) size 36x500
    32             layer at (0,0) size 36x8
    33               RenderBlock {HTML} at (0,0) size 36x8
    34                 RenderBody {BODY} at (8,8) size 20x0
     32            layer at (0,0) size 36x500
     33              RenderBlock {HTML} at (0,0) size 36x500
     34                RenderBody {BODY} at (8,8) size 20x484
    3535        RenderFrameSet {FRAMESET} at (168,0) size 36x500
    3636          RenderFrame {FRAME} at (0,0) size 36x247
    3737            layer at (0,0) size 36x247
    3838              RenderView at (0,0) size 36x247
    39             layer at (0,0) size 36x8
    40               RenderBlock {HTML} at (0,0) size 36x8
    41                 RenderBody {BODY} at (8,8) size 20x0
    42           RenderFrame {FRAME} at (0,253) size 36x247
    43             layer at (0,0) size 36x247
    44               RenderView at (0,0) size 36x247
    45             layer at (0,0) size 36x8
    46               RenderBlock {HTML} at (0,0) size 36x8
    47                 RenderBody {BODY} at (8,8) size 20x0
     39            layer at (0,0) size 36x247
     40              RenderBlock {HTML} at (0,0) size 36x247
     41                RenderBody {BODY} at (8,8) size 20x231
     42          RenderFrame {FRAME} at (0,253) size 36x247
     43            layer at (0,0) size 36x247
     44              RenderView at (0,0) size 36x247
     45            layer at (0,0) size 36x247
     46              RenderBlock {HTML} at (0,0) size 36x247
     47                RenderBody {BODY} at (8,8) size 20x231
    4848        RenderFrameSet {FRAMESET} at (210,0) size 36x500
    4949          RenderFrame {FRAME} at (0,0) size 36x247
    5050            layer at (0,0) size 36x247
    5151              RenderView at (0,0) size 36x247
    52             layer at (0,0) size 36x8
    53               RenderBlock {HTML} at (0,0) size 36x8
    54                 RenderBody {BODY} at (8,8) size 20x0
    55           RenderFrame {FRAME} at (0,253) size 36x247
    56             layer at (0,0) size 36x247
    57               RenderView at (0,0) size 36x247
    58             layer at (0,0) size 36x8
    59               RenderBlock {HTML} at (0,0) size 36x8
    60                 RenderBody {BODY} at (8,8) size 20x0
     52            layer at (0,0) size 36x247
     53              RenderBlock {HTML} at (0,0) size 36x247
     54                RenderBody {BODY} at (8,8) size 20x231
     55          RenderFrame {FRAME} at (0,253) size 36x247
     56            layer at (0,0) size 36x247
     57              RenderView at (0,0) size 36x247
     58            layer at (0,0) size 36x247
     59              RenderBlock {HTML} at (0,0) size 36x247
     60                RenderBody {BODY} at (8,8) size 20x231
    6161        RenderFrameSet {FRAMESET} at (252,0) size 36x500
    6262          RenderFrame {FRAME} at (0,0) size 36x247
    6363            layer at (0,0) size 36x247
    6464              RenderView at (0,0) size 36x247
    65             layer at (0,0) size 36x8
    66               RenderBlock {HTML} at (0,0) size 36x8
    67                 RenderBody {BODY} at (8,8) size 20x0
    68           RenderFrame {FRAME} at (0,253) size 36x247
    69             layer at (0,0) size 36x247
    70               RenderView at (0,0) size 36x247
    71             layer at (0,0) size 36x8
    72               RenderBlock {HTML} at (0,0) size 36x8
    73                 RenderBody {BODY} at (8,8) size 20x0
     65            layer at (0,0) size 36x247
     66              RenderBlock {HTML} at (0,0) size 36x247
     67                RenderBody {BODY} at (8,8) size 20x231
     68          RenderFrame {FRAME} at (0,253) size 36x247
     69            layer at (0,0) size 36x247
     70              RenderView at (0,0) size 36x247
     71            layer at (0,0) size 36x247
     72              RenderBlock {HTML} at (0,0) size 36x247
     73                RenderBody {BODY} at (8,8) size 20x231
    7474        RenderFrameSet {FRAMESET} at (294,0) size 36x500
    7575          RenderFrame {FRAME} at (0,0) size 36x247
    7676            layer at (0,0) size 36x247
    7777              RenderView at (0,0) size 36x247
    78             layer at (0,0) size 36x8
    79               RenderBlock {HTML} at (0,0) size 36x8
    80                 RenderBody {BODY} at (8,8) size 20x0
    81           RenderFrame {FRAME} at (0,253) size 36x247
    82             layer at (0,0) size 36x247
    83               RenderView at (0,0) size 36x247
    84             layer at (0,0) size 36x8
    85               RenderBlock {HTML} at (0,0) size 36x8
    86                 RenderBody {BODY} at (8,8) size 20x0
     78            layer at (0,0) size 36x247
     79              RenderBlock {HTML} at (0,0) size 36x247
     80                RenderBody {BODY} at (8,8) size 20x231
     81          RenderFrame {FRAME} at (0,253) size 36x247
     82            layer at (0,0) size 36x247
     83              RenderView at (0,0) size 36x247
     84            layer at (0,0) size 36x247
     85              RenderBlock {HTML} at (0,0) size 36x247
     86                RenderBody {BODY} at (8,8) size 20x231
    8787        RenderFrameSet {FRAMESET} at (336,0) size 36x500
    8888          RenderFrame {FRAME} at (0,0) size 36x0
     
    9595            layer at (0,0) size 36x494
    9696              RenderView at (0,0) size 36x494
    97             layer at (0,0) size 36x8
    98               RenderBlock {HTML} at (0,0) size 36x8
    99                 RenderBody {BODY} at (8,8) size 20x0
     97            layer at (0,0) size 36x494
     98              RenderBlock {HTML} at (0,0) size 36x494
     99                RenderBody {BODY} at (8,8) size 20x478
    100100        RenderFrameSet {FRAMESET} at (378,0) size 36x500
    101101          RenderFrame {FRAME} at (0,0) size 36x0
     
    108108            layer at (0,0) size 36x494
    109109              RenderView at (0,0) size 36x494
    110             layer at (0,0) size 36x8
    111               RenderBlock {HTML} at (0,0) size 36x8
    112                 RenderBody {BODY} at (8,8) size 20x0
     110            layer at (0,0) size 36x494
     111              RenderBlock {HTML} at (0,0) size 36x494
     112                RenderBody {BODY} at (8,8) size 20x478
    113113        RenderFrameSet {FRAMESET} at (420,0) size 36x500
    114114          RenderFrame {FRAME} at (0,0) size 36x0
     
    121121            layer at (0,0) size 36x494
    122122              RenderView at (0,0) size 36x494
    123             layer at (0,0) size 36x8
    124               RenderBlock {HTML} at (0,0) size 36x8
    125                 RenderBody {BODY} at (8,8) size 20x0
     123            layer at (0,0) size 36x494
     124              RenderBlock {HTML} at (0,0) size 36x494
     125                RenderBody {BODY} at (8,8) size 20x478
    126126        RenderFrameSet {FRAMESET} at (462,0) size 36x500
    127127          RenderFrame {FRAME} at (0,0) size 36x44
    128128            layer at (0,0) size 36x44
    129129              RenderView at (0,0) size 36x44
    130             layer at (0,0) size 36x8
    131               RenderBlock {HTML} at (0,0) size 36x8
    132                 RenderBody {BODY} at (8,8) size 20x0
     130            layer at (0,0) size 36x44
     131              RenderBlock {HTML} at (0,0) size 36x44
     132                RenderBody {BODY} at (8,8) size 20x28
    133133          RenderFrame {FRAME} at (0,50) size 36x450
    134134            layer at (0,0) size 36x450
    135135              RenderView at (0,0) size 36x450
    136             layer at (0,0) size 36x8
    137               RenderBlock {HTML} at (0,0) size 36x8
    138                 RenderBody {BODY} at (8,8) size 20x0
     136            layer at (0,0) size 36x450
     137              RenderBlock {HTML} at (0,0) size 36x450
     138                RenderBody {BODY} at (8,8) size 20x434
    139139        RenderFrameSet {FRAMESET} at (504,0) size 36x500
    140140          RenderFrame {FRAME} at (0,0) size 36x494
    141141            layer at (0,0) size 36x494
    142142              RenderView at (0,0) size 36x494
    143             layer at (0,0) size 36x8
    144               RenderBlock {HTML} at (0,0) size 36x8
    145                 RenderBody {BODY} at (8,8) size 20x0
     143            layer at (0,0) size 36x494
     144              RenderBlock {HTML} at (0,0) size 36x494
     145                RenderBody {BODY} at (8,8) size 20x478
    146146          RenderFrame {FRAME} at (0,500) size 36x0
    147147            layer at (0,0) size 21x8
     
    154154            layer at (0,0) size 36x250
    155155              RenderView at (0,0) size 36x250
    156             layer at (0,0) size 36x8
    157               RenderBlock {HTML} at (0,0) size 36x8
    158                 RenderBody {BODY} at (8,8) size 20x0
     156            layer at (0,0) size 36x250
     157              RenderBlock {HTML} at (0,0) size 36x250
     158                RenderBody {BODY} at (8,8) size 20x234
    159159          RenderFrame {FRAME} at (0,256) size 36x244
    160160            layer at (0,0) size 36x244
    161161              RenderView at (0,0) size 36x244
    162             layer at (0,0) size 36x8
    163               RenderBlock {HTML} at (0,0) size 36x8
    164                 RenderBody {BODY} at (8,8) size 20x0
     162            layer at (0,0) size 36x244
     163              RenderBlock {HTML} at (0,0) size 36x244
     164                RenderBody {BODY} at (8,8) size 20x228
    165165        RenderFrameSet {FRAMESET} at (588,0) size 36x500
    166166          RenderFrame {FRAME} at (0,0) size 36x250
    167167            layer at (0,0) size 36x250
    168168              RenderView at (0,0) size 36x250
    169             layer at (0,0) size 36x8
    170               RenderBlock {HTML} at (0,0) size 36x8
    171                 RenderBody {BODY} at (8,8) size 20x0
     169            layer at (0,0) size 36x250
     170              RenderBlock {HTML} at (0,0) size 36x250
     171                RenderBody {BODY} at (8,8) size 20x234
    172172          RenderFrame {FRAME} at (0,256) size 36x244
    173173            layer at (0,0) size 36x244
    174174              RenderView at (0,0) size 36x244
    175             layer at (0,0) size 36x8
    176               RenderBlock {HTML} at (0,0) size 36x8
    177                 RenderBody {BODY} at (8,8) size 20x0
     175            layer at (0,0) size 36x244
     176              RenderBlock {HTML} at (0,0) size 36x244
     177                RenderBody {BODY} at (8,8) size 20x228
    178178        RenderFrameSet {FRAMESET} at (630,0) size 36x500
    179179          RenderFrame {FRAME} at (0,0) size 36x250
    180180            layer at (0,0) size 36x250
    181181              RenderView at (0,0) size 36x250
    182             layer at (0,0) size 36x8
    183               RenderBlock {HTML} at (0,0) size 36x8
    184                 RenderBody {BODY} at (8,8) size 20x0
     182            layer at (0,0) size 36x250
     183              RenderBlock {HTML} at (0,0) size 36x250
     184                RenderBody {BODY} at (8,8) size 20x234
    185185          RenderFrame {FRAME} at (0,256) size 36x244
    186186            layer at (0,0) size 36x244
    187187              RenderView at (0,0) size 36x244
    188             layer at (0,0) size 36x8
    189               RenderBlock {HTML} at (0,0) size 36x8
    190                 RenderBody {BODY} at (8,8) size 20x0
     188            layer at (0,0) size 36x244
     189              RenderBlock {HTML} at (0,0) size 36x244
     190                RenderBody {BODY} at (8,8) size 20x228
    191191        RenderFrameSet {FRAMESET} at (672,0) size 36x500
    192192          RenderFrame {FRAME} at (0,0) size 36x494
    193193            layer at (0,0) size 36x494
    194194              RenderView at (0,0) size 36x494
    195             layer at (0,0) size 36x8
    196               RenderBlock {HTML} at (0,0) size 36x8
    197                 RenderBody {BODY} at (8,8) size 20x0
     195            layer at (0,0) size 36x494
     196              RenderBlock {HTML} at (0,0) size 36x494
     197                RenderBody {BODY} at (8,8) size 20x478
    198198          RenderFrame {FRAME} at (0,500) size 36x0
    199199            layer at (0,0) size 21x8
     
    206206            layer at (0,0) size 36x375
    207207              RenderView at (0,0) size 36x375
    208             layer at (0,0) size 36x8
    209               RenderBlock {HTML} at (0,0) size 36x8
    210                 RenderBody {BODY} at (8,8) size 20x0
     208            layer at (0,0) size 36x375
     209              RenderBlock {HTML} at (0,0) size 36x375
     210                RenderBody {BODY} at (8,8) size 20x359
    211211          RenderFrame {FRAME} at (0,381) size 36x90
    212212            layer at (0,0) size 36x90
    213213              RenderView at (0,0) size 36x90
    214             layer at (0,0) size 36x8
    215               RenderBlock {HTML} at (0,0) size 36x8
    216                 RenderBody {BODY} at (8,8) size 20x0
     214            layer at (0,0) size 36x90
     215              RenderBlock {HTML} at (0,0) size 36x90
     216                RenderBody {BODY} at (8,8) size 20x74
    217217          RenderFrame {FRAME} at (0,477) size 36x23
    218218            layer at (0,0) size 36x23
    219219              RenderView at (0,0) size 36x23
    220             layer at (0,0) size 36x8
    221               RenderBlock {HTML} at (0,0) size 36x8
    222                 RenderBody {BODY} at (8,8) size 20x0
     220            layer at (0,0) size 36x23
     221              RenderBlock {HTML} at (0,0) size 36x23
     222                RenderBody {BODY} at (8,8) size 20x7
    223223        RenderFrameSet {FRAMESET} at (756,0) size 44x500
    224224          RenderFrame {FRAME} at (0,0) size 44x250
    225225            layer at (0,0) size 44x250
    226226              RenderView at (0,0) size 44x250
    227             layer at (0,0) size 44x8
    228               RenderBlock {HTML} at (0,0) size 44x8
    229                 RenderBody {BODY} at (8,8) size 28x0
     227            layer at (0,0) size 44x250
     228              RenderBlock {HTML} at (0,0) size 44x250
     229                RenderBody {BODY} at (8,8) size 28x234
    230230          RenderFrame {FRAME} at (0,256) size 44x119
    231231            layer at (0,0) size 44x119
    232232              RenderView at (0,0) size 44x119
    233             layer at (0,0) size 44x8
    234               RenderBlock {HTML} at (0,0) size 44x8
    235                 RenderBody {BODY} at (8,8) size 28x0
     233            layer at (0,0) size 44x119
     234              RenderBlock {HTML} at (0,0) size 44x119
     235                RenderBody {BODY} at (8,8) size 28x103
    236236          RenderFrame {FRAME} at (0,381) size 44x119
    237237            layer at (0,0) size 44x119
    238238              RenderView at (0,0) size 44x119
    239             layer at (0,0) size 44x8
    240               RenderBlock {HTML} at (0,0) size 44x8
    241                 RenderBody {BODY} at (8,8) size 28x0
     239            layer at (0,0) size 44x119
     240              RenderBlock {HTML} at (0,0) size 44x119
     241                RenderBody {BODY} at (8,8) size 28x103
    242242      RenderFrame {FRAME} at (0,506) size 800x94
    243243        layer at (0,0) size 800x94
    244244          RenderView at (0,0) size 800x94
    245         layer at (0,0) size 800x8
    246           RenderBlock {HTML} at (0,0) size 800x8
    247             RenderBody {BODY} at (8,8) size 784x0
     245        layer at (0,0) size 800x94
     246          RenderBlock {HTML} at (0,0) size 800x94
     247            RenderBody {BODY} at (8,8) size 784x78
  • trunk/LayoutTests/platform/mac/fast/frames/calculate-order-expected.txt

    r25970 r30431  
    99            layer at (0,0) size 155x488
    1010              RenderView at (0,0) size 155x488
    11             layer at (0,0) size 155x8
    12               RenderBlock {HTML} at (0,0) size 155x8
    13                 RenderBody {BODY} at (8,8) size 139x0
     11            layer at (0,0) size 155x488
     12              RenderBlock {HTML} at (0,0) size 155x488
     13                RenderBody {BODY} at (8,8) size 139x472
    1414          RenderFrame {FRAME} at (0,494) size 155x0
    1515            layer at (0,0) size 140x8
     
    3434            layer at (0,0) size 155x122
    3535              RenderView at (0,0) size 155x122
    36             layer at (0,0) size 155x8
    37               RenderBlock {HTML} at (0,0) size 155x8
    38                 RenderBody {BODY} at (8,8) size 139x0
     36            layer at (0,0) size 155x122
     37              RenderBlock {HTML} at (0,0) size 155x122
     38                RenderBody {BODY} at (8,8) size 139x106
    3939          RenderFrame {FRAME} at (0,134) size 155x366
    4040            layer at (0,0) size 155x366
    4141              RenderView at (0,0) size 155x366
    42             layer at (0,0) size 155x8
    43               RenderBlock {HTML} at (0,0) size 155x8
    44                 RenderBody {BODY} at (8,8) size 139x0
     42            layer at (0,0) size 155x366
     43              RenderBlock {HTML} at (0,0) size 155x366
     44                RenderBody {BODY} at (8,8) size 139x350
    4545        RenderFrameSet {FRAMESET} at (322,0) size 155x500
    4646          RenderFrame {FRAME} at (0,0) size 155x250
    4747            layer at (0,0) size 155x250
    4848              RenderView at (0,0) size 155x250
    49             layer at (0,0) size 155x8
    50               RenderBlock {HTML} at (0,0) size 155x8
    51                 RenderBody {BODY} at (8,8) size 139x0
     49            layer at (0,0) size 155x250
     50              RenderBlock {HTML} at (0,0) size 155x250
     51                RenderBody {BODY} at (8,8) size 139x234
    5252          RenderFrame {FRAME} at (0,256) size 155x238
    5353            layer at (0,0) size 155x238
    5454              RenderView at (0,0) size 155x238
    55             layer at (0,0) size 155x8
    56               RenderBlock {HTML} at (0,0) size 155x8
    57                 RenderBody {BODY} at (8,8) size 139x0
     55            layer at (0,0) size 155x238
     56              RenderBlock {HTML} at (0,0) size 155x238
     57                RenderBody {BODY} at (8,8) size 139x222
    5858          RenderFrame {FRAME} at (0,500) size 155x0
    5959            layer at (0,0) size 140x8
     
    6666            layer at (0,0) size 155x250
    6767              RenderView at (0,0) size 155x250
    68             layer at (0,0) size 155x8
    69               RenderBlock {HTML} at (0,0) size 155x8
    70                 RenderBody {BODY} at (8,8) size 139x0
     68            layer at (0,0) size 155x250
     69              RenderBlock {HTML} at (0,0) size 155x250
     70                RenderBody {BODY} at (8,8) size 139x234
    7171          RenderFrame {FRAME} at (0,256) size 155x238
    7272            layer at (0,0) size 155x238
    7373              RenderView at (0,0) size 155x238
    74             layer at (0,0) size 155x8
    75               RenderBlock {HTML} at (0,0) size 155x8
    76                 RenderBody {BODY} at (8,8) size 139x0
     74            layer at (0,0) size 155x238
     75              RenderBlock {HTML} at (0,0) size 155x238
     76                RenderBody {BODY} at (8,8) size 139x222
    7777          RenderFrame {FRAME} at (0,500) size 155x0
    7878            layer at (0,0) size 140x8
     
    8585            layer at (0,0) size 156x250
    8686              RenderView at (0,0) size 156x250
    87             layer at (0,0) size 156x8
    88               RenderBlock {HTML} at (0,0) size 156x8
    89                 RenderBody {BODY} at (8,8) size 140x0
     87            layer at (0,0) size 156x250
     88              RenderBlock {HTML} at (0,0) size 156x250
     89                RenderBody {BODY} at (8,8) size 140x234
    9090          RenderFrame {FRAME} at (0,256) size 156x122
    9191            layer at (0,0) size 156x122
    9292              RenderView at (0,0) size 156x122
    93             layer at (0,0) size 156x8
    94               RenderBlock {HTML} at (0,0) size 156x8
    95                 RenderBody {BODY} at (8,8) size 140x0
     93            layer at (0,0) size 156x122
     94              RenderBlock {HTML} at (0,0) size 156x122
     95                RenderBody {BODY} at (8,8) size 140x106
    9696          RenderFrame {FRAME} at (0,384) size 156x116
    9797            layer at (0,0) size 156x116
    9898              RenderView at (0,0) size 156x116
    99             layer at (0,0) size 156x8
    100               RenderBlock {HTML} at (0,0) size 156x8
    101                 RenderBody {BODY} at (8,8) size 140x0
     99            layer at (0,0) size 156x116
     100              RenderBlock {HTML} at (0,0) size 156x116
     101                RenderBody {BODY} at (8,8) size 140x100
    102102      RenderFrame {FRAME} at (0,506) size 800x94
    103103        layer at (0,0) size 800x94
    104104          RenderView at (0,0) size 800x94
    105         layer at (0,0) size 800x8
    106           RenderBlock {HTML} at (0,0) size 800x8
    107             RenderBody {BODY} at (8,8) size 784x0
     105        layer at (0,0) size 800x94
     106          RenderBlock {HTML} at (0,0) size 800x94
     107            RenderBody {BODY} at (8,8) size 784x78
  • trunk/LayoutTests/platform/mac/fast/frames/calculate-percentage-expected.txt

    r25970 r30431  
    99            layer at (0,0) size 56x500
    1010              RenderView at (0,0) size 56x500
    11             layer at (0,0) size 56x8
    12               RenderBlock {HTML} at (0,0) size 56x8
    13                 RenderBody {BODY} at (8,8) size 40x0
     11            layer at (0,0) size 56x500
     12              RenderBlock {HTML} at (0,0) size 56x500
     13                RenderBody {BODY} at (8,8) size 40x484
    1414        RenderFrameSet {FRAMESET} at (62,0) size 56x500
    1515          RenderFrame {FRAME} at (0,0) size 56x500
    1616            layer at (0,0) size 56x500
    1717              RenderView at (0,0) size 56x500
    18             layer at (0,0) size 56x8
    19               RenderBlock {HTML} at (0,0) size 56x8
    20                 RenderBody {BODY} at (8,8) size 40x0
     18            layer at (0,0) size 56x500
     19              RenderBlock {HTML} at (0,0) size 56x500
     20                RenderBody {BODY} at (8,8) size 40x484
    2121        RenderFrameSet {FRAMESET} at (124,0) size 56x500
    2222          RenderFrame {FRAME} at (0,0) size 56x500
    2323            layer at (0,0) size 56x500
    2424              RenderView at (0,0) size 56x500
    25             layer at (0,0) size 56x8
    26               RenderBlock {HTML} at (0,0) size 56x8
    27                 RenderBody {BODY} at (8,8) size 40x0
     25            layer at (0,0) size 56x500
     26              RenderBlock {HTML} at (0,0) size 56x500
     27                RenderBody {BODY} at (8,8) size 40x484
    2828        RenderFrameSet {FRAMESET} at (186,0) size 56x500
    2929          RenderFrame {FRAME} at (0,0) size 56x500
    3030            layer at (0,0) size 56x500
    3131              RenderView at (0,0) size 56x500
    32             layer at (0,0) size 56x8
    33               RenderBlock {HTML} at (0,0) size 56x8
    34                 RenderBody {BODY} at (8,8) size 40x0
     32            layer at (0,0) size 56x500
     33              RenderBlock {HTML} at (0,0) size 56x500
     34                RenderBody {BODY} at (8,8) size 40x484
    3535        RenderFrameSet {FRAMESET} at (248,0) size 56x500
    3636          RenderFrame {FRAME} at (0,0) size 56x247
    3737            layer at (0,0) size 56x247
    3838              RenderView at (0,0) size 56x247
    39             layer at (0,0) size 56x8
    40               RenderBlock {HTML} at (0,0) size 56x8
    41                 RenderBody {BODY} at (8,8) size 40x0
     39            layer at (0,0) size 56x247
     40              RenderBlock {HTML} at (0,0) size 56x247
     41                RenderBody {BODY} at (8,8) size 40x231
    4242          RenderFrame {FRAME} at (0,253) size 56x247
    4343            layer at (0,0) size 56x247
    4444              RenderView at (0,0) size 56x247
    45             layer at (0,0) size 56x8
    46               RenderBlock {HTML} at (0,0) size 56x8
    47                 RenderBody {BODY} at (8,8) size 40x0
     45            layer at (0,0) size 56x247
     46              RenderBlock {HTML} at (0,0) size 56x247
     47                RenderBody {BODY} at (8,8) size 40x231
    4848        RenderFrameSet {FRAMESET} at (310,0) size 56x500
    4949          RenderFrame {FRAME} at (0,0) size 56x247
    5050            layer at (0,0) size 56x247
    5151              RenderView at (0,0) size 56x247
    52             layer at (0,0) size 56x8
    53               RenderBlock {HTML} at (0,0) size 56x8
    54                 RenderBody {BODY} at (8,8) size 40x0
     52            layer at (0,0) size 56x247
     53              RenderBlock {HTML} at (0,0) size 56x247
     54                RenderBody {BODY} at (8,8) size 40x231
    5555          RenderFrame {FRAME} at (0,253) size 56x247
    5656            layer at (0,0) size 56x247
    5757              RenderView at (0,0) size 56x247
    58             layer at (0,0) size 56x8
    59               RenderBlock {HTML} at (0,0) size 56x8
    60                 RenderBody {BODY} at (8,8) size 40x0
     58            layer at (0,0) size 56x247
     59              RenderBlock {HTML} at (0,0) size 56x247
     60                RenderBody {BODY} at (8,8) size 40x231
    6161        RenderFrameSet {FRAMESET} at (372,0) size 56x500
    6262          RenderFrame {FRAME} at (0,0) size 56x247
    6363            layer at (0,0) size 56x247
    6464              RenderView at (0,0) size 56x247
    65             layer at (0,0) size 56x8
    66               RenderBlock {HTML} at (0,0) size 56x8
    67                 RenderBody {BODY} at (8,8) size 40x0
     65            layer at (0,0) size 56x247
     66              RenderBlock {HTML} at (0,0) size 56x247
     67                RenderBody {BODY} at (8,8) size 40x231
    6868          RenderFrame {FRAME} at (0,253) size 56x247
    6969            layer at (0,0) size 56x247
    7070              RenderView at (0,0) size 56x247
    71             layer at (0,0) size 56x8
    72               RenderBlock {HTML} at (0,0) size 56x8
    73                 RenderBody {BODY} at (8,8) size 40x0
     71            layer at (0,0) size 56x247
     72              RenderBlock {HTML} at (0,0) size 56x247
     73                RenderBody {BODY} at (8,8) size 40x231
    7474        RenderFrameSet {FRAMESET} at (434,0) size 56x500
    7575          RenderFrame {FRAME} at (0,0) size 56x247
    7676            layer at (0,0) size 56x247
    7777              RenderView at (0,0) size 56x247
    78             layer at (0,0) size 56x8
    79               RenderBlock {HTML} at (0,0) size 56x8
    80                 RenderBody {BODY} at (8,8) size 40x0
     78            layer at (0,0) size 56x247
     79              RenderBlock {HTML} at (0,0) size 56x247
     80                RenderBody {BODY} at (8,8) size 40x231
    8181          RenderFrame {FRAME} at (0,253) size 56x247
    8282            layer at (0,0) size 56x247
    8383              RenderView at (0,0) size 56x247
    84             layer at (0,0) size 56x8
    85               RenderBlock {HTML} at (0,0) size 56x8
    86                 RenderBody {BODY} at (8,8) size 40x0
     84            layer at (0,0) size 56x247
     85              RenderBlock {HTML} at (0,0) size 56x247
     86                RenderBody {BODY} at (8,8) size 40x231
    8787        RenderFrameSet {FRAMESET} at (496,0) size 56x500
    8888          RenderFrame {FRAME} at (0,0) size 56x0
     
    9595            layer at (0,0) size 56x494
    9696              RenderView at (0,0) size 56x494
    97             layer at (0,0) size 56x8
    98               RenderBlock {HTML} at (0,0) size 56x8
    99                 RenderBody {BODY} at (8,8) size 40x0
     97            layer at (0,0) size 56x494
     98              RenderBlock {HTML} at (0,0) size 56x494
     99                RenderBody {BODY} at (8,8) size 40x478
    100100        RenderFrameSet {FRAMESET} at (558,0) size 56x500
    101101          RenderFrame {FRAME} at (0,0) size 56x49
    102102            layer at (0,0) size 56x49
    103103              RenderView at (0,0) size 56x49
    104             layer at (0,0) size 56x8
    105               RenderBlock {HTML} at (0,0) size 56x8
    106                 RenderBody {BODY} at (8,8) size 40x0
     104            layer at (0,0) size 56x49
     105              RenderBlock {HTML} at (0,0) size 56x49
     106                RenderBody {BODY} at (8,8) size 40x33
    107107          RenderFrame {FRAME} at (0,55) size 56x445
    108108            layer at (0,0) size 56x445
    109109              RenderView at (0,0) size 56x445
    110             layer at (0,0) size 56x8
    111               RenderBlock {HTML} at (0,0) size 56x8
    112                 RenderBody {BODY} at (8,8) size 40x0
     110            layer at (0,0) size 56x445
     111              RenderBlock {HTML} at (0,0) size 56x445
     112                RenderBody {BODY} at (8,8) size 40x429
    113113        RenderFrameSet {FRAMESET} at (620,0) size 56x500
    114114          RenderFrame {FRAME} at (0,0) size 56x247
    115115            layer at (0,0) size 56x247
    116116              RenderView at (0,0) size 56x247
    117             layer at (0,0) size 56x8
    118               RenderBlock {HTML} at (0,0) size 56x8
    119                 RenderBody {BODY} at (8,8) size 40x0
     117            layer at (0,0) size 56x247
     118              RenderBlock {HTML} at (0,0) size 56x247
     119                RenderBody {BODY} at (8,8) size 40x231
    120120          RenderFrame {FRAME} at (0,253) size 56x247
    121121            layer at (0,0) size 56x247
    122122              RenderView at (0,0) size 56x247
    123             layer at (0,0) size 56x8
    124               RenderBlock {HTML} at (0,0) size 56x8
    125                 RenderBody {BODY} at (8,8) size 40x0
     123            layer at (0,0) size 56x247
     124              RenderBlock {HTML} at (0,0) size 56x247
     125                RenderBody {BODY} at (8,8) size 40x231
    126126        RenderFrameSet {FRAMESET} at (682,0) size 56x500
    127127          RenderFrame {FRAME} at (0,0) size 56x494
    128128            layer at (0,0) size 56x494
    129129              RenderView at (0,0) size 56x494
    130             layer at (0,0) size 56x8
    131               RenderBlock {HTML} at (0,0) size 56x8
    132                 RenderBody {BODY} at (8,8) size 40x0
     130            layer at (0,0) size 56x494
     131              RenderBlock {HTML} at (0,0) size 56x494
     132                RenderBody {BODY} at (8,8) size 40x478
    133133          RenderFrame {FRAME} at (0,500) size 56x0
    134134            layer at (0,0) size 41x8
     
    141141            layer at (0,0) size 56x494
    142142              RenderView at (0,0) size 56x494
    143             layer at (0,0) size 56x8
    144               RenderBlock {HTML} at (0,0) size 56x8
    145                 RenderBody {BODY} at (8,8) size 40x0
     143            layer at (0,0) size 56x494
     144              RenderBlock {HTML} at (0,0) size 56x494
     145                RenderBody {BODY} at (8,8) size 40x478
    146146          RenderFrame {FRAME} at (0,500) size 56x0
    147147            layer at (0,0) size 41x8
     
    153153        layer at (0,0) size 800x94
    154154          RenderView at (0,0) size 800x94
    155         layer at (0,0) size 800x8
    156           RenderBlock {HTML} at (0,0) size 800x8
    157             RenderBody {BODY} at (8,8) size 784x0
     155        layer at (0,0) size 800x94
     156          RenderBlock {HTML} at (0,0) size 800x94
     157            RenderBody {BODY} at (8,8) size 784x78
  • trunk/LayoutTests/platform/mac/fast/frames/calculate-relative-expected.txt

    r25970 r30431  
    99            layer at (0,0) size 74x500
    1010              RenderView at (0,0) size 74x500
    11             layer at (0,0) size 74x8
    12               RenderBlock {HTML} at (0,0) size 74x8
    13                 RenderBody {BODY} at (8,8) size 58x0
     11            layer at (0,0) size 74x500
     12              RenderBlock {HTML} at (0,0) size 74x500
     13                RenderBody {BODY} at (8,8) size 58x484
    1414        RenderFrameSet {FRAMESET} at (80,0) size 74x500
    1515          RenderFrame {FRAME} at (0,0) size 74x500
    1616            layer at (0,0) size 74x500
    1717              RenderView at (0,0) size 74x500
    18             layer at (0,0) size 74x8
    19               RenderBlock {HTML} at (0,0) size 74x8
    20                 RenderBody {BODY} at (8,8) size 58x0
     18            layer at (0,0) size 74x500
     19              RenderBlock {HTML} at (0,0) size 74x500
     20                RenderBody {BODY} at (8,8) size 58x484
    2121        RenderFrameSet {FRAMESET} at (160,0) size 74x500
    2222          RenderFrame {FRAME} at (0,0) size 74x500
    2323            layer at (0,0) size 74x500
    2424              RenderView at (0,0) size 74x500
    25             layer at (0,0) size 74x8
    26               RenderBlock {HTML} at (0,0) size 74x8
    27                 RenderBody {BODY} at (8,8) size 58x0
     25            layer at (0,0) size 74x500
     26              RenderBlock {HTML} at (0,0) size 74x500
     27                RenderBody {BODY} at (8,8) size 58x484
    2828        RenderFrameSet {FRAMESET} at (240,0) size 74x500
    2929          RenderFrame {FRAME} at (0,0) size 74x500
    3030            layer at (0,0) size 74x500
    3131              RenderView at (0,0) size 74x500
    32             layer at (0,0) size 74x8
    33               RenderBlock {HTML} at (0,0) size 74x8
    34                 RenderBody {BODY} at (8,8) size 58x0
     32            layer at (0,0) size 74x500
     33              RenderBlock {HTML} at (0,0) size 74x500
     34                RenderBody {BODY} at (8,8) size 58x484
    3535        RenderFrameSet {FRAMESET} at (320,0) size 74x500
    3636          RenderFrame {FRAME} at (0,0) size 74x247
    3737            layer at (0,0) size 74x247
    3838              RenderView at (0,0) size 74x247
    39             layer at (0,0) size 74x8
    40               RenderBlock {HTML} at (0,0) size 74x8
    41                 RenderBody {BODY} at (8,8) size 58x0
     39            layer at (0,0) size 74x247
     40              RenderBlock {HTML} at (0,0) size 74x247
     41                RenderBody {BODY} at (8,8) size 58x231
    4242          RenderFrame {FRAME} at (0,253) size 74x247
    4343            layer at (0,0) size 74x247
    4444              RenderView at (0,0) size 74x247
    45             layer at (0,0) size 74x8
    46               RenderBlock {HTML} at (0,0) size 74x8
    47                 RenderBody {BODY} at (8,8) size 58x0
     45            layer at (0,0) size 74x247
     46              RenderBlock {HTML} at (0,0) size 74x247
     47                RenderBody {BODY} at (8,8) size 58x231
    4848        RenderFrameSet {FRAMESET} at (400,0) size 74x500
    4949          RenderFrame {FRAME} at (0,0) size 74x247
    5050            layer at (0,0) size 74x247
    5151              RenderView at (0,0) size 74x247
    52             layer at (0,0) size 74x8
    53               RenderBlock {HTML} at (0,0) size 74x8
    54                 RenderBody {BODY} at (8,8) size 58x0
     52            layer at (0,0) size 74x247
     53              RenderBlock {HTML} at (0,0) size 74x247
     54                RenderBody {BODY} at (8,8) size 58x231
    5555          RenderFrame {FRAME} at (0,253) size 74x247
    5656            layer at (0,0) size 74x247
    5757              RenderView at (0,0) size 74x247
    58             layer at (0,0) size 74x8
    59               RenderBlock {HTML} at (0,0) size 74x8
    60                 RenderBody {BODY} at (8,8) size 58x0
     58            layer at (0,0) size 74x247
     59              RenderBlock {HTML} at (0,0) size 74x247
     60                RenderBody {BODY} at (8,8) size 58x231
    6161        RenderFrameSet {FRAMESET} at (480,0) size 74x500
    6262          RenderFrame {FRAME} at (0,0) size 74x395
    6363            layer at (0,0) size 74x395
    6464              RenderView at (0,0) size 74x395
    65             layer at (0,0) size 74x8
    66               RenderBlock {HTML} at (0,0) size 74x8
    67                 RenderBody {BODY} at (8,8) size 58x0
     65            layer at (0,0) size 74x395
     66              RenderBlock {HTML} at (0,0) size 74x395
     67                RenderBody {BODY} at (8,8) size 58x379
    6868          RenderFrame {FRAME} at (0,401) size 74x99
    6969            layer at (0,0) size 74x99
    7070              RenderView at (0,0) size 74x99
    71             layer at (0,0) size 74x8
    72               RenderBlock {HTML} at (0,0) size 74x8
    73                 RenderBody {BODY} at (8,8) size 58x0
     71            layer at (0,0) size 74x99
     72              RenderBlock {HTML} at (0,0) size 74x99
     73                RenderBody {BODY} at (8,8) size 58x83
    7474        RenderFrameSet {FRAMESET} at (560,0) size 74x500
    7575          RenderFrame {FRAME} at (0,0) size 74x197
    7676            layer at (0,0) size 74x197
    7777              RenderView at (0,0) size 74x197
    78             layer at (0,0) size 74x8
    79               RenderBlock {HTML} at (0,0) size 74x8
    80                 RenderBody {BODY} at (8,8) size 58x0
     78            layer at (0,0) size 74x197
     79              RenderBlock {HTML} at (0,0) size 74x197
     80                RenderBody {BODY} at (8,8) size 58x181
    8181          RenderFrame {FRAME} at (0,203) size 74x297
    8282            layer at (0,0) size 74x297
    8383              RenderView at (0,0) size 74x297
    84             layer at (0,0) size 74x8
    85               RenderBlock {HTML} at (0,0) size 74x8
    86                 RenderBody {BODY} at (8,8) size 58x0
     84            layer at (0,0) size 74x297
     85              RenderBlock {HTML} at (0,0) size 74x297
     86                RenderBody {BODY} at (8,8) size 58x281
    8787        RenderFrameSet {FRAMESET} at (640,0) size 74x500
    8888          RenderFrame {FRAME} at (0,0) size 74x488
    8989            layer at (0,0) size 74x488
    9090              RenderView at (0,0) size 74x488
    91             layer at (0,0) size 74x8
    92               RenderBlock {HTML} at (0,0) size 74x8
    93                 RenderBody {BODY} at (8,8) size 58x0
     91            layer at (0,0) size 74x488
     92              RenderBlock {HTML} at (0,0) size 74x488
     93                RenderBody {BODY} at (8,8) size 58x472
    9494          RenderFrame {FRAME} at (0,494) size 74x0
    9595            layer at (0,0) size 59x8
     
    108108            layer at (0,0) size 80x244
    109109              RenderView at (0,0) size 80x244
    110             layer at (0,0) size 80x8
    111               RenderBlock {HTML} at (0,0) size 80x8
    112                 RenderBody {BODY} at (8,8) size 64x0
     110            layer at (0,0) size 80x244
     111              RenderBlock {HTML} at (0,0) size 80x244
     112                RenderBody {BODY} at (8,8) size 64x228
    113113          RenderFrame {FRAME} at (0,250) size 80x81
    114114            layer at (0,0) size 80x81
    115115              RenderView at (0,0) size 80x81
    116             layer at (0,0) size 80x8
    117               RenderBlock {HTML} at (0,0) size 80x8
    118                 RenderBody {BODY} at (8,8) size 64x0
     116            layer at (0,0) size 80x81
     117              RenderBlock {HTML} at (0,0) size 80x81
     118                RenderBody {BODY} at (8,8) size 64x65
    119119          RenderFrame {FRAME} at (0,337) size 80x163
    120120            layer at (0,0) size 80x163
    121121              RenderView at (0,0) size 80x163
    122             layer at (0,0) size 80x8
    123               RenderBlock {HTML} at (0,0) size 80x8
    124                 RenderBody {BODY} at (8,8) size 64x0
     122            layer at (0,0) size 80x163
     123              RenderBlock {HTML} at (0,0) size 80x163
     124                RenderBody {BODY} at (8,8) size 64x147
    125125      RenderFrame {FRAME} at (0,506) size 800x94
    126126        layer at (0,0) size 800x94
    127127          RenderView at (0,0) size 800x94
    128         layer at (0,0) size 800x8
    129           RenderBlock {HTML} at (0,0) size 800x8
    130             RenderBody {BODY} at (8,8) size 784x0
     128        layer at (0,0) size 800x94
     129          RenderBlock {HTML} at (0,0) size 800x94
     130            RenderBody {BODY} at (8,8) size 784x78
  • trunk/LayoutTests/platform/mac/fast/frames/calculate-round-expected.txt

    r25970 r30431  
    99            layer at (0,0) size 155x78
    1010              RenderView at (0,0) size 155x78
    11             layer at (0,0) size 155x8
    12               RenderBlock {HTML} at (0,0) size 155x8
    13                 RenderBody {BODY} at (8,8) size 139x0
     11            layer at (0,0) size 155x78
     12              RenderBlock {HTML} at (0,0) size 155x78
     13                RenderBody {BODY} at (8,8) size 139x62
    1414          RenderFrame {FRAME} at (0,84) size 155x78
    1515            layer at (0,0) size 155x78
    1616              RenderView at (0,0) size 155x78
    17             layer at (0,0) size 155x8
    18               RenderBlock {HTML} at (0,0) size 155x8
    19                 RenderBody {BODY} at (8,8) size 139x0
     17            layer at (0,0) size 155x78
     18              RenderBlock {HTML} at (0,0) size 155x78
     19                RenderBody {BODY} at (8,8) size 139x62
    2020          RenderFrame {FRAME} at (0,168) size 155x78
    2121            layer at (0,0) size 155x78
    2222              RenderView at (0,0) size 155x78
    23             layer at (0,0) size 155x8
    24               RenderBlock {HTML} at (0,0) size 155x8
    25                 RenderBody {BODY} at (8,8) size 139x0
     23            layer at (0,0) size 155x78
     24              RenderBlock {HTML} at (0,0) size 155x78
     25                RenderBody {BODY} at (8,8) size 139x62
    2626          RenderFrame {FRAME} at (0,252) size 155x78
    2727            layer at (0,0) size 155x78
    2828              RenderView at (0,0) size 155x78
    29             layer at (0,0) size 155x8
    30               RenderBlock {HTML} at (0,0) size 155x8
    31                 RenderBody {BODY} at (8,8) size 139x0
     29            layer at (0,0) size 155x78
     30              RenderBlock {HTML} at (0,0) size 155x78
     31                RenderBody {BODY} at (8,8) size 139x62
    3232          RenderFrame {FRAME} at (0,336) size 155x78
    3333            layer at (0,0) size 155x78
    3434              RenderView at (0,0) size 155x78
    35             layer at (0,0) size 155x8
    36               RenderBlock {HTML} at (0,0) size 155x8
    37                 RenderBody {BODY} at (8,8) size 139x0
     35            layer at (0,0) size 155x78
     36              RenderBlock {HTML} at (0,0) size 155x78
     37                RenderBody {BODY} at (8,8) size 139x62
    3838          RenderFrame {FRAME} at (0,420) size 155x80
    3939            layer at (0,0) size 155x80
    4040              RenderView at (0,0) size 155x80
    41             layer at (0,0) size 155x8
    42               RenderBlock {HTML} at (0,0) size 155x8
    43                 RenderBody {BODY} at (8,8) size 139x0
     41            layer at (0,0) size 155x80
     42              RenderBlock {HTML} at (0,0) size 155x80
     43                RenderBody {BODY} at (8,8) size 139x64
    4444        RenderFrameSet {FRAMESET} at (161,0) size 155x500
    4545          RenderFrame {FRAME} at (0,0) size 155x66
    4646            layer at (0,0) size 155x66
    4747              RenderView at (0,0) size 155x66
    48             layer at (0,0) size 155x8
    49               RenderBlock {HTML} at (0,0) size 155x8
    50                 RenderBody {BODY} at (8,8) size 139x0
     48            layer at (0,0) size 155x66
     49              RenderBlock {HTML} at (0,0) size 155x66
     50                RenderBody {BODY} at (8,8) size 139x50
    5151          RenderFrame {FRAME} at (0,72) size 155x66
    5252            layer at (0,0) size 155x66
    5353              RenderView at (0,0) size 155x66
    54             layer at (0,0) size 155x8
    55               RenderBlock {HTML} at (0,0) size 155x8
    56                 RenderBody {BODY} at (8,8) size 139x0
     54            layer at (0,0) size 155x66
     55              RenderBlock {HTML} at (0,0) size 155x66
     56                RenderBody {BODY} at (8,8) size 139x50
    5757          RenderFrame {FRAME} at (0,144) size 155x66
    5858            layer at (0,0) size 155x66
    5959              RenderView at (0,0) size 155x66
    60             layer at (0,0) size 155x8
    61               RenderBlock {HTML} at (0,0) size 155x8
    62                 RenderBody {BODY} at (8,8) size 139x0
     60            layer at (0,0) size 155x66
     61              RenderBlock {HTML} at (0,0) size 155x66
     62                RenderBody {BODY} at (8,8) size 139x50
    6363          RenderFrame {FRAME} at (0,216) size 155x66
    6464            layer at (0,0) size 155x66
    6565              RenderView at (0,0) size 155x66
    66             layer at (0,0) size 155x8
    67               RenderBlock {HTML} at (0,0) size 155x8
    68                 RenderBody {BODY} at (8,8) size 139x0
     66            layer at (0,0) size 155x66
     67              RenderBlock {HTML} at (0,0) size 155x66
     68                RenderBody {BODY} at (8,8) size 139x50
    6969          RenderFrame {FRAME} at (0,288) size 155x66
    7070            layer at (0,0) size 155x66
    7171              RenderView at (0,0) size 155x66
    72             layer at (0,0) size 155x8
    73               RenderBlock {HTML} at (0,0) size 155x8
    74                 RenderBody {BODY} at (8,8) size 139x0
     72            layer at (0,0) size 155x66
     73              RenderBlock {HTML} at (0,0) size 155x66
     74                RenderBody {BODY} at (8,8) size 139x50
    7575          RenderFrame {FRAME} at (0,360) size 155x66
    7676            layer at (0,0) size 155x66
    7777              RenderView at (0,0) size 155x66
    78             layer at (0,0) size 155x8
    79               RenderBlock {HTML} at (0,0) size 155x8
    80                 RenderBody {BODY} at (8,8) size 139x0
     78            layer at (0,0) size 155x66
     79              RenderBlock {HTML} at (0,0) size 155x66
     80                RenderBody {BODY} at (8,8) size 139x50
    8181          RenderFrame {FRAME} at (0,432) size 155x68
    8282            layer at (0,0) size 155x68
    8383              RenderView at (0,0) size 155x68
    84             layer at (0,0) size 155x8
    85               RenderBlock {HTML} at (0,0) size 155x8
    86                 RenderBody {BODY} at (8,8) size 139x0
     84            layer at (0,0) size 155x68
     85              RenderBlock {HTML} at (0,0) size 155x68
     86                RenderBody {BODY} at (8,8) size 139x52
    8787        RenderFrameSet {FRAMESET} at (322,0) size 155x500
    8888          RenderFrame {FRAME} at (0,0) size 155x57
    8989            layer at (0,0) size 155x57
    9090              RenderView at (0,0) size 155x57
    91             layer at (0,0) size 155x8
    92               RenderBlock {HTML} at (0,0) size 155x8
    93                 RenderBody {BODY} at (8,8) size 139x0
     91            layer at (0,0) size 155x57
     92              RenderBlock {HTML} at (0,0) size 155x57
     93                RenderBody {BODY} at (8,8) size 139x41
    9494          RenderFrame {FRAME} at (0,63) size 155x57
    9595            layer at (0,0) size 155x57
    9696              RenderView at (0,0) size 155x57
    97             layer at (0,0) size 155x8
    98               RenderBlock {HTML} at (0,0) size 155x8
    99                 RenderBody {BODY} at (8,8) size 139x0
     97            layer at (0,0) size 155x57
     98              RenderBlock {HTML} at (0,0) size 155x57
     99                RenderBody {BODY} at (8,8) size 139x41
    100100          RenderFrame {FRAME} at (0,126) size 155x57
    101101            layer at (0,0) size 155x57
    102102              RenderView at (0,0) size 155x57
    103             layer at (0,0) size 155x8
    104               RenderBlock {HTML} at (0,0) size 155x8
    105                 RenderBody {BODY} at (8,8) size 139x0
     103            layer at (0,0) size 155x57
     104              RenderBlock {HTML} at (0,0) size 155x57
     105                RenderBody {BODY} at (8,8) size 139x41
    106106          RenderFrame {FRAME} at (0,189) size 155x57
    107107            layer at (0,0) size 155x57
    108108              RenderView at (0,0) size 155x57
    109             layer at (0,0) size 155x8
    110               RenderBlock {HTML} at (0,0) size 155x8
    111                 RenderBody {BODY} at (8,8) size 139x0
     109            layer at (0,0) size 155x57
     110              RenderBlock {HTML} at (0,0) size 155x57
     111                RenderBody {BODY} at (8,8) size 139x41
    112112          RenderFrame {FRAME} at (0,252) size 155x57
    113113            layer at (0,0) size 155x57
    114114              RenderView at (0,0) size 155x57
    115             layer at (0,0) size 155x8
    116               RenderBlock {HTML} at (0,0) size 155x8
    117                 RenderBody {BODY} at (8,8) size 139x0
     115            layer at (0,0) size 155x57
     116              RenderBlock {HTML} at (0,0) size 155x57
     117                RenderBody {BODY} at (8,8) size 139x41
    118118          RenderFrame {FRAME} at (0,315) size 155x57
    119119            layer at (0,0) size 155x57
    120120              RenderView at (0,0) size 155x57
    121             layer at (0,0) size 155x8
    122               RenderBlock {HTML} at (0,0) size 155x8
    123                 RenderBody {BODY} at (8,8) size 139x0
     121            layer at (0,0) size 155x57
     122              RenderBlock {HTML} at (0,0) size 155x57
     123                RenderBody {BODY} at (8,8) size 139x41
    124124          RenderFrame {FRAME} at (0,378) size 155x57
    125125            layer at (0,0) size 155x57
    126126              RenderView at (0,0) size 155x57
    127             layer at (0,0) size 155x8
    128               RenderBlock {HTML} at (0,0) size 155x8
    129                 RenderBody {BODY} at (8,8) size 139x0
     127            layer at (0,0) size 155x57
     128              RenderBlock {HTML} at (0,0) size 155x57
     129                RenderBody {BODY} at (8,8) size 139x41
    130130          RenderFrame {FRAME} at (0,441) size 155x59
    131131            layer at (0,0) size 155x59
    132132              RenderView at (0,0) size 155x59
    133             layer at (0,0) size 155x8
    134               RenderBlock {HTML} at (0,0) size 155x8
    135                 RenderBody {BODY} at (8,8) size 139x0
     133            layer at (0,0) size 155x59
     134              RenderBlock {HTML} at (0,0) size 155x59
     135                RenderBody {BODY} at (8,8) size 139x43
    136136        RenderFrameSet {FRAMESET} at (483,0) size 155x500
    137137          RenderFrame {FRAME} at (0,0) size 155x32
    138138            layer at (0,0) size 155x32
    139139              RenderView at (0,0) size 155x32
    140             layer at (0,0) size 155x8
    141               RenderBlock {HTML} at (0,0) size 155x8
    142                 RenderBody {BODY} at (8,8) size 139x0
     140            layer at (0,0) size 155x32
     141              RenderBlock {HTML} at (0,0) size 155x32
     142                RenderBody {BODY} at (8,8) size 139x16
    143143          RenderFrame {FRAME} at (0,38) size 155x32
    144144            layer at (0,0) size 155x32
    145145              RenderView at (0,0) size 155x32
    146             layer at (0,0) size 155x8
    147               RenderBlock {HTML} at (0,0) size 155x8
    148                 RenderBody {BODY} at (8,8) size 139x0
     146            layer at (0,0) size 155x32
     147              RenderBlock {HTML} at (0,0) size 155x32
     148                RenderBody {BODY} at (8,8) size 139x16
    149149          RenderFrame {FRAME} at (0,76) size 155x32
    150150            layer at (0,0) size 155x32
    151151              RenderView at (0,0) size 155x32
    152             layer at (0,0) size 155x8
    153               RenderBlock {HTML} at (0,0) size 155x8
    154                 RenderBody {BODY} at (8,8) size 139x0
     152            layer at (0,0) size 155x32
     153              RenderBlock {HTML} at (0,0) size 155x32
     154                RenderBody {BODY} at (8,8) size 139x16
    155155          RenderFrame {FRAME} at (0,114) size 155x32
    156156            layer at (0,0) size 155x32
    157157              RenderView at (0,0) size 155x32
    158             layer at (0,0) size 155x8
    159               RenderBlock {HTML} at (0,0) size 155x8
    160                 RenderBody {BODY} at (8,8) size 139x0
     158            layer at (0,0) size 155x32
     159              RenderBlock {HTML} at (0,0) size 155x32
     160                RenderBody {BODY} at (8,8) size 139x16
    161161          RenderFrame {FRAME} at (0,152) size 155x32
    162162            layer at (0,0) size 155x32
    163163              RenderView at (0,0) size 155x32
    164             layer at (0,0) size 155x8
    165               RenderBlock {HTML} at (0,0) size 155x8
    166                 RenderBody {BODY} at (8,8) size 139x0
     164            layer at (0,0) size 155x32
     165              RenderBlock {HTML} at (0,0) size 155x32
     166                RenderBody {BODY} at (8,8) size 139x16
    167167          RenderFrame {FRAME} at (0,190) size 155x32
    168168            layer at (0,0) size 155x32
    169169              RenderView at (0,0) size 155x32
    170             layer at (0,0) size 155x8
    171               RenderBlock {HTML} at (0,0) size 155x8
    172                 RenderBody {BODY} at (8,8) size 139x0
     170            layer at (0,0) size 155x32
     171              RenderBlock {HTML} at (0,0) size 155x32
     172                RenderBody {BODY} at (8,8) size 139x16
    173173          RenderFrame {FRAME} at (0,228) size 155x32
    174174            layer at (0,0) size 155x32
    175175              RenderView at (0,0) size 155x32
    176             layer at (0,0) size 155x8
    177               RenderBlock {HTML} at (0,0) size 155x8
    178                 RenderBody {BODY} at (8,8) size 139x0
     176            layer at (0,0) size 155x32
     177              RenderBlock {HTML} at (0,0) size 155x32
     178                RenderBody {BODY} at (8,8) size 139x16
    179179          RenderFrame {FRAME} at (0,266) size 155x32
    180180            layer at (0,0) size 155x32
    181181              RenderView at (0,0) size 155x32
    182             layer at (0,0) size 155x8
    183               RenderBlock {HTML} at (0,0) size 155x8
    184                 RenderBody {BODY} at (8,8) size 139x0
     182            layer at (0,0) size 155x32
     183              RenderBlock {HTML} at (0,0) size 155x32
     184                RenderBody {BODY} at (8,8) size 139x16
    185185          RenderFrame {FRAME} at (0,304) size 155x32
    186186            layer at (0,0) size 155x32
    187187              RenderView at (0,0) size 155x32
    188             layer at (0,0) size 155x8
    189               RenderBlock {HTML} at (0,0) size 155x8
    190                 RenderBody {BODY} at (8,8) size 139x0
     188            layer at (0,0) size 155x32
     189              RenderBlock {HTML} at (0,0) size 155x32
     190                RenderBody {BODY} at (8,8) size 139x16
    191191          RenderFrame {FRAME} at (0,342) size 155x32
    192192            layer at (0,0) size 155x32
    193193              RenderView at (0,0) size 155x32
    194             layer at (0,0) size 155x8
    195               RenderBlock {HTML} at (0,0) size 155x8
    196                 RenderBody {BODY} at (8,8) size 139x0
     194            layer at (0,0) size 155x32
     195              RenderBlock {HTML} at (0,0) size 155x32
     196                RenderBody {BODY} at (8,8) size 139x16
    197197          RenderFrame {FRAME} at (0,380) size 155x32
    198198            layer at (0,0) size 155x32
    199199              RenderView at (0,0) size 155x32
    200             layer at (0,0) size 155x8
    201               RenderBlock {HTML} at (0,0) size 155x8
    202                 RenderBody {BODY} at (8,8) size 139x0
     200            layer at (0,0) size 155x32
     201              RenderBlock {HTML} at (0,0) size 155x32
     202                RenderBody {BODY} at (8,8) size 139x16
    203203          RenderFrame {FRAME} at (0,418) size 155x32
    204204            layer at (0,0) size 155x32
    205205              RenderView at (0,0) size 155x32
    206             layer at (0,0) size 155x8
    207               RenderBlock {HTML} at (0,0) size 155x8
    208                 RenderBody {BODY} at (8,8) size 139x0
     206            layer at (0,0) size 155x32
     207              RenderBlock {HTML} at (0,0) size 155x32
     208                RenderBody {BODY} at (8,8) size 139x16
    209209          RenderFrame {FRAME} at (0,456) size 155x44
    210210            layer at (0,0) size 155x44
    211211              RenderView at (0,0) size 155x44
    212             layer at (0,0) size 155x8
    213               RenderBlock {HTML} at (0,0) size 155x8
    214                 RenderBody {BODY} at (8,8) size 139x0
     212            layer at (0,0) size 155x44
     213              RenderBlock {HTML} at (0,0) size 155x44
     214                RenderBody {BODY} at (8,8) size 139x28
    215215        RenderFrameSet {FRAMESET} at (644,0) size 156x500
    216216          RenderFrame {FRAME} at (0,0) size 156x9
    217217            layer at (0,0) size 156x9
    218218              RenderView at (0,0) size 156x9
    219             layer at (0,0) size 156x8
    220               RenderBlock {HTML} at (0,0) size 156x8
     219            layer at (0,0) size 156x9
     220              RenderBlock {HTML} at (0,0) size 156x9
    221221                RenderBody {BODY} at (8,8) size 140x0
    222222          RenderFrame {FRAME} at (0,15) size 156x9
    223223            layer at (0,0) size 156x9
    224224              RenderView at (0,0) size 156x9
    225             layer at (0,0) size 156x8
    226               RenderBlock {HTML} at (0,0) size 156x8
     225            layer at (0,0) size 156x9
     226              RenderBlock {HTML} at (0,0) size 156x9
    227227                RenderBody {BODY} at (8,8) size 140x0
    228228          RenderFrame {FRAME} at (0,30) size 156x9
    229229            layer at (0,0) size 156x9
    230230              RenderView at (0,0) size 156x9
    231             layer at (0,0) size 156x8
    232               RenderBlock {HTML} at (0,0) size 156x8
     231            layer at (0,0) size 156x9
     232              RenderBlock {HTML} at (0,0) size 156x9
    233233                RenderBody {BODY} at (8,8) size 140x0
    234234          RenderFrame {FRAME} at (0,45) size 156x9
    235235            layer at (0,0) size 156x9
    236236              RenderView at (0,0) size 156x9
    237             layer at (0,0) size 156x8
    238               RenderBlock {HTML} at (0,0) size 156x8
     237            layer at (0,0) size 156x9
     238              RenderBlock {HTML} at (0,0) size 156x9
    239239                RenderBody {BODY} at (8,8) size 140x0
    240240          RenderFrame {FRAME} at (0,60) size 156x9
    241241            layer at (0,0) size 156x9
    242242              RenderView at (0,0) size 156x9
    243             layer at (0,0) size 156x8
    244               RenderBlock {HTML} at (0,0) size 156x8
     243            layer at (0,0) size 156x9
     244              RenderBlock {HTML} at (0,0) size 156x9
    245245                RenderBody {BODY} at (8,8) size 140x0
    246246          RenderFrame {FRAME} at (0,75) size 156x9
    247247            layer at (0,0) size 156x9
    248248              RenderView at (0,0) size 156x9
    249             layer at (0,0) size 156x8
    250               RenderBlock {HTML} at (0,0) size 156x8
     249            layer at (0,0) size 156x9
     250              RenderBlock {HTML} at (0,0) size 156x9
    251251                RenderBody {BODY} at (8,8) size 140x0
    252252          RenderFrame {FRAME} at (0,90) size 156x9
    253253            layer at (0,0) size 156x9
    254254              RenderView at (0,0) size 156x9
    255             layer at (0,0) size 156x8
    256               RenderBlock {HTML} at (0,0) size 156x8
     255            layer at (0,0) size 156x9
     256              RenderBlock {HTML} at (0,0) size 156x9
    257257                RenderBody {BODY} at (8,8) size 140x0
    258258          RenderFrame {FRAME} at (0,105) size 156x9
    259259            layer at (0,0) size 156x9
    260260              RenderView at (0,0) size 156x9
    261             layer at (0,0) size 156x8
    262               RenderBlock {HTML} at (0,0) size 156x8
     261            layer at (0,0) size 156x9
     262              RenderBlock {HTML} at (0,0) size 156x9
    263263                RenderBody {BODY} at (8,8) size 140x0
    264264          RenderFrame {FRAME} at (0,120) size 156x9
    265265            layer at (0,0) size 156x9
    266266              RenderView at (0,0) size 156x9
    267             layer at (0,0) size 156x8
    268               RenderBlock {HTML} at (0,0) size 156x8
     267            layer at (0,0) size 156x9
     268              RenderBlock {HTML} at (0,0) size 156x9
    269269                RenderBody {BODY} at (8,8) size 140x0
    270270          RenderFrame {FRAME} at (0,135) size 156x9
    271271            layer at (0,0) size 156x9
    272272              RenderView at (0,0) size 156x9
    273             layer at (0,0) size 156x8
    274               RenderBlock {HTML} at (0,0) size 156x8
     273            layer at (0,0) size 156x9
     274              RenderBlock {HTML} at (0,0) size 156x9
    275275                RenderBody {BODY} at (8,8) size 140x0
    276276          RenderFrame {FRAME} at (0,150) size 156x9
    277277            layer at (0,0) size 156x9
    278278              RenderView at (0,0) size 156x9
    279             layer at (0,0) size 156x8
    280               RenderBlock {HTML} at (0,0) size 156x8
     279            layer at (0,0) size 156x9
     280              RenderBlock {HTML} at (0,0) size 156x9
    281281                RenderBody {BODY} at (8,8) size 140x0
    282282          RenderFrame {FRAME} at (0,165) size 156x9
    283283            layer at (0,0) size 156x9
    284284              RenderView at (0,0) size 156x9
    285             layer at (0,0) size 156x8
    286               RenderBlock {HTML} at (0,0) size 156x8
     285            layer at (0,0) size 156x9
     286              RenderBlock {HTML} at (0,0) size 156x9
    287287                RenderBody {BODY} at (8,8) size 140x0
    288288          RenderFrame {FRAME} at (0,180) size 156x9
    289289            layer at (0,0) size 156x9
    290290              RenderView at (0,0) size 156x9
    291             layer at (0,0) size 156x8
    292               RenderBlock {HTML} at (0,0) size 156x8
     291            layer at (0,0) size 156x9
     292              RenderBlock {HTML} at (0,0) size 156x9
    293293                RenderBody {BODY} at (8,8) size 140x0
    294294          RenderFrame {FRAME} at (0,195) size 156x9
    295295            layer at (0,0) size 156x9
    296296              RenderView at (0,0) size 156x9
    297             layer at (0,0) size 156x8
    298               RenderBlock {HTML} at (0,0) size 156x8
     297            layer at (0,0) size 156x9
     298              RenderBlock {HTML} at (0,0) size 156x9
    299299                RenderBody {BODY} at (8,8) size 140x0
    300300          RenderFrame {FRAME} at (0,210) size 156x9
    301301            layer at (0,0) size 156x9
    302302              RenderView at (0,0) size 156x9
    303             layer at (0,0) size 156x8
    304               RenderBlock {HTML} at (0,0) size 156x8
     303            layer at (0,0) size 156x9
     304              RenderBlock {HTML} at (0,0) size 156x9
    305305                RenderBody {BODY} at (8,8) size 140x0
    306306          RenderFrame {FRAME} at (0,225) size 156x9
    307307            layer at (0,0) size 156x9
    308308              RenderView at (0,0) size 156x9
    309             layer at (0,0) size 156x8
    310               RenderBlock {HTML} at (0,0) size 156x8
     309            layer at (0,0) size 156x9
     310              RenderBlock {HTML} at (0,0) size 156x9
    311311                RenderBody {BODY} at (8,8) size 140x0
    312312          RenderFrame {FRAME} at (0,240) size 156x9
    313313            layer at (0,0) size 156x9
    314314              RenderView at (0,0) size 156x9
    315             layer at (0,0) size 156x8
    316               RenderBlock {HTML} at (0,0) size 156x8
     315            layer at (0,0) size 156x9
     316              RenderBlock {HTML} at (0,0) size 156x9
    317317                RenderBody {BODY} at (8,8) size 140x0
    318318          RenderFrame {FRAME} at (0,255) size 156x9
    319319            layer at (0,0) size 156x9
    320320              RenderView at (0,0) size 156x9
    321             layer at (0,0) size 156x8
    322               RenderBlock {HTML} at (0,0) size 156x8
     321            layer at (0,0) size 156x9
     322              RenderBlock {HTML} at (0,0) size 156x9
    323323                RenderBody {BODY} at (8,8) size 140x0
    324324          RenderFrame {FRAME} at (0,270) size 156x9
    325325            layer at (0,0) size 156x9
    326326              RenderView at (0,0) size 156x9
    327             layer at (0,0) size 156x8
    328               RenderBlock {HTML} at (0,0) size 156x8
     327            layer at (0,0) size 156x9
     328              RenderBlock {HTML} at (0,0) size 156x9
    329329                RenderBody {BODY} at (8,8) size 140x0
    330330          RenderFrame {FRAME} at (0,285) size 156x9
    331331            layer at (0,0) size 156x9
    332332              RenderView at (0,0) size 156x9
    333             layer at (0,0) size 156x8
    334               RenderBlock {HTML} at (0,0) size 156x8
     333            layer at (0,0) size 156x9
     334              RenderBlock {HTML} at (0,0) size 156x9
    335335                RenderBody {BODY} at (8,8) size 140x0
    336336          RenderFrame {FRAME} at (0,300) size 156x9
    337337            layer at (0,0) size 156x9
    338338              RenderView at (0,0) size 156x9
    339             layer at (0,0) size 156x8
    340               RenderBlock {HTML} at (0,0) size 156x8
     339            layer at (0,0) size 156x9
     340              RenderBlock {HTML} at (0,0) size 156x9
    341341                RenderBody {BODY} at (8,8) size 140x0
    342342          RenderFrame {FRAME} at (0,315) size 156x9
    343343            layer at (0,0) size 156x9
    344344              RenderView at (0,0) size 156x9
    345             layer at (0,0) size 156x8
    346               RenderBlock {HTML} at (0,0) size 156x8
     345            layer at (0,0) size 156x9
     346              RenderBlock {HTML} at (0,0) size 156x9
    347347                RenderBody {BODY} at (8,8) size 140x0
    348348          RenderFrame {FRAME} at (0,330) size 156x9
    349349            layer at (0,0) size 156x9
    350350              RenderView at (0,0) size 156x9
    351             layer at (0,0) size 156x8
    352               RenderBlock {HTML} at (0,0) size 156x8
     351            layer at (0,0) size 156x9
     352              RenderBlock {HTML} at (0,0) size 156x9
    353353                RenderBody {BODY} at (8,8) size 140x0
    354354          RenderFrame {FRAME} at (0,345) size 156x9
    355355            layer at (0,0) size 156x9
    356356              RenderView at (0,0) size 156x9
    357             layer at (0,0) size 156x8
    358               RenderBlock {HTML} at (0,0) size 156x8
     357            layer at (0,0) size 156x9
     358              RenderBlock {HTML} at (0,0) size 156x9
    359359                RenderBody {BODY} at (8,8) size 140x0
    360360          RenderFrame {FRAME} at (0,360) size 156x9
    361361            layer at (0,0) size 156x9
    362362              RenderView at (0,0) size 156x9
    363             layer at (0,0) size 156x8
    364               RenderBlock {HTML} at (0,0) size 156x8
     363            layer at (0,0) size 156x9
     364              RenderBlock {HTML} at (0,0) size 156x9
    365365                RenderBody {BODY} at (8,8) size 140x0
    366366          RenderFrame {FRAME} at (0,375) size 156x9
    367367            layer at (0,0) size 156x9
    368368              RenderView at (0,0) size 156x9
    369             layer at (0,0) size 156x8
    370               RenderBlock {HTML} at (0,0) size 156x8
     369            layer at (0,0) size 156x9
     370              RenderBlock {HTML} at (0,0) size 156x9
    371371                RenderBody {BODY} at (8,8) size 140x0
    372372          RenderFrame {FRAME} at (0,390) size 156x9
    373373            layer at (0,0) size 156x9
    374374              RenderView at (0,0) size 156x9
    375             layer at (0,0) size 156x8
    376               RenderBlock {HTML} at (0,0) size 156x8
     375            layer at (0,0) size 156x9
     376              RenderBlock {HTML} at (0,0) size 156x9
    377377                RenderBody {BODY} at (8,8) size 140x0
    378378          RenderFrame {FRAME} at (0,405) size 156x9
    379379            layer at (0,0) size 156x9
    380380              RenderView at (0,0) size 156x9
    381             layer at (0,0) size 156x8
    382               RenderBlock {HTML} at (0,0) size 156x8
     381            layer at (0,0) size 156x9
     382              RenderBlock {HTML} at (0,0) size 156x9
    383383                RenderBody {BODY} at (8,8) size 140x0
    384384          RenderFrame {FRAME} at (0,420) size 156x9
    385385            layer at (0,0) size 156x9
    386386              RenderView at (0,0) size 156x9
    387             layer at (0,0) size 156x8
    388               RenderBlock {HTML} at (0,0) size 156x8
     387            layer at (0,0) size 156x9
     388              RenderBlock {HTML} at (0,0) size 156x9
    389389                RenderBody {BODY} at (8,8) size 140x0
    390390          RenderFrame {FRAME} at (0,435) size 156x9
    391391            layer at (0,0) size 156x9
    392392              RenderView at (0,0) size 156x9
    393             layer at (0,0) size 156x8
    394               RenderBlock {HTML} at (0,0) size 156x8
     393            layer at (0,0) size 156x9
     394              RenderBlock {HTML} at (0,0) size 156x9
    395395                RenderBody {BODY} at (8,8) size 140x0
    396396          RenderFrame {FRAME} at (0,450) size 156x9
    397397            layer at (0,0) size 156x9
    398398              RenderView at (0,0) size 156x9
    399             layer at (0,0) size 156x8
    400               RenderBlock {HTML} at (0,0) size 156x8
     399            layer at (0,0) size 156x9
     400              RenderBlock {HTML} at (0,0) size 156x9
    401401                RenderBody {BODY} at (8,8) size 140x0
    402402          RenderFrame {FRAME} at (0,465) size 156x9
    403403            layer at (0,0) size 156x9
    404404              RenderView at (0,0) size 156x9
    405             layer at (0,0) size 156x8
    406               RenderBlock {HTML} at (0,0) size 156x8
     405            layer at (0,0) size 156x9
     406              RenderBlock {HTML} at (0,0) size 156x9
    407407                RenderBody {BODY} at (8,8) size 140x0
    408408          RenderFrame {FRAME} at (0,480) size 156x20
    409409            layer at (0,0) size 156x20
    410410              RenderView at (0,0) size 156x20
    411             layer at (0,0) size 156x8
    412               RenderBlock {HTML} at (0,0) size 156x8
    413                 RenderBody {BODY} at (8,8) size 140x0
     411            layer at (0,0) size 156x20
     412              RenderBlock {HTML} at (0,0) size 156x20
     413                RenderBody {BODY} at (8,8) size 140x4
    414414      RenderFrame {FRAME} at (0,506) size 800x94
    415415        layer at (0,0) size 800x94
    416416          RenderView at (0,0) size 800x94
    417         layer at (0,0) size 800x8
    418           RenderBlock {HTML} at (0,0) size 800x8
    419             RenderBody {BODY} at (8,8) size 784x0
     417        layer at (0,0) size 800x94
     418          RenderBlock {HTML} at (0,0) size 800x94
     419            RenderBody {BODY} at (8,8) size 784x78
  • trunk/LayoutTests/platform/mac/fast/frames/contentWindow_Frame-expected.txt

    r25970 r30431  
    1616        layer at (0,0) size 800x416
    1717          RenderView at (0,0) size 800x416
    18         layer at (0,0) size 800x8
    19           RenderBlock {HTML} at (0,0) size 800x8
    20             RenderBody {BODY} at (8,8) size 784x0
     18        layer at (0,0) size 800x416
     19          RenderBlock {HTML} at (0,0) size 800x416
     20            RenderBody {BODY} at (8,8) size 784x400
  • trunk/LayoutTests/platform/mac/fast/frames/contentWindow_iFrame-expected.txt

    r25970 r30431  
    1010          layer at (0,0) size 200x200
    1111            RenderView at (0,0) size 200x200
    12           layer at (0,0) size 200x8
    13             RenderBlock {HTML} at (0,0) size 200x8
    14               RenderBody {BODY} at (8,8) size 184x0
     12          layer at (0,0) size 200x200
     13            RenderBlock {HTML} at (0,0) size 200x200
     14              RenderBody {BODY} at (8,8) size 184x184
    1515        RenderText {#text} at (0,0) size 0x0
    1616      RenderBlock {DIV} at (0,208) size 784x18
  • trunk/LayoutTests/platform/mac/fast/frames/empty-frame-src-expected.txt

    r25970 r30431  
    1919        layer at (0,0) size 800x196
    2020          RenderView at (0,0) size 800x196
    21         layer at (0,0) size 800x8
    22           RenderBlock {HTML} at (0,0) size 800x8
    23             RenderBody {BODY} at (8,8) size 784x0
     21        layer at (0,0) size 800x196
     22          RenderBlock {HTML} at (0,0) size 800x196
     23            RenderBody {BODY} at (8,8) size 784x180
  • trunk/LayoutTests/platform/mac/fast/frames/iframe-option-crash-expected.txt

    r25970 r30431  
    1313          layer at (0,0) size 300x150
    1414            RenderView at (0,0) size 300x150
    15           layer at (0,0) size 300x8
    16             RenderBlock {HTML} at (0,0) size 300x8
    17               RenderBody {BODY} at (8,8) size 284x0
     15          layer at (0,0) size 300x150
     16            RenderBlock {HTML} at (0,0) size 300x150
     17              RenderBody {BODY} at (8,8) size 284x134
  • trunk/LayoutTests/platform/mac/fast/frames/iframe-text-contents-expected.txt

    r30126 r30431  
    77        layer at (0,0) size 300x150
    88          RenderView at (0,0) size 300x150
    9         layer at (0,0) size 300x8
    10           RenderBlock {HTML} at (0,0) size 300x8
    11             RenderBody {BODY} at (8,8) size 284x0
     9        layer at (0,0) size 300x150
     10          RenderBlock {HTML} at (0,0) size 300x150
     11            RenderBody {BODY} at (8,8) size 284x134
    1212      RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/fast/frames/iframe-with-frameborder-expected.txt

    r25970 r30431  
    1010        layer at (0,0) size 300x150
    1111          RenderView at (0,0) size 300x150
    12         layer at (0,0) size 300x8
    13           RenderBlock {HTML} at (0,0) size 300x8
    14             RenderBody {BODY} at (8,8) size 284x0
     12        layer at (0,0) size 300x150
     13          RenderBlock {HTML} at (0,0) size 300x150
     14            RenderBody {BODY} at (8,8) size 284x134
    1515      RenderText {#text} at (304,158) size 4x18
    1616        text run at (304,158) width 4: " "
     
    2222        layer at (0,0) size 300x150
    2323          RenderView at (0,0) size 300x150
    24         layer at (0,0) size 300x8
    25           RenderBlock {HTML} at (0,0) size 300x8
    26             RenderBody {BODY} at (8,8) size 284x0
     24        layer at (0,0) size 300x150
     25          RenderBlock {HTML} at (0,0) size 300x150
     26            RenderBody {BODY} at (8,8) size 284x134
    2727      RenderText {#text} at (300,330) size 4x18
    2828        text run at (300,330) width 4: " "
     
    3434        layer at (0,0) size 300x150
    3535          RenderView at (0,0) size 300x150
    36         layer at (0,0) size 300x8
    37           RenderBlock {HTML} at (0,0) size 300x8
    38             RenderBody {BODY} at (8,8) size 284x0
     36        layer at (0,0) size 300x150
     37          RenderBlock {HTML} at (0,0) size 300x150
     38            RenderBody {BODY} at (8,8) size 284x134
    3939      RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/fast/frames/invalid-expected.txt

    r25970 r30431  
    88          layer at (0,0) size 67x297
    99            RenderView at (0,0) size 67x297
    10           layer at (0,0) size 67x8
    11             RenderBlock {HTML} at (0,0) size 67x8
    12               RenderBody {BODY} at (8,8) size 51x0
     10          layer at (0,0) size 67x297
     11            RenderBlock {HTML} at (0,0) size 67x297
     12              RenderBody {BODY} at (8,8) size 51x281
    1313        RenderFrame {FRAME} at (0,303) size 67x297
    1414          layer at (0,0) size 67x297
    1515            RenderView at (0,0) size 67x297
    16           layer at (0,0) size 67x8
    17             RenderBlock {HTML} at (0,0) size 67x8
    18               RenderBody {BODY} at (8,8) size 51x0
     16          layer at (0,0) size 67x297
     17            RenderBlock {HTML} at (0,0) size 67x297
     18              RenderBody {BODY} at (8,8) size 51x281
    1919      RenderFrameSet {FRAMESET} at (73,0) size 67x600
    2020        RenderFrame {FRAME} at (0,0) size 67x445
    2121          layer at (0,0) size 67x445
    2222            RenderView at (0,0) size 67x445
    23           layer at (0,0) size 67x8
    24             RenderBlock {HTML} at (0,0) size 67x8
    25               RenderBody {BODY} at (8,8) size 51x0
     23          layer at (0,0) size 67x445
     24            RenderBlock {HTML} at (0,0) size 67x445
     25              RenderBody {BODY} at (8,8) size 51x429
    2626        RenderFrame {FRAME} at (0,451) size 67x149
    2727          layer at (0,0) size 67x149
    2828            RenderView at (0,0) size 67x149
    29           layer at (0,0) size 67x8
    30             RenderBlock {HTML} at (0,0) size 67x8
    31               RenderBody {BODY} at (8,8) size 51x0
     29          layer at (0,0) size 67x149
     30            RenderBlock {HTML} at (0,0) size 67x149
     31              RenderBody {BODY} at (8,8) size 51x133
    3232      RenderFrameSet {FRAMESET} at (146,0) size 67x600
    3333        RenderFrame {FRAME} at (0,0) size 67x100
    3434          layer at (0,0) size 67x100
    3535            RenderView at (0,0) size 67x100
    36           layer at (0,0) size 67x8
    37             RenderBlock {HTML} at (0,0) size 67x8
    38               RenderBody {BODY} at (8,8) size 51x0
     36          layer at (0,0) size 67x100
     37            RenderBlock {HTML} at (0,0) size 67x100
     38              RenderBody {BODY} at (8,8) size 51x84
    3939        RenderFrame {FRAME} at (0,106) size 67x300
    4040          layer at (0,0) size 67x300
    4141            RenderView at (0,0) size 67x300
    42           layer at (0,0) size 67x8
    43             RenderBlock {HTML} at (0,0) size 67x8
    44               RenderBody {BODY} at (8,8) size 51x0
     42          layer at (0,0) size 67x300
     43            RenderBlock {HTML} at (0,0) size 67x300
     44              RenderBody {BODY} at (8,8) size 51x284
    4545        RenderFrame {FRAME} at (0,412) size 67x188
    4646          layer at (0,0) size 67x188
    4747            RenderView at (0,0) size 67x188
    48           layer at (0,0) size 67x8
    49             RenderBlock {HTML} at (0,0) size 67x8
    50               RenderBody {BODY} at (8,8) size 51x0
     48          layer at (0,0) size 67x188
     49            RenderBlock {HTML} at (0,0) size 67x188
     50              RenderBody {BODY} at (8,8) size 51x172
    5151      RenderFrameSet {FRAMESET} at (219,0) size 67x600
    5252        RenderFrame {FRAME} at (0,0) size 67x300
    5353          layer at (0,0) size 67x300
    5454            RenderView at (0,0) size 67x300
    55           layer at (0,0) size 67x8
    56             RenderBlock {HTML} at (0,0) size 67x8
    57               RenderBody {BODY} at (8,8) size 51x0
     55          layer at (0,0) size 67x300
     56            RenderBlock {HTML} at (0,0) size 67x300
     57              RenderBody {BODY} at (8,8) size 51x284
    5858        RenderFrame {FRAME} at (0,306) size 67x100
    5959          layer at (0,0) size 67x100
    6060            RenderView at (0,0) size 67x100
    61           layer at (0,0) size 67x8
    62             RenderBlock {HTML} at (0,0) size 67x8
    63               RenderBody {BODY} at (8,8) size 51x0
     61          layer at (0,0) size 67x100
     62            RenderBlock {HTML} at (0,0) size 67x100
     63              RenderBody {BODY} at (8,8) size 51x84
    6464        RenderFrame {FRAME} at (0,412) size 67x188
    6565          layer at (0,0) size 67x188
    6666            RenderView at (0,0) size 67x188
    67           layer at (0,0) size 67x8
    68             RenderBlock {HTML} at (0,0) size 67x8
    69               RenderBody {BODY} at (8,8) size 51x0
     67          layer at (0,0) size 67x188
     68            RenderBlock {HTML} at (0,0) size 67x188
     69              RenderBody {BODY} at (8,8) size 51x172
    7070      RenderFrameSet {FRAMESET} at (292,0) size 67x600
    7171        RenderFrame {FRAME} at (0,0) size 67x4
     
    7878          layer at (0,0) size 67x52
    7979            RenderView at (0,0) size 67x52
    80           layer at (0,0) size 67x8
    81             RenderBlock {HTML} at (0,0) size 67x8
    82               RenderBody {BODY} at (8,8) size 51x0
     80          layer at (0,0) size 67x52
     81            RenderBlock {HTML} at (0,0) size 67x52
     82              RenderBody {BODY} at (8,8) size 51x36
    8383        RenderFrame {FRAME} at (0,68) size 67x532
    8484          layer at (0,0) size 67x532
    8585            RenderView at (0,0) size 67x532
    86           layer at (0,0) size 67x8
    87             RenderBlock {HTML} at (0,0) size 67x8
    88               RenderBody {BODY} at (8,8) size 51x0
     86          layer at (0,0) size 67x532
     87            RenderBlock {HTML} at (0,0) size 67x532
     88              RenderBody {BODY} at (8,8) size 51x516
    8989      RenderFrameSet {FRAMESET} at (365,0) size 67x600
    9090        RenderFrame {FRAME} at (0,0) size 67x65
    9191          layer at (0,0) size 67x65
    9292            RenderView at (0,0) size 67x65
    93           layer at (0,0) size 67x8
    94             RenderBlock {HTML} at (0,0) size 67x8
    95               RenderBody {BODY} at (8,8) size 51x0
     93          layer at (0,0) size 67x65
     94            RenderBlock {HTML} at (0,0) size 67x65
     95              RenderBody {BODY} at (8,8) size 51x49
    9696        RenderFrame {FRAME} at (0,71) size 67x529
    9797          layer at (0,0) size 67x529
    9898            RenderView at (0,0) size 67x529
    99           layer at (0,0) size 67x8
    100             RenderBlock {HTML} at (0,0) size 67x8
    101               RenderBody {BODY} at (8,8) size 51x0
     99          layer at (0,0) size 67x529
     100            RenderBlock {HTML} at (0,0) size 67x529
     101              RenderBody {BODY} at (8,8) size 51x513
    102102      RenderFrameSet {FRAMESET} at (438,0) size 67x600
    103103        RenderFrame {FRAME} at (0,0) size 67x196
    104104          layer at (0,0) size 67x196
    105105            RenderView at (0,0) size 67x196
    106           layer at (0,0) size 67x8
    107             RenderBlock {HTML} at (0,0) size 67x8
    108               RenderBody {BODY} at (8,8) size 51x0
     106          layer at (0,0) size 67x196
     107            RenderBlock {HTML} at (0,0) size 67x196
     108              RenderBody {BODY} at (8,8) size 51x180
    109109        RenderFrame {FRAME} at (0,202) size 67x196
    110110          layer at (0,0) size 67x196
    111111            RenderView at (0,0) size 67x196
    112           layer at (0,0) size 67x8
    113             RenderBlock {HTML} at (0,0) size 67x8
    114               RenderBody {BODY} at (8,8) size 51x0
     112          layer at (0,0) size 67x196
     113            RenderBlock {HTML} at (0,0) size 67x196
     114              RenderBody {BODY} at (8,8) size 51x180
    115115        RenderFrame {FRAME} at (0,404) size 67x196
    116116          layer at (0,0) size 67x196
    117117            RenderView at (0,0) size 67x196
    118           layer at (0,0) size 67x8
    119             RenderBlock {HTML} at (0,0) size 67x8
    120               RenderBody {BODY} at (8,8) size 51x0
     118          layer at (0,0) size 67x196
     119            RenderBlock {HTML} at (0,0) size 67x196
     120              RenderBody {BODY} at (8,8) size 51x180
    121121      RenderFrameSet {FRAMESET} at (511,0) size 67x600
    122122        RenderFrame {FRAME} at (0,0) size 67x196
    123123          layer at (0,0) size 67x196
    124124            RenderView at (0,0) size 67x196
    125           layer at (0,0) size 67x8
    126             RenderBlock {HTML} at (0,0) size 67x8
    127               RenderBody {BODY} at (8,8) size 51x0
     125          layer at (0,0) size 67x196
     126            RenderBlock {HTML} at (0,0) size 67x196
     127              RenderBody {BODY} at (8,8) size 51x180
    128128        RenderFrame {FRAME} at (0,202) size 67x196
    129129          layer at (0,0) size 67x196
    130130            RenderView at (0,0) size 67x196
    131           layer at (0,0) size 67x8
    132             RenderBlock {HTML} at (0,0) size 67x8
    133               RenderBody {BODY} at (8,8) size 51x0
     131          layer at (0,0) size 67x196
     132            RenderBlock {HTML} at (0,0) size 67x196
     133              RenderBody {BODY} at (8,8) size 51x180
    134134        RenderFrame {FRAME} at (0,404) size 67x196
    135135          layer at (0,0) size 67x196
    136136            RenderView at (0,0) size 67x196
    137           layer at (0,0) size 67x8
    138             RenderBlock {HTML} at (0,0) size 67x8
    139               RenderBody {BODY} at (8,8) size 51x0
     137          layer at (0,0) size 67x196
     138            RenderBlock {HTML} at (0,0) size 67x196
     139              RenderBody {BODY} at (8,8) size 51x180
    140140      RenderFrameSet {FRAMESET} at (584,0) size 67x600
    141141        RenderFrame {FRAME} at (0,0) size 67x394
    142142          layer at (0,0) size 67x394
    143143            RenderView at (0,0) size 67x394
    144           layer at (0,0) size 67x8
    145             RenderBlock {HTML} at (0,0) size 67x8
    146               RenderBody {BODY} at (8,8) size 51x0
     144          layer at (0,0) size 67x394
     145            RenderBlock {HTML} at (0,0) size 67x394
     146              RenderBody {BODY} at (8,8) size 51x378
    147147        RenderFrame {FRAME} at (0,400) size 67x200
    148148          layer at (0,0) size 67x200
    149149            RenderView at (0,0) size 67x200
    150           layer at (0,0) size 67x8
    151             RenderBlock {HTML} at (0,0) size 67x8
    152               RenderBody {BODY} at (8,8) size 51x0
     150          layer at (0,0) size 67x200
     151            RenderBlock {HTML} at (0,0) size 67x200
     152              RenderBody {BODY} at (8,8) size 51x184
    153153      RenderFrameSet {FRAMESET} at (657,0) size 67x600
    154154        RenderFrame {FRAME} at (0,0) size 67x145
    155155          layer at (0,0) size 67x145
    156156            RenderView at (0,0) size 67x145
    157           layer at (0,0) size 67x8
    158             RenderBlock {HTML} at (0,0) size 67x8
    159               RenderBody {BODY} at (8,8) size 51x0
     157          layer at (0,0) size 67x145
     158            RenderBlock {HTML} at (0,0) size 67x145
     159              RenderBody {BODY} at (8,8) size 51x129
    160160        RenderFrame {FRAME} at (0,151) size 67x145
    161161          layer at (0,0) size 67x145
    162162            RenderView at (0,0) size 67x145
    163           layer at (0,0) size 67x8
    164             RenderBlock {HTML} at (0,0) size 67x8
    165               RenderBody {BODY} at (8,8) size 51x0
     163          layer at (0,0) size 67x145
     164            RenderBlock {HTML} at (0,0) size 67x145
     165              RenderBody {BODY} at (8,8) size 51x129
    166166        RenderFrame {FRAME} at (0,302) size 67x145
    167167          layer at (0,0) size 67x145
    168168            RenderView at (0,0) size 67x145
    169           layer at (0,0) size 67x8
    170             RenderBlock {HTML} at (0,0) size 67x8
    171               RenderBody {BODY} at (8,8) size 51x0
     169          layer at (0,0) size 67x145
     170            RenderBlock {HTML} at (0,0) size 67x145
     171              RenderBody {BODY} at (8,8) size 51x129
    172172        RenderFrame {FRAME} at (0,453) size 67x147
    173173          layer at (0,0) size 67x147
    174174            RenderView at (0,0) size 67x147
    175           layer at (0,0) size 67x8
    176             RenderBlock {HTML} at (0,0) size 67x8
    177               RenderBody {BODY} at (8,8) size 51x0
     175          layer at (0,0) size 67x147
     176            RenderBlock {HTML} at (0,0) size 67x147
     177              RenderBody {BODY} at (8,8) size 51x131
    178178      RenderFrameSet {FRAMESET} at (730,0) size 70x600
    179179        RenderFrame {FRAME} at (0,0) size 70x145
    180180          layer at (0,0) size 70x145
    181181            RenderView at (0,0) size 70x145
    182           layer at (0,0) size 70x8
    183             RenderBlock {HTML} at (0,0) size 70x8
    184               RenderBody {BODY} at (8,8) size 54x0
     182          layer at (0,0) size 70x145
     183            RenderBlock {HTML} at (0,0) size 70x145
     184              RenderBody {BODY} at (8,8) size 54x129
    185185        RenderFrame {FRAME} at (0,151) size 70x145
    186186          layer at (0,0) size 70x145
    187187            RenderView at (0,0) size 70x145
    188           layer at (0,0) size 70x8
    189             RenderBlock {HTML} at (0,0) size 70x8
    190               RenderBody {BODY} at (8,8) size 54x0
     188          layer at (0,0) size 70x145
     189            RenderBlock {HTML} at (0,0) size 70x145
     190              RenderBody {BODY} at (8,8) size 54x129
    191191        RenderFrame {FRAME} at (0,302) size 70x145
    192192          layer at (0,0) size 70x145
    193193            RenderView at (0,0) size 70x145
    194           layer at (0,0) size 70x8
    195             RenderBlock {HTML} at (0,0) size 70x8
    196               RenderBody {BODY} at (8,8) size 54x0
     194          layer at (0,0) size 70x145
     195            RenderBlock {HTML} at (0,0) size 70x145
     196              RenderBody {BODY} at (8,8) size 54x129
    197197        RenderFrame {FRAME} at (0,453) size 70x147
    198198          layer at (0,0) size 70x147
    199199            RenderView at (0,0) size 70x147
    200           layer at (0,0) size 70x8
    201             RenderBlock {HTML} at (0,0) size 70x8
    202               RenderBody {BODY} at (8,8) size 54x0
     200          layer at (0,0) size 70x147
     201            RenderBlock {HTML} at (0,0) size 70x147
     202              RenderBody {BODY} at (8,8) size 54x131
  • trunk/LayoutTests/platform/mac/fast/frames/no-frame-borders-expected.txt

    r25970 r30431  
    77        layer at (0,0) size 800x84
    88          RenderView at (0,0) size 800x84
    9         layer at (0,0) size 800x0
    10           RenderBlock {HTML} at (0,0) size 800x0
    11             RenderBody {BODY} at (10,0) size 780x0
     9        layer at (0,0) size 800x84
     10          RenderBlock {HTML} at (0,0) size 800x84
     11            RenderBody {BODY} at (10,0) size 780x84
    1212      RenderFrameSet {FRAMESET} at (0,104) size 800x496
    1313        RenderFrame {FRAME} at (0,0) size 180x496
    1414          layer at (0,0) size 180x496
    1515            RenderView at (0,0) size 180x496
    16           layer at (0,0) size 180x0
    17             RenderBlock {HTML} at (0,0) size 180x0
    18               RenderBody {BODY} at (10,0) size 160x0
     16          layer at (0,0) size 180x496
     17            RenderBlock {HTML} at (0,0) size 180x496
     18              RenderBody {BODY} at (10,0) size 160x496
    1919        RenderFrame {FRAME} at (200,0) size 600x496
    2020          layer at (0,0) size 600x496
    2121            RenderView at (0,0) size 600x496
    22           layer at (0,0) size 600x0
    23             RenderBlock {HTML} at (0,0) size 600x0
    24               RenderBody {BODY} at (0,0) size 600x0
     22          layer at (0,0) size 600x496
     23            RenderBlock {HTML} at (0,0) size 600x496
     24              RenderBody {BODY} at (0,0) size 600x496
  • trunk/LayoutTests/platform/mac/fast/frames/valid-expected.txt

    r25970 r30431  
    88          layer at (0,0) size 67x297
    99            RenderView at (0,0) size 67x297
    10           layer at (0,0) size 67x8
    11             RenderBlock {HTML} at (0,0) size 67x8
    12               RenderBody {BODY} at (8,8) size 51x0
     10          layer at (0,0) size 67x297
     11            RenderBlock {HTML} at (0,0) size 67x297
     12              RenderBody {BODY} at (8,8) size 51x281
    1313        RenderFrame {FRAME} at (0,303) size 67x297
    1414          layer at (0,0) size 67x297
    1515            RenderView at (0,0) size 67x297
    16           layer at (0,0) size 67x8
    17             RenderBlock {HTML} at (0,0) size 67x8
    18               RenderBody {BODY} at (8,8) size 51x0
     16          layer at (0,0) size 67x297
     17            RenderBlock {HTML} at (0,0) size 67x297
     18              RenderBody {BODY} at (8,8) size 51x281
    1919      RenderFrameSet {FRAMESET} at (73,0) size 67x600
    2020        RenderFrame {FRAME} at (0,0) size 67x445
    2121          layer at (0,0) size 67x445
    2222            RenderView at (0,0) size 67x445
    23           layer at (0,0) size 67x8
    24             RenderBlock {HTML} at (0,0) size 67x8
    25               RenderBody {BODY} at (8,8) size 51x0
     23          layer at (0,0) size 67x445
     24            RenderBlock {HTML} at (0,0) size 67x445
     25              RenderBody {BODY} at (8,8) size 51x429
    2626        RenderFrame {FRAME} at (0,451) size 67x149
    2727          layer at (0,0) size 67x149
    2828            RenderView at (0,0) size 67x149
    29           layer at (0,0) size 67x8
    30             RenderBlock {HTML} at (0,0) size 67x8
    31               RenderBody {BODY} at (8,8) size 51x0
     29          layer at (0,0) size 67x149
     30            RenderBlock {HTML} at (0,0) size 67x149
     31              RenderBody {BODY} at (8,8) size 51x133
    3232      RenderFrameSet {FRAMESET} at (146,0) size 67x600
    3333        RenderFrame {FRAME} at (0,0) size 67x100
    3434          layer at (0,0) size 67x100
    3535            RenderView at (0,0) size 67x100
    36           layer at (0,0) size 67x8
    37             RenderBlock {HTML} at (0,0) size 67x8
    38               RenderBody {BODY} at (8,8) size 51x0
     36          layer at (0,0) size 67x100
     37            RenderBlock {HTML} at (0,0) size 67x100
     38              RenderBody {BODY} at (8,8) size 51x84
    3939        RenderFrame {FRAME} at (0,106) size 67x300
    4040          layer at (0,0) size 67x300
    4141            RenderView at (0,0) size 67x300
    42           layer at (0,0) size 67x8
    43             RenderBlock {HTML} at (0,0) size 67x8
    44               RenderBody {BODY} at (8,8) size 51x0
     42          layer at (0,0) size 67x300
     43            RenderBlock {HTML} at (0,0) size 67x300
     44              RenderBody {BODY} at (8,8) size 51x284
    4545        RenderFrame {FRAME} at (0,412) size 67x188
    4646          layer at (0,0) size 67x188
    4747            RenderView at (0,0) size 67x188
    48           layer at (0,0) size 67x8
    49             RenderBlock {HTML} at (0,0) size 67x8
    50               RenderBody {BODY} at (8,8) size 51x0
     48          layer at (0,0) size 67x188
     49            RenderBlock {HTML} at (0,0) size 67x188
     50              RenderBody {BODY} at (8,8) size 51x172
    5151      RenderFrameSet {FRAMESET} at (219,0) size 67x600
    5252        RenderFrame {FRAME} at (0,0) size 67x300
    5353          layer at (0,0) size 67x300
    5454            RenderView at (0,0) size 67x300
    55           layer at (0,0) size 67x8
    56             RenderBlock {HTML} at (0,0) size 67x8
    57               RenderBody {BODY} at (8,8) size 51x0
     55          layer at (0,0) size 67x300
     56            RenderBlock {HTML} at (0,0) size 67x300
     57              RenderBody {BODY} at (8,8) size 51x284
    5858        RenderFrame {FRAME} at (0,306) size 67x100
    5959          layer at (0,0) size 67x100
    6060            RenderView at (0,0) size 67x100
    61           layer at (0,0) size 67x8
    62             RenderBlock {HTML} at (0,0) size 67x8
    63               RenderBody {BODY} at (8,8) size 51x0
     61          layer at (0,0) size 67x100
     62            RenderBlock {HTML} at (0,0) size 67x100
     63              RenderBody {BODY} at (8,8) size 51x84
    6464        RenderFrame {FRAME} at (0,412) size 67x188
    6565          layer at (0,0) size 67x188
    6666            RenderView at (0,0) size 67x188
    67           layer at (0,0) size 67x8
    68             RenderBlock {HTML} at (0,0) size 67x8
    69               RenderBody {BODY} at (8,8) size 51x0
     67          layer at (0,0) size 67x188
     68            RenderBlock {HTML} at (0,0) size 67x188
     69              RenderBody {BODY} at (8,8) size 51x172
    7070      RenderFrameSet {FRAMESET} at (292,0) size 67x600
    7171        RenderFrame {FRAME} at (0,0) size 67x4
     
    7878          layer at (0,0) size 67x52
    7979            RenderView at (0,0) size 67x52
    80           layer at (0,0) size 67x8
    81             RenderBlock {HTML} at (0,0) size 67x8
    82               RenderBody {BODY} at (8,8) size 51x0
     80          layer at (0,0) size 67x52
     81            RenderBlock {HTML} at (0,0) size 67x52
     82              RenderBody {BODY} at (8,8) size 51x36
    8383        RenderFrame {FRAME} at (0,68) size 67x532
    8484          layer at (0,0) size 67x532
    8585            RenderView at (0,0) size 67x532
    86           layer at (0,0) size 67x8
    87             RenderBlock {HTML} at (0,0) size 67x8
    88               RenderBody {BODY} at (8,8) size 51x0
     86          layer at (0,0) size 67x532
     87            RenderBlock {HTML} at (0,0) size 67x532
     88              RenderBody {BODY} at (8,8) size 51x516
    8989      RenderFrameSet {FRAMESET} at (365,0) size 67x600
    9090        RenderFrame {FRAME} at (0,0) size 67x65
    9191          layer at (0,0) size 67x65
    9292            RenderView at (0,0) size 67x65
    93           layer at (0,0) size 67x8
    94             RenderBlock {HTML} at (0,0) size 67x8
    95               RenderBody {BODY} at (8,8) size 51x0
     93          layer at (0,0) size 67x65
     94            RenderBlock {HTML} at (0,0) size 67x65
     95              RenderBody {BODY} at (8,8) size 51x49
    9696        RenderFrame {FRAME} at (0,71) size 67x529
    9797          layer at (0,0) size 67x529
    9898            RenderView at (0,0) size 67x529
    99           layer at (0,0) size 67x8
    100             RenderBlock {HTML} at (0,0) size 67x8
    101               RenderBody {BODY} at (8,8) size 51x0
     99          layer at (0,0) size 67x529
     100            RenderBlock {HTML} at (0,0) size 67x529
     101              RenderBody {BODY} at (8,8) size 51x513
    102102      RenderFrameSet {FRAMESET} at (438,0) size 67x600
    103103        RenderFrame {FRAME} at (0,0) size 67x196
    104104          layer at (0,0) size 67x196
    105105            RenderView at (0,0) size 67x196
    106           layer at (0,0) size 67x8
    107             RenderBlock {HTML} at (0,0) size 67x8
    108               RenderBody {BODY} at (8,8) size 51x0
     106          layer at (0,0) size 67x196
     107            RenderBlock {HTML} at (0,0) size 67x196
     108              RenderBody {BODY} at (8,8) size 51x180
    109109        RenderFrame {FRAME} at (0,202) size 67x196
    110110          layer at (0,0) size 67x196
    111111            RenderView at (0,0) size 67x196
    112           layer at (0,0) size 67x8
    113             RenderBlock {HTML} at (0,0) size 67x8
    114               RenderBody {BODY} at (8,8) size 51x0
     112          layer at (0,0) size 67x196
     113            RenderBlock {HTML} at (0,0) size 67x196
     114              RenderBody {BODY} at (8,8) size 51x180
    115115        RenderFrame {FRAME} at (0,404) size 67x196
    116116          layer at (0,0) size 67x196
    117117            RenderView at (0,0) size 67x196
    118           layer at (0,0) size 67x8
    119             RenderBlock {HTML} at (0,0) size 67x8
    120               RenderBody {BODY} at (8,8) size 51x0
     118          layer at (0,0) size 67x196
     119            RenderBlock {HTML} at (0,0) size 67x196
     120              RenderBody {BODY} at (8,8) size 51x180
    121121      RenderFrameSet {FRAMESET} at (511,0) size 67x600
    122122        RenderFrame {FRAME} at (0,0) size 67x196
    123123          layer at (0,0) size 67x196
    124124            RenderView at (0,0) size 67x196
    125           layer at (0,0) size 67x8
    126             RenderBlock {HTML} at (0,0) size 67x8
    127               RenderBody {BODY} at (8,8) size 51x0
     125          layer at (0,0) size 67x196
     126            RenderBlock {HTML} at (0,0) size 67x196
     127              RenderBody {BODY} at (8,8) size 51x180
    128128        RenderFrame {FRAME} at (0,202) size 67x196
    129129          layer at (0,0) size 67x196
    130130            RenderView at (0,0) size 67x196
    131           layer at (0,0) size 67x8
    132             RenderBlock {HTML} at (0,0) size 67x8
    133               RenderBody {BODY} at (8,8) size 51x0
     131          layer at (0,0) size 67x196
     132            RenderBlock {HTML} at (0,0) size 67x196
     133              RenderBody {BODY} at (8,8) size 51x180
    134134        RenderFrame {FRAME} at (0,404) size 67x196
    135135          layer at (0,0) size 67x196
    136136            RenderView at (0,0) size 67x196
    137           layer at (0,0) size 67x8
    138             RenderBlock {HTML} at (0,0) size 67x8
    139               RenderBody {BODY} at (8,8) size 51x0
     137          layer at (0,0) size 67x196
     138            RenderBlock {HTML} at (0,0) size 67x196
     139              RenderBody {BODY} at (8,8) size 51x180
    140140      RenderFrameSet {FRAMESET} at (584,0) size 67x600
    141141        RenderFrame {FRAME} at (0,0) size 67x394
    142142          layer at (0,0) size 67x394
    143143            RenderView at (0,0) size 67x394
    144           layer at (0,0) size 67x8
    145             RenderBlock {HTML} at (0,0) size 67x8
    146               RenderBody {BODY} at (8,8) size 51x0
     144          layer at (0,0) size 67x394
     145            RenderBlock {HTML} at (0,0) size 67x394
     146              RenderBody {BODY} at (8,8) size 51x378
    147147        RenderFrame {FRAME} at (0,400) size 67x200
    148148          layer at (0,0) size 67x200
    149149            RenderView at (0,0) size 67x200
    150           layer at (0,0) size 67x8
    151             RenderBlock {HTML} at (0,0) size 67x8
    152               RenderBody {BODY} at (8,8) size 51x0
     150          layer at (0,0) size 67x200
     151            RenderBlock {HTML} at (0,0) size 67x200
     152              RenderBody {BODY} at (8,8) size 51x184
    153153      RenderFrameSet {FRAMESET} at (657,0) size 67x600
    154154        RenderFrame {FRAME} at (0,0) size 67x145
    155155          layer at (0,0) size 67x145
    156156            RenderView at (0,0) size 67x145
    157           layer at (0,0) size 67x8
    158             RenderBlock {HTML} at (0,0) size 67x8
    159               RenderBody {BODY} at (8,8) size 51x0
     157          layer at (0,0) size 67x145
     158            RenderBlock {HTML} at (0,0) size 67x145
     159              RenderBody {BODY} at (8,8) size 51x129
    160160        RenderFrame {FRAME} at (0,151) size 67x145
    161161          layer at (0,0) size 67x145
    162162            RenderView at (0,0) size 67x145
    163           layer at (0,0) size 67x8
    164             RenderBlock {HTML} at (0,0) size 67x8
    165               RenderBody {BODY} at (8,8) size 51x0
     163          layer at (0,0) size 67x145
     164            RenderBlock {HTML} at (0,0) size 67x145
     165              RenderBody {BODY} at (8,8) size 51x129
    166166        RenderFrame {FRAME} at (0,302) size 67x145
    167167          layer at (0,0) size 67x145
    168168            RenderView at (0,0) size 67x145
    169           layer at (0,0) size 67x8
    170             RenderBlock {HTML} at (0,0) size 67x8
    171               RenderBody {BODY} at (8,8) size 51x0
     169          layer at (0,0) size 67x145
     170            RenderBlock {HTML} at (0,0) size 67x145
     171              RenderBody {BODY} at (8,8) size 51x129
    172172        RenderFrame {FRAME} at (0,453) size 67x147
    173173          layer at (0,0) size 67x147
    174174            RenderView at (0,0) size 67x147
    175           layer at (0,0) size 67x8
    176             RenderBlock {HTML} at (0,0) size 67x8
    177               RenderBody {BODY} at (8,8) size 51x0
     175          layer at (0,0) size 67x147
     176            RenderBlock {HTML} at (0,0) size 67x147
     177              RenderBody {BODY} at (8,8) size 51x131
    178178      RenderFrameSet {FRAMESET} at (730,0) size 70x600
    179179        RenderFrame {FRAME} at (0,0) size 70x145
    180180          layer at (0,0) size 70x145
    181181            RenderView at (0,0) size 70x145
    182           layer at (0,0) size 70x8
    183             RenderBlock {HTML} at (0,0) size 70x8
    184               RenderBody {BODY} at (8,8) size 54x0
     182          layer at (0,0) size 70x145
     183            RenderBlock {HTML} at (0,0) size 70x145
     184              RenderBody {BODY} at (8,8) size 54x129
    185185        RenderFrame {FRAME} at (0,151) size 70x145
    186186          layer at (0,0) size 70x145
    187187            RenderView at (0,0) size 70x145
    188           layer at (0,0) size 70x8
    189             RenderBlock {HTML} at (0,0) size 70x8
    190               RenderBody {BODY} at (8,8) size 54x0
     188          layer at (0,0) size 70x145
     189            RenderBlock {HTML} at (0,0) size 70x145
     190              RenderBody {BODY} at (8,8) size 54x129
    191191        RenderFrame {FRAME} at (0,302) size 70x145
    192192          layer at (0,0) size 70x145
    193193            RenderView at (0,0) size 70x145
    194           layer at (0,0) size 70x8
    195             RenderBlock {HTML} at (0,0) size 70x8
    196               RenderBody {BODY} at (8,8) size 54x0
     194          layer at (0,0) size 70x145
     195            RenderBlock {HTML} at (0,0) size 70x145
     196              RenderBody {BODY} at (8,8) size 54x129
    197197        RenderFrame {FRAME} at (0,453) size 70x147
    198198          layer at (0,0) size 70x147
    199199            RenderView at (0,0) size 70x147
    200           layer at (0,0) size 70x8
    201             RenderBlock {HTML} at (0,0) size 70x8
    202               RenderBody {BODY} at (8,8) size 54x0
     200          layer at (0,0) size 70x147
     201            RenderBlock {HTML} at (0,0) size 70x147
     202              RenderBody {BODY} at (8,8) size 54x131
  • trunk/LayoutTests/platform/mac/fast/lists/markers-in-selection-expected.txt

    r25970 r30431  
    6767        RenderText {#text} at (0,0) size 0x0
    6868        RenderText {#text} at (0,0) size 0x0
    69 selection start: position 0 of child 7 {HR} of child 1 {BODY} of child 0 {HTML} of document
    70 selection end:   position 1 of child 21 {HR} of child 1 {BODY} of child 0 {HTML} of document
     69selection start: position 0 of child 7 {HR} of child 1 {BODY} of child 1 {HTML} of document
     70selection end:   position 1 of child 21 {HR} of child 1 {BODY} of child 1 {HTML} of document
  • trunk/LayoutTests/platform/mac/fast/media/mq-js-stylesheet-media-04-expected.txt

    r25970 r30431  
    44  RenderBlock {HTML} at (0,0) size 800x600
    55    RenderBody {BODY} at (8,8) size 784x576
    6       RenderBlock {P} at (0,0) size 784x18
     6      RenderBlock {P} at (0,0) size 784x18 [color=#008000]
    77        RenderText {#text} at (0,0) size 445x18
    88          text run at (0,0) width 445: "This text should be green and below should read \"media list is empty\"."
    9       RenderBlock {P} at (0,34) size 784x18
     9      RenderBlock {P} at (0,34) size 784x18 [color=#008000]
    1010        RenderText {#text} at (0,0) size 117x18
    1111          text run at (0,0) width 117: "media list is empty"
    12       RenderBlock {P} at (0,68) size 784x18
     12      RenderBlock {P} at (0,68) size 784x18 [color=#008000]
    1313        RenderText {#text} at (0,0) size 177x18
    1414          text run at (0,0) width 177: "Expected to fail (24.7.2005)"
  • trunk/LayoutTests/platform/mac/fast/repaint/inline-outline-repaint-expected.txt

    r25970 r30431  
    3636            text run at (0,0) width 88: "Lorem ipsum "
    3737            text run at (0,18) width 37: "dolor "
    38 caret: position 18 of child 0 {#text} of child 1 {SPAN} of child 7 {DIV} of child 1 {BODY} of child 0 {HTML} of document
     38caret: position 18 of child 0 {#text} of child 1 {SPAN} of child 7 {DIV} of child 1 {BODY} of child 1 {HTML} of document
  • trunk/LayoutTests/platform/mac/fast/replaced/replaced-breaking-expected.txt

    r25970 r30431  
    5050          layer at (0,0) size 25x25
    5151            RenderView at (0,0) size 25x25
    52           layer at (0,0) size 25x8
    53             RenderBlock {HTML} at (0,0) size 25x8
    54               RenderBody {BODY} at (8,8) size 9x0
     52          layer at (0,0) size 25x25
     53            RenderBlock {HTML} at (0,0) size 25x25
     54              RenderBody {BODY} at (8,8) size 9x9
    5555        RenderPartObject {IFRAME} at (1,456) size 27x27 [border: (1px solid #000000)]
    5656          layer at (0,0) size 25x25
    5757            RenderView at (0,0) size 25x25
    58           layer at (0,0) size 25x8
    59             RenderBlock {HTML} at (0,0) size 25x8
    60               RenderBody {BODY} at (8,8) size 9x0
     58          layer at (0,0) size 25x25
     59            RenderBlock {HTML} at (0,0) size 25x25
     60              RenderBody {BODY} at (8,8) size 9x9
    6161        RenderText {#text} at (0,0) size 0x0
    6262        RenderPartObject {EMBED} at (1,483) size 27x27 [border: (1px solid #000000)]
  • trunk/LayoutTests/platform/mac/fast/selectors/159-expected.txt

    r25970 r30431  
    77        RenderText {#text} at (0,0) size 503x18
    88          text run at (0,0) width 503: "Try selecting some text in this document. It should be have a green background."
    9 selection start: position 0 of child 0 {#text} of child 1 {P} of child 1 {BODY} of child 0 {HTML} of document
    10 selection end:   position 79 of child 0 {#text} of child 1 {P} of child 1 {BODY} of child 0 {HTML} of document
     9selection start: position 0 of child 0 {#text} of child 1 {P} of child 1 {BODY} of child 1 {HTML} of document
     10selection end:   position 79 of child 0 {#text} of child 1 {P} of child 1 {BODY} of child 1 {HTML} of document
  • trunk/LayoutTests/platform/mac/fast/selectors/177a-expected.txt

    r25970 r30431  
    77        RenderText {#text} at (0,0) size 283x18
    88          text run at (0,0) width 283: "When you select this text, it shouldn't go red."
    9 selection start: position 0 of child 0 {#text} of child 1 {P} of child 1 {BODY} of child 0 {HTML} of document
    10 selection end:   position 47 of child 0 {#text} of child 1 {P} of child 1 {BODY} of child 0 {HTML} of document
     9selection start: position 0 of child 0 {#text} of child 1 {P} of child 1 {BODY} of child 1 {HTML} of document
     10selection end:   position 47 of child 0 {#text} of child 1 {P} of child 1 {BODY} of child 1 {HTML} of document
  • trunk/LayoutTests/platform/mac/fast/text/selection-hard-linebreak-expected.txt

    r25970 r30431  
    2424          layer at (0,0) size 60x70
    2525            RenderView at (0,0) size 60x70
    26           layer at (0,0) size 60x61
    27             RenderBlock {HTML} at (0,0) size 60x61
    28               RenderBody {BODY} at (8,8) size 44x45
     26          layer at (0,0) size 60x70
     27            RenderBlock {HTML} at (0,0) size 60x70
     28              RenderBody {BODY} at (8,8) size 44x54
    2929                RenderBlock {PRE} at (0,0) size 44x45
    3030                  RenderText {#text} at (0,0) size 24x45
     
    3636          layer at (0,0) size 60x70
    3737            RenderView at (0,0) size 60x70
    38           layer at (0,0) size 60x61
    39             RenderBlock {HTML} at (0,0) size 60x61
    40               RenderBody {BODY} at (8,8) size 44x45
     38          layer at (0,0) size 60x70
     39            RenderBlock {HTML} at (0,0) size 60x70
     40              RenderBody {BODY} at (8,8) size 44x54
    4141                RenderBlock {PRE} at (0,0) size 44x45
    4242                  RenderText {#text} at (0,0) size 24x45
     
    4848          layer at (0,0) size 60x70
    4949            RenderView at (0,0) size 60x70
    50           layer at (0,0) size 60x61
    51             RenderBlock {HTML} at (0,0) size 60x61
    52               RenderBody {BODY} at (8,8) size 44x45
     50          layer at (0,0) size 60x70
     51            RenderBlock {HTML} at (0,0) size 60x70
     52              RenderBody {BODY} at (8,8) size 44x54
    5353                RenderBlock {PRE} at (0,0) size 44x45
    5454                  RenderText {#text} at (0,0) size 24x45
     
    6060          layer at (0,0) size 60x70
    6161            RenderView at (0,0) size 60x70
    62           layer at (0,0) size 60x61
    63             RenderBlock {HTML} at (0,0) size 60x61
    64               RenderBody {BODY} at (8,8) size 44x45
     62          layer at (0,0) size 60x70
     63            RenderBlock {HTML} at (0,0) size 60x70
     64              RenderBody {BODY} at (8,8) size 44x54
    6565                RenderBlock {PRE} at (0,0) size 44x45
    6666                  RenderText {#text} at (0,0) size 24x45
     
    7272          layer at (0,0) size 60x70
    7373            RenderView at (0,0) size 60x70
    74           layer at (0,0) size 60x61
    75             RenderBlock {HTML} at (0,0) size 60x61
    76               RenderBody {BODY} at (8,8) size 44x45
     74          layer at (0,0) size 60x70
     75            RenderBlock {HTML} at (0,0) size 60x70
     76              RenderBody {BODY} at (8,8) size 44x54
    7777                RenderBlock {PRE} at (0,0) size 44x45
    7878                  RenderText {#text} at (0,0) size 24x45
     
    8484          layer at (0,0) size 60x70
    8585            RenderView at (0,0) size 60x70
    86           layer at (0,0) size 60x61
    87             RenderBlock {HTML} at (0,0) size 60x61
    88               RenderBody {BODY} at (8,8) size 44x45
     86          layer at (0,0) size 60x70
     87            RenderBlock {HTML} at (0,0) size 60x70
     88              RenderBody {BODY} at (8,8) size 44x54
    8989                RenderBlock {PRE} at (0,0) size 44x45
    9090                  RenderText {#text} at (0,0) size 24x45
     
    9696          layer at (0,0) size 60x70
    9797            RenderView at (0,0) size 60x70
    98           layer at (0,0) size 60x61
    99             RenderBlock {HTML} at (0,0) size 60x61
    100               RenderBody {BODY} at (8,8) size 44x45
     98          layer at (0,0) size 60x70
     99            RenderBlock {HTML} at (0,0) size 60x70
     100              RenderBody {BODY} at (8,8) size 44x54
    101101                RenderBlock {PRE} at (0,0) size 44x45
    102102                  RenderText {#text} at (0,0) size 24x45
     
    108108          layer at (0,0) size 60x70
    109109            RenderView at (0,0) size 60x70
    110           layer at (0,0) size 60x61
    111             RenderBlock {HTML} at (0,0) size 60x61
    112               RenderBody {BODY} at (8,8) size 44x45
     110          layer at (0,0) size 60x70
     111            RenderBlock {HTML} at (0,0) size 60x70
     112              RenderBody {BODY} at (8,8) size 44x54
    113113                RenderBlock {PRE} at (0,0) size 44x45
    114114                  RenderText {#text} at (0,0) size 24x45
     
    120120          layer at (0,0) size 60x70
    121121            RenderView at (0,0) size 60x70
    122           layer at (0,0) size 60x61
    123             RenderBlock {HTML} at (0,0) size 60x61
    124               RenderBody {BODY} at (8,8) size 44x45
     122          layer at (0,0) size 60x70
     123            RenderBlock {HTML} at (0,0) size 60x70
     124              RenderBody {BODY} at (8,8) size 44x54
    125125                RenderBlock {PRE} at (0,0) size 44x45
    126126                  RenderText {#text} at (0,0) size 24x45
     
    132132          layer at (0,0) size 60x70
    133133            RenderView at (0,0) size 60x70
    134           layer at (0,0) size 60x61
    135             RenderBlock {HTML} at (0,0) size 60x61
    136               RenderBody {BODY} at (8,8) size 44x45
     134          layer at (0,0) size 60x70
     135            RenderBlock {HTML} at (0,0) size 60x70
     136              RenderBody {BODY} at (8,8) size 44x54
    137137                RenderBlock {PRE} at (0,0) size 44x45
    138138                  RenderText {#text} at (0,0) size 24x45
  • trunk/LayoutTests/platform/mac/fast/xsl/document-function-expected.txt

    r25970 r30431  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x152
    4   RenderBlock {HTML} at (0,0) size 800x152
    5     RenderBody {BODY} at (8,16) size 784x120
     3layer at (0,0) size 800x600
     4  RenderBlock {HTML} at (0,0) size 800x600
     5    RenderBody {BODY} at (8,8) size 784x576
    66      RenderBlock {P} at (0,0) size 784x18
    77        RenderText {#text} at (0,0) size 650x18
  • trunk/LayoutTests/platform/mac/fast/xsl/xslt-enc-cyr-expected.txt

    r28014 r30431  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x70
    4   RenderBlock {HTML} at (0,0) size 800x70
    5     RenderBody {BODY} at (8,8) size 784x54
     3layer at (0,0) size 800x600
     4  RenderBlock {HTML} at (0,0) size 800x600
     5    RenderBody {BODY} at (8,8) size 784x584
    66      RenderText {#text} at (0,0) size 318x18
    77        text run at (0,0) width 318: "CHARACTERS IN XSLT: \x{414}\x{43E}\x{431}\x{430}\x{432}\x{43B}\x{435}\x{43D}\x{43D}\x{44B}\x{439} \x{442}\x{435}\x{43A}\x{441}\x{442} "
  • trunk/LayoutTests/platform/mac/fast/xsl/xslt-enc-expected.txt

    r28014 r30431  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x70
    4   RenderBlock {HTML} at (0,0) size 800x70
    5     RenderBody {BODY} at (8,8) size 784x54
     3layer at (0,0) size 800x600
     4  RenderBlock {HTML} at (0,0) size 800x600
     5    RenderBody {BODY} at (8,8) size 784x584
    66      RenderText {#text} at (0,0) size 264x18
    77        text run at (0,0) width 264: "CHARACTERS IN XSLT: \x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9} "
  • trunk/LayoutTests/platform/mac/fast/xsl/xslt-enc16-expected.txt

    r28014 r30431  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x70
    4   RenderBlock {HTML} at (0,0) size 800x70
    5     RenderBody {BODY} at (8,8) size 784x54
     3layer at (0,0) size 800x600
     4  RenderBlock {HTML} at (0,0) size 800x600
     5    RenderBody {BODY} at (8,8) size 784x584
    66      RenderText {#text} at (0,0) size 264x18
    77        text run at (0,0) width 264: "CHARACTERS IN XSLT: \x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9} "
  • trunk/LayoutTests/platform/mac/fast/xsl/xslt-enc16to16-expected.txt

    r28014 r30431  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x70
    4   RenderBlock {HTML} at (0,0) size 800x70
    5     RenderBody {BODY} at (8,8) size 784x54
     3layer at (0,0) size 800x600
     4  RenderBlock {HTML} at (0,0) size 800x600
     5    RenderBody {BODY} at (8,8) size 784x584
    66      RenderText {#text} at (0,0) size 264x18
    77        text run at (0,0) width 264: "CHARACTERS IN XSLT: \x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9} "
  • trunk/LayoutTests/platform/mac/fast/xsl/xslt-import-depth-expected.txt

    r25970 r30431  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x50
    4   RenderBlock {HTML} at (0,0) size 800x50
    5     RenderBody {BODY} at (8,16) size 784x18
     3layer at (0,0) size 800x600
     4  RenderBlock {HTML} at (0,0) size 800x600
     5    RenderBody {BODY} at (8,8) size 784x576
    66      RenderBlock {P} at (0,0) size 784x18
    77        RenderText {#text} at (0,0) size 57x18
  • trunk/LayoutTests/platform/mac/fast/xsl/xslt-relative-path-expected.txt

    r25970 r30431  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x118
    4   RenderBlock {HTML} at (0,0) size 800x118
    5     RenderBody {BODY} at (8,16) size 784x86
     3layer at (0,0) size 800x600
     4  RenderBlock {HTML} at (0,0) size 800x600
     5    RenderBody {BODY} at (8,8) size 784x576
    66      RenderBlock {P} at (0,0) size 784x18
    77        RenderText {#text} at (0,0) size 511x18
  • trunk/LayoutTests/platform/mac/fast/xsl/xslt_unicode-expected.txt

    r25970 r30431  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x34
    4   RenderBlock {HTML} at (0,0) size 800x34
    5     RenderBody {BODY} at (8,8) size 784x18
     3layer at (0,0) size 800x600
     4  RenderBlock {HTML} at (0,0) size 800x600
     5    RenderBody {BODY} at (8,8) size 784x584
    66      RenderText {#text} at (0,0) size 18x18
    77        text run at (0,0) width 18: "e \x{E9}"
  • trunk/LayoutTests/platform/mac/http/tests/local/file-url-sent-as-referer-expected.txt

    r25970 r30431  
    1111        layer at (0,0) size 300x150
    1212          RenderView at (0,0) size 300x150
    13         layer at (0,0) size 300x70
    14           RenderBlock {HTML} at (0,0) size 300x70
    15             RenderBody {BODY} at (8,8) size 284x54
     13        layer at (0,0) size 300x150
     14          RenderBlock {HTML} at (0,0) size 300x150
     15            RenderBody {BODY} at (8,8) size 284x134
    1616              RenderImage {IMG} at (0,0) size 250x50
    1717      RenderText {#text} at (304,176) size 4x18
  • trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug137388-1-expected.txt

    r29039 r30431  
    1111                layer at (0,0) size 304x146
    1212                  RenderView at (0,0) size 304x146
    13                 layer at (0,0) size 304x0
    14                   RenderBlock {HTML} at (0,0) size 304x0
     13                layer at (0,0) size 304x146
     14                  RenderBlock {HTML} at (0,0) size 304x146
    1515              RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug137388-2-expected.txt

    r29039 r30431  
    1111                layer at (0,0) size 304x300
    1212                  RenderView at (0,0) size 304x300
    13                 layer at (0,0) size 304x0
    14                   RenderBlock {HTML} at (0,0) size 304x0
     13                layer at (0,0) size 304x300
     14                  RenderBlock {HTML} at (0,0) size 304x300
    1515              RenderText {#text} at (0,0) size 0x0
    1616      RenderTable {TABLE} at (0,310) size 606x306
     
    2727                layer at (0,0) size 304x146
    2828                  RenderView at (0,0) size 304x146
    29                 layer at (0,0) size 304x0
    30                   RenderBlock {HTML} at (0,0) size 304x0
     29                layer at (0,0) size 304x146
     30                  RenderBlock {HTML} at (0,0) size 304x146
    3131              RenderText {#text} at (0,0) size 0x0
    3232      RenderTable {TABLE} at (0,772) size 606x64
  • trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug137388-3-expected.txt

    r25970 r30431  
    1212                  layer at (0,0) size 200x210
    1313                    RenderView at (0,0) size 200x210
    14                   layer at (0,0) size 200x8
    15                     RenderBlock {HTML} at (0,0) size 200x8
    16                       RenderBody {BODY} at (8,8) size 184x0
     14                  layer at (0,0) size 200x210
     15                    RenderBlock {HTML} at (0,0) size 200x210
     16                      RenderBody {BODY} at (8,8) size 184x194
    1717                RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug38916-expected.txt

    r25970 r30431  
    3434                layer at (0,0) size 125x150
    3535                  RenderView at (0,0) size 125x150
    36                 layer at (0,0) size 125x8
    37                   RenderBlock {HTML} at (0,0) size 125x8
    38                     RenderBody {BODY} at (8,8) size 109x0
     36                layer at (0,0) size 125x150
     37                  RenderBlock {HTML} at (0,0) size 125x150
     38                    RenderBody {BODY} at (8,8) size 109x134
    3939              RenderText {#text} at (0,0) size 0x0
    4040            RenderTableCell {TD} at (724,84) size 41x40 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
     
    104104                layer at (0,0) size 125x150
    105105                  RenderView at (0,0) size 125x150
    106                 layer at (0,0) size 125x8
    107                   RenderBlock {HTML} at (0,0) size 125x8
    108                     RenderBody {BODY} at (8,8) size 109x0
     106                layer at (0,0) size 125x150
     107                  RenderBlock {HTML} at (0,0) size 125x150
     108                    RenderBody {BODY} at (8,8) size 109x134
    109109              RenderText {#text} at (0,0) size 0x0
    110110            RenderTableCell {TD} at (723,84) size 42x40 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
     
    126126                layer at (0,0) size 125x150
    127127                  RenderView at (0,0) size 125x150
    128                 layer at (0,0) size 125x8
    129                   RenderBlock {HTML} at (0,0) size 125x8
    130                     RenderBody {BODY} at (8,8) size 109x0
     128                layer at (0,0) size 125x150
     129                  RenderBlock {HTML} at (0,0) size 125x150
     130                    RenderBody {BODY} at (8,8) size 109x134
    131131              RenderText {#text} at (0,0) size 0x0
    132132            RenderTableCell {TD} at (724,84) size 41x40 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
  • trunk/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_autoFixPer-expected.txt

    r25970 r30431  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x8
    4   RenderBlock {HTML} at (0,0) size 800x8
    5     RenderBody {BODY} at (8,8) size 784x0
     3layer at (0,0) size 800x600
     4  RenderBlock {HTML} at (0,0) size 800x600
     5    RenderBody {BODY} at (8,8) size 784x584
  • trunk/WebCore/ChangeLog

    r30430 r30431  
     12008-02-20  David Hyatt  <hyatt@apple.com>
     2
     3        Fix for bug 12751, doctype nodes aren't part of the Document (Acid3).
     4
     5        Reviewed by Sam Weinig
     6
     7        Many tests added in fast/doctypes.
     8
     9        * dom/DOMImplementation.cpp:
     10        (WebCore::DOMImplementation::createDocument):
     11        (WebCore::DOMImplementation::createHTMLDocument):
     12        * dom/Document.cpp:
     13        (WebCore::Document::Document):
     14        (WebCore::Document::setDocType):
     15        (WebCore::Document::attach):
     16        (WebCore::Document::getImageMap):
     17        * dom/Document.h:
     18        (WebCore::Document::doctype):
     19        (WebCore::Document::):
     20        (WebCore::Document::determineParseMode):
     21        (WebCore::Document::setParseMode):
     22        (WebCore::Document::parseMode):
     23        (WebCore::Document::inCompatMode):
     24        (WebCore::Document::inAlmostStrictMode):
     25        (WebCore::Document::inStrictMode):
     26        * dom/DocumentType.cpp:
     27        (WebCore::DocumentType::cloneNode):
     28        (WebCore::DocumentType::insertedIntoDocument):
     29        (WebCore::DocumentType::removedFromDocument):
     30        * dom/DocumentType.h:
     31        * dom/Node.cpp:
     32        (WebCore::Node::childAllowed):
     33        * dom/StyledElement.cpp:
     34        (WebCore::StyledElement::attributeChanged):
     35        * dom/XMLTokenizer.cpp:
     36        (WebCore::XMLTokenizer::internalSubset):
     37        (WebCore::):
     38        * editing/markup.cpp:
     39        (WebCore::appendStartMarkup):
     40        * html/HTMLAppletElement.cpp:
     41        (WebCore::HTMLAppletElement::createRenderer):
     42        * html/HTMLDocument.cpp:
     43        (WebCore::HTMLDocument::HTMLDocument):
     44        (WebCore::HTMLDocument::childAllowed):
     45        (WebCore::HTMLDocument::determineParseMode):
     46        * html/HTMLDocument.h:
     47        * html/HTMLMapElement.cpp:
     48        (WebCore::HTMLMapElement::parseMappedAttribute):
     49        * html/HTMLParamElement.cpp:
     50        (WebCore::HTMLParamElement::parseMappedAttribute):
     51        * html/HTMLParser.cpp:
     52        (WebCore::HTMLParser::parseDoctypeToken):
     53        * html/HTMLParser.h:
     54        * html/HTMLTokenizer.cpp:
     55        (WebCore::HTMLTokenizer::reset):
     56        (WebCore::HTMLTokenizer::parseDoctype):
     57        (WebCore::HTMLTokenizer::parseTag):
     58        (WebCore::HTMLTokenizer::write):
     59        (WebCore::HTMLTokenizer::finish):
     60        (WebCore::HTMLTokenizer::processDoctypeToken):
     61        * html/HTMLTokenizer.h:
     62        (WebCore::):
     63        (WebCore::DoctypeToken::DoctypeToken):
     64        (WebCore::DoctypeToken::reset):
     65        (WebCore::DoctypeToken::state):
     66        (WebCore::DoctypeToken::setState):
     67        (WebCore::HTMLTokenizer::State::inDoctype):
     68        (WebCore::HTMLTokenizer::State::setInDoctype):
     69        (WebCore::HTMLTokenizer::State::needsSpecialWriteHandling):
     70        (WebCore::HTMLTokenizer::State::):
     71        * html/HTMLViewSourceDocument.cpp:
     72        (WebCore::HTMLViewSourceDocument::addViewSourceToken):
     73        (WebCore::HTMLViewSourceDocument::addViewSourceDoctypeToken):
     74        * html/HTMLViewSourceDocument.h:
     75        * loader/FrameLoader.cpp:
     76        (WebCore::FrameLoader::write):
     77        (WebCore::FrameLoader::switchOutLowBandwidthDisplayIfReady):
     78        * page/Frame.cpp:
     79        (WebCore::Frame::documentTypeString):
     80        * page/inspector/utilities.js:
     81        * xml/XSLTProcessor.cpp:
     82        (WebCore::XSLTProcessor::createDocumentFromSource):
     83
    1842008-02-20  Anders Carlsson  <andersca@apple.com>
    285
  • trunk/WebCore/dom/DOMImplementation.cpp

    r30015 r30431  
    285285
    286286    // now get the interesting parts of the doctype
    287     if (doctype) {
    288         doc->setDocType(doctype);
    289         doctype->setDocument(doc.get());
    290     }
     287    if (doctype)
     288        doc->addChild(doctype);
    291289
    292290    if (!qualifiedName.isEmpty())
     
    348346    RefPtr<HTMLDocument> d = new HTMLDocument(this, 0);
    349347    d->open();
    350     d->write("<html><head><title>" + title + "</title></head><body></body></html>");
     348    d->write("<!doctype html><html><head><title>" + title + "</title></head><body></body></html>");
    351349    return d.release();
    352350}
  • trunk/WebCore/dom/Document.cpp

    r30419 r30431  
    319319    m_wellFormed = false;
    320320
    321     pMode = Strict;
    322     hMode = XHtml;
     321    setParseMode(Strict);
     322
    323323    m_textColor = Color::black;
    324324    m_listenerTypes = 0;
     
    331331    m_usesFirstLetterRules = false;
    332332    m_gotoAnchorNeededAfterStylesheetsLoad = false;
    333 
    334     bool matchAuthorAndUserStyles = true;
    335     if (Settings* settings = this->settings())
    336         matchAuthorAndUserStyles = settings->authorAndUserStylesEnabled();
    337     m_styleSelector = new CSSStyleSelector(this, userStyleSheet(), m_styleSheets.get(), m_mappedElementSheet.get(), !inCompatMode(), matchAuthorAndUserStyles);
    338 
     333 
     334    m_styleSelector = 0;
    339335    m_didCalculateStyleSelector = false;
    340336    m_pendingStylesheets = 0;
     
    476472void Document::setDocType(PassRefPtr<DocumentType> docType)
    477473{
     474    // This should never be called more than once.
     475    // Note: This is not a public DOM method and can only be called by the parser.
     476    ASSERT(!m_docType || !docType);
     477    if (m_docType && docType)
     478        return;
    478479    m_docType = docType;
    479 }
    480 
    481 DocumentType *Document::doctype() const
    482 {
    483     return m_docType.get();
     480    if (m_docType)
     481        m_docType->setDocument(this);
     482    determineParseMode();
    484483}
    485484
     
    12091208    setRenderer(new (m_renderArena) RenderView(this, view()));
    12101209
     1210    if (!m_styleSelector) {
     1211        bool matchAuthorAndUserStyles = true;
     1212        if (Settings* docSettings = settings())
     1213            matchAuthorAndUserStyles = docSettings->authorAndUserStylesEnabled();
     1214        m_styleSelector = new CSSStyleSelector(this, userStyleSheet(), m_styleSheets.get(), m_mappedElementSheet.get(), !inCompatMode(), matchAuthorAndUserStyles);
     1215        m_styleSelector->setEncodedURL(m_url);
     1216        m_didCalculateStyleSelector = true;
     1217    }
     1218
    12111219    recalcStyle(Force);
    12121220
     
    17011709        m_mappedElementSheet = new CSSStyleSheet(this, baseURL().string());
    17021710    return m_mappedElementSheet.get();
    1703 }
    1704 
    1705 void Document::determineParseMode(const String&)
    1706 {
    1707     // For XML documents use strict parse mode.
    1708     // HTML overrides this method to determine the parse mode.
    1709     pMode = Strict;
    1710     hMode = XHtml;
    17111711}
    17121712
     
    27732773    int hashPos = url.find('#');
    27742774    String name = (hashPos < 0 ? url : url.substring(hashPos + 1)).impl();
    2775     AtomicString mapName = hMode == XHtml ? name : name.lower();
     2775    AtomicString mapName = isHTMLDocument() ? name.lower() : name;
    27762776    return m_imageMapsByName.get(mapName.impl());
    27772777}
  • trunk/WebCore/dom/Document.h

    r30331 r30431  
    180180    // DOM methods & attributes for Document
    181181
    182     virtual DocumentType* doctype() const; // May return 0 for HTML documents
    183     DocumentType* realDocType() const { return m_docType.get(); }
     182    DocumentType* doctype() const { return m_docType.get(); }
    184183
    185184    DOMImplementation* implementation() const;
     
    403402
    404403    enum ParseMode { Compat, AlmostStrict, Strict };
    405    
    406     virtual void determineParseMode(const String&);
    407     void setParseMode(ParseMode m) { pMode = m; }
    408     ParseMode parseMode() const { return pMode; }
    409 
    410     bool inCompatMode() const { return pMode == Compat; }
    411     bool inAlmostStrictMode() const { return pMode == AlmostStrict; }
    412     bool inStrictMode() const { return pMode == Strict; }
    413    
    414     enum HTMLMode { Html3, Html4, XHtml };
    415 
    416     void setHTMLMode(HTMLMode m) { hMode = m; }
    417     HTMLMode htmlMode() const { return hMode; }
    418 
     404
     405private:
     406    virtual void determineParseMode() {}
     407   
     408public:
     409    void setParseMode(ParseMode m) { m_parseMode = m; }
     410    ParseMode parseMode() const { return m_parseMode; }
     411
     412    bool inCompatMode() const { return m_parseMode == Compat; }
     413    bool inAlmostStrictMode() const { return m_parseMode == AlmostStrict; }
     414    bool inStrictMode() const { return m_parseMode == Strict; }
     415   
    419416    void setParsing(bool);
    420417    bool parsing() const { return m_bParsing; }
     
    736733    bool m_printing;
    737734
    738     ParseMode pMode;
    739     HTMLMode hMode;
     735    ParseMode m_parseMode;
    740736
    741737    Color m_textColor;
  • trunk/WebCore/dom/DocumentType.cpp

    r30243 r30431  
    101101PassRefPtr<Node> DocumentType::cloneNode(bool /*deep*/)
    102102{
    103     // The DOM Level 2 specification says cloning DocumentType nodes is "implementation dependent".
    104     // For now, we do not support it.
    105     return 0;
     103    return new DocumentType(document(), m_name, m_publicId, m_systemId);
     104}
     105
     106void DocumentType::insertedIntoDocument()
     107{
     108    // Our document node can be null if we were created by a DOMImplementation.  We use the parent() instead.
     109    ASSERT(parent() && parent()->isDocumentNode());
     110    if (parent() && parent()->isDocumentNode()) {
     111        Document* doc = static_cast<Document*>(parent());
     112        if (!doc->doctype())
     113            doc->setDocType(this);
     114    }
     115    Node::insertedIntoDocument();
     116}
     117
     118void DocumentType::removedFromDocument()
     119{
     120    if (document() && document()->doctype() == this)
     121        document()->setDocType(0);
     122    Node::removedFromDocument();
    106123}
    107124
  • trunk/WebCore/dom/DocumentType.h

    r30243 r30431  
    5959    virtual String toString() const;
    6060
     61    virtual void insertedIntoDocument();
     62    virtual void removedFromDocument();
     63
    6164private:
    6265    RefPtr<DOMImplementation> m_implementation;
  • trunk/WebCore/dom/Node.cpp

    r30415 r30431  
    736736}
    737737
    738 bool Node::childAllowed( Node *newChild )
     738bool Node::childAllowed(Node* newChild)
    739739{
    740740    return childTypeAllowed(newChild->nodeType());
  • trunk/WebCore/dom/StyledElement.cpp

    r30112 r30431  
    173173        parseMappedAttribute(mappedAttr);
    174174
    175     if (entry == eNone && ownerDocument()->styleSelector()->hasSelectorForAttribute(attr->name().localName()))
     175    if (entry == eNone && ownerDocument()->attached() && ownerDocument()->styleSelector()->hasSelectorForAttribute(attr->name().localName()))
    176176        setChanged();
    177177
  • trunk/WebCore/dom/XMLTokenizer.cpp

    r30244 r30431  
    10091009    }
    10101010   
    1011     Document* doc = m_doc;
    1012     if (!doc)
    1013         return;
    1014 
    1015     doc->setDocType(new DocumentType(doc, toString(name), toString(externalID), toString(systemID)));
     1011    if (m_doc)
     1012        m_doc->addChild(new DocumentType(m_doc, toString(name), toString(externalID), toString(systemID)));
    10161013}
    10171014
     
    20992096    }
    21002097    if (!m_parsingFragment)
    2101         m_doc->setDocType(new DocumentType(m_doc, name, publicId, systemId));
    2102    
    2103 }
    2104 #endif
    2105 }
    2106 
    2107 
     2098        m_doc->addChild(new DocumentType(m_doc, name, publicId, systemId));
     2099   
     2100}
     2101#endif
     2102}
     2103
     2104
  • trunk/WebCore/editing/markup.cpp

    r30377 r30431  
    369369            append(result, static_cast<const Comment*>(node)->toString());
    370370            break;
    371         case Node::DOCUMENT_NODE: {
    372             // FIXME: I think the comment below (and therefore this code) is wrong now
    373             // Documents do not normally contain a docType as a child node, force it to print here instead.
    374             const DocumentType* docType = static_cast<const Document*>(node)->doctype();
    375             if (docType)
    376                 append(result, docType->toString());
    377             break;
    378         }
     371        case Node::DOCUMENT_NODE:
    379372        case Node::DOCUMENT_FRAGMENT_NODE:
    380373            break;
  • trunk/WebCore/html/HTMLAppletElement.cpp

    r30243 r30431  
    118118        if(!codeBase.isNull())
    119119            args.set("codeBase", codeBase);
    120         const AtomicString& name = getAttribute(document()->htmlMode() != Document::XHtml ? nameAttr : idAttr);
     120        const AtomicString& name = getAttribute(document()->isHTMLDocument() ? nameAttr : idAttr);
    121121        if (!name.isNull())
    122122            args.set("name", name);
  • trunk/WebCore/html/HTMLDocument.cpp

    r26510 r30431  
    8383{
    8484    clearXMLVersion();
     85    setParseMode(Compat);
    8586}
    8687
     
    274275bool HTMLDocument::childAllowed(Node *newChild)
    275276{
    276     return newChild->hasTagName(htmlTag) || newChild->isCommentNode();
     277    return newChild->hasTagName(htmlTag) || newChild->isCommentNode() || (newChild->nodeType() == DOCUMENT_TYPE_NODE && !doctype());
    277278}
    278279
     
    347348}
    348349
    349 const int PARSEMODE_HAVE_DOCTYPE        =       (1<<0);
    350 const int PARSEMODE_HAVE_PUBLIC_ID      =       (1<<1);
    351 const int PARSEMODE_HAVE_SYSTEM_ID      =       (1<<2);
    352 const int PARSEMODE_HAVE_INTERNAL       =       (1<<3);
    353 
    354 static int parseDocTypePart(const String& buffer, int index)
    355 {
    356     while (true) {
    357         UChar ch = buffer[index];
    358         if (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r')
    359             ++index;
    360         else if (ch == '-') {
    361             int tmpIndex=index;
    362             if (buffer[index+1] == '-' &&
    363                 ((tmpIndex=buffer.find("--", index+2)) != -1))
    364                 index = tmpIndex+2;
    365             else
    366                 return index;
    367         }
    368         else
    369             return index;
    370     }
    371 }
    372 
    373 static bool containsString(const char* str, const String& buffer, int offset)
    374 {
    375     String startString(str);
    376     if (offset + startString.length() > buffer.length())
    377         return false;
    378    
    379     String bufferString = buffer.substring(offset, startString.length()).lower();
    380     String lowerStart = startString.lower();
    381 
    382     return bufferString.startsWith(lowerStart);
    383 }
    384 
    385 static bool parseDocTypeDeclaration(const String& buffer,
    386                                     int* resultFlags,
    387                                     String& name,
    388                                     String& publicID,
    389                                     String& systemID)
    390 {
    391     bool haveDocType = false;
    392     *resultFlags = 0;
    393 
    394     // Skip through any comments and processing instructions.
    395     int index = 0;
    396     do {
    397         index = buffer.find('<', index);
    398         if (index == -1) break;
    399         UChar nextChar = buffer[index+1];
    400         if (nextChar == '!') {
    401             if (containsString("doctype", buffer, index+2)) {
    402                 haveDocType = true;
    403                 index += 9; // Skip "<!DOCTYPE"
    404                 break;
    405             }
    406             index = parseDocTypePart(buffer,index);
    407             index = buffer.find('>', index);
    408         }
    409         else if (nextChar == '?')
    410             index = buffer.find('>', index);
    411         else
    412             break;
    413     } while (index != -1);
    414 
    415     if (!haveDocType)
    416         return true;
    417     *resultFlags |= PARSEMODE_HAVE_DOCTYPE;
    418 
    419     index = parseDocTypePart(buffer, index);
    420     if (!containsString("html", buffer, index))
    421         return false;
    422    
    423     name = buffer.substring(index, 4);
    424     index = parseDocTypePart(buffer, index+4);
    425     bool hasPublic = containsString("public", buffer, index);
    426     if (hasPublic) {
    427         index = parseDocTypePart(buffer, index+6);
    428 
    429         // We've read <!DOCTYPE HTML PUBLIC (not case sensitive).
    430         // Now we find the beginning and end of the public identifers
    431         // and system identifiers (assuming they're even present).
    432         UChar theChar = buffer[index];
    433         if (theChar != '\"' && theChar != '\'')
    434             return false;
    435        
    436         // |start| is the first character (after the quote) and |end|
    437         // is the final quote, so there are |end|-|start| characters.
    438         int publicIDStart = index+1;
    439         int publicIDEnd = buffer.find(theChar, publicIDStart);
    440         if (publicIDEnd == -1)
    441             return false;
    442         index = parseDocTypePart(buffer, publicIDEnd+1);
    443         UChar next = buffer[index];
    444         if (next == '>') {
    445             // Public identifier present, but no system identifier.
    446             // Do nothing.  Note that this is the most common
    447             // case.
    448         }
    449         else if (next == '\"' || next == '\'') {
    450             // We have a system identifier.
    451             *resultFlags |= PARSEMODE_HAVE_SYSTEM_ID;
    452             int systemIDStart = index+1;
    453             int systemIDEnd = buffer.find(next, systemIDStart);
    454             if (systemIDEnd == -1)
    455                 return false;
    456             systemID = buffer.substring(systemIDStart, systemIDEnd - systemIDStart);
    457         }
    458         else if (next == '[') {
    459             // We found an internal subset.
    460             *resultFlags |= PARSEMODE_HAVE_INTERNAL;
    461         }
    462         else
    463             return false; // Something's wrong.
    464 
    465         // We need to trim whitespace off the public identifier.
    466         publicID = buffer.substring(publicIDStart, publicIDEnd - publicIDStart);
    467         publicID = publicID.stripWhiteSpace();
    468         *resultFlags |= PARSEMODE_HAVE_PUBLIC_ID;
    469     } else {
    470         if (containsString("system", buffer, index)) {
    471             // Doctype has a system ID but no public ID
    472             *resultFlags |= PARSEMODE_HAVE_SYSTEM_ID;
    473             index = parseDocTypePart(buffer, index+6);
    474             UChar next = buffer[index];
    475             if (next != '\"' && next != '\'')
    476                 return false;
    477             int systemIDStart = index+1;
    478             int systemIDEnd = buffer.find(next, systemIDStart);
    479             if (systemIDEnd == -1)
    480                 return false;
    481             systemID = buffer.substring(systemIDStart, systemIDEnd - systemIDStart);
    482             index = parseDocTypePart(buffer, systemIDEnd+1);
    483         }
    484 
    485         UChar nextChar = buffer[index];
    486         if (nextChar == '[')
    487             *resultFlags |= PARSEMODE_HAVE_INTERNAL;
    488         else if (nextChar != '>')
    489             return false;
    490     }
    491 
    492     return true;
    493 }
    494 
    495 void HTMLDocument::determineParseMode(const String& str)
    496 {
     350void HTMLDocument::determineParseMode()
     351{
     352    // FIXME: It's terrible that this code runs separately and isn't just built in to the
     353    // HTML tokenizer/parser.
     354
    497355    // This code more or less mimics Mozilla's implementation (specifically the
    498356    // doctype parsing implemented by David Baron in Mozilla's nsParser.cpp).
    499357    //
    500358    // There are three possible parse modes:
    501     // COMPAT - quirks mode emulates WinIE
    502     // and NS4.  CSS parsing is also relaxed in this mode, e.g., unit types can
     359    // COMPAT - quirks mode emulates WinIE and NS4.  CSS parsing is also relaxed in this mode, e.g., unit types can
    503360    // be omitted from numbers.
    504     // ALMOST STRICT - This mode is identical to strict mode
    505     // except for its treatment of line-height in the inline box model.  For
    506     // now (until the inline box model is re-written), this mode is identical
    507     // to STANDARDS mode.
    508     // STRICT - no quirks apply.  Web pages will obey the specifications to
    509     // the letter.
    510 
    511     String name, systemID, publicID;
    512     int resultFlags = 0;
    513     if (parseDocTypeDeclaration(str, &resultFlags, name, publicID, systemID)) {
    514         if (resultFlags & PARSEMODE_HAVE_DOCTYPE)
    515             setDocType(new DocumentType(this, name, publicID, systemID));
    516         if (!(resultFlags & PARSEMODE_HAVE_DOCTYPE)) {
    517             // No doctype found at all.  Default to quirks mode and Html4.
    518             setParseMode(Compat);
    519             setHTMLMode(Html4);
    520         }
    521         else if ((resultFlags & PARSEMODE_HAVE_INTERNAL) ||
    522                  !(resultFlags & PARSEMODE_HAVE_PUBLIC_ID)) {
    523             // Internal subsets always denote full standards, as does
    524             // a doctype without a public ID.
     361    // ALMOST STRICT - This mode is identical to strict mode except for its treatment of line-height in the inline box model.  For
     362    // now (until the inline box model is re-written), this mode is identical to STANDARDS mode.
     363    // STRICT - no quirks apply.  Web pages will obey the specifications to the letter.
     364    bool wasInCompatMode = inCompatMode();
     365    DocumentType* docType = doctype();
     366    if (!docType || !equalIgnoringCase(docType->name(), "html"))
     367        // No doctype found at all or the doctype is not HTML.  Default to quirks mode and Html4.
     368        setParseMode(Compat);
     369    else if (!doctype()->systemId().isEmpty() && equalIgnoringCase(docType->systemId(), "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd"))
     370        // Assume quirks mode for this particular system ID.  In the HTML5 spec, this is the only
     371        // system identifier that is examined.
     372        setParseMode(Compat);
     373    else if (docType->publicId().isEmpty())
     374        // A doctype without a public ID means use strict mode.
     375        setParseMode(Strict);
     376    else {
     377        // We have to check a list of public IDs to see what we
     378        // should do.
     379        String lowerPubID = docType->publicId().lower();
     380        CString pubIDStr = lowerPubID.latin1();
     381       
     382        // Look up the entry in our gperf-generated table.
     383        const PubIDInfo* doctypeEntry = findDoctypeEntry(pubIDStr.data(), pubIDStr.length());
     384        if (!doctypeEntry)
     385            // The DOCTYPE is not in the list.  Assume strict mode.
    525386            setParseMode(Strict);
    526             setHTMLMode(Html4);
    527         }
    528387        else {
    529             // We have to check a list of public IDs to see what we
    530             // should do.
    531             String lowerPubID = publicID.lower();
    532             CString pubIDStr = lowerPubID.latin1();
    533            
    534             // Look up the entry in our gperf-generated table.
    535             const PubIDInfo* doctypeEntry = findDoctypeEntry(pubIDStr.data(), pubIDStr.length());
    536             if (!doctypeEntry) {
    537                 // The DOCTYPE is not in the list.  Assume strict mode.
    538                 setParseMode(Strict);
    539                 setHTMLMode(Html4);
    540                 return;
    541             }
    542 
    543             switch ((resultFlags & PARSEMODE_HAVE_SYSTEM_ID) ?
    544                     doctypeEntry->mode_if_sysid :
    545                     doctypeEntry->mode_if_no_sysid)
    546             {
     388            switch (docType->systemId().isEmpty() ?
     389                    doctypeEntry->mode_if_no_sysid :
     390                    doctypeEntry->mode_if_sysid) {
    547391                case PubIDInfo::eQuirks3:
    548                     setParseMode(Compat);
    549                     setHTMLMode(Html3);
    550                     break;
    551392                case PubIDInfo::eQuirks:
    552393                    setParseMode(Compat);
    553                     setHTMLMode(Html4);
    554394                    break;
    555395                case PubIDInfo::eAlmostStandards:
    556396                    setParseMode(AlmostStrict);
    557                     setHTMLMode(Html4);
    558397                    break;
    559398                 default:
    560399                    ASSERT(false);
    561400            }
    562         }   
     401        }
    563402    }
    564     else {
    565         // Malformed doctype implies quirks mode.
    566         setParseMode(Compat);
    567         setHTMLMode(Html3);
    568     }
    569  
    570     styleSelector()->strictParsing = !inCompatMode();
    571  
    572 }
    573403   
    574 }
     404    if (inCompatMode() != wasInCompatMode)
     405        updateStyleSelector();
     406}
     407   
     408}
  • trunk/WebCore/html/HTMLDocument.h

    r26510 r30431  
    7070    virtual PassRefPtr<Element> createElement(const String& tagName, ExceptionCode&);
    7171
    72     virtual void determineParseMode(const String&);
    73 
    7472    void addNamedItem(const String& name);
    7573    void removeNamedItem(const String& name);
     
    8381
    8482private:
     83    virtual void determineParseMode();
     84
     85private:
    8586    NameCountMap namedItemCounts;
    8687    NameCountMap docExtraNamedItemCounts;
  • trunk/WebCore/html/HTMLMapElement.cpp

    r27800 r30431  
    8181            // Call base class so that hasID bit gets set.
    8282            HTMLElement::parseMappedAttribute(attr);
    83             if (doc->htmlMode() != Document::XHtml)
     83            if (doc->isHTMLDocument())
    8484                return;
    8585        }
     
    8888        if (mapName[0] == '#')
    8989            mapName = mapName.substring(1);
    90         m_name = doc->htmlMode() == Document::XHtml ? mapName : mapName.lower();
     90        m_name = doc->isHTMLDocument() ? mapName.lower() : mapName;
    9191        doc->addImageMap(this);
    9292    } else
  • trunk/WebCore/html/HTMLParamElement.cpp

    r25754 r30431  
    4646        // Must call base class so that hasID bit gets set.
    4747        HTMLElement::parseMappedAttribute(attr);
    48         if (document()->htmlMode() != Document::XHtml)
     48        if (document()->isHTMLDocument())
    4949            return;
    5050        m_name = attr->value();
  • trunk/WebCore/html/HTMLParser.cpp

    r30243 r30431  
    3030#include "Comment.h"
    3131#include "DocumentFragment.h"
     32#include "DocumentType.h"
    3233#include "Frame.h"
    3334#include "HTMLBodyElement.h"
     
    270271    }
    271272    return n;
     273}
     274
     275void HTMLParser::parseDoctypeToken(DoctypeToken* t)
     276{
     277    // Ignore any doctype after the first.  Ignore doctypes in fragments.
     278    if (document->doctype() || m_isParsingFragment || current != document)
     279        return;
     280       
     281    // Make a new doctype node and set it as our doctype.
     282    document->addChild(new DocumentType(document, String::adopt(t->m_name), String::adopt(t->m_publicID), String::adopt(t->m_systemID)));
    272283}
    273284
  • trunk/WebCore/html/HTMLParser.h

    r25754 r30431  
    3232namespace WebCore {
    3333
     34class DoctypeToken;
    3435class Document;
    3536class DocumentFragment;
     
    5859    PassRefPtr<Node> parseToken(Token*);
    5960   
     61    // Parses a doctype token.
     62    void parseDoctypeToken(DoctypeToken*);
     63
    6064    /**
    6165     * tokenizer says it's not going to be sending us any more tokens
  • trunk/WebCore/html/HTMLTokenizer.cpp

    r30325 r30431  
    8181
    8282static const char commentStart [] = "<!--";
     83static const char doctypeStart [] = "<!doctype";
     84static const char publicStart [] = "public";
     85static const char systemStart [] = "system";
    8386static const char scriptEnd [] = "</script";
    8487static const char xmpEnd [] = "</xmp";
     
    223226
    224227    currToken.reset();
     228    m_doctypeToken.reset();
     229    m_doctypeSearchCount = 0;
     230    m_doctypeSecondarySearchCount = 0;
    225231}
    226232
     
    845851}
    846852
     853HTMLTokenizer::State HTMLTokenizer::parseDoctype(SegmentedString& src, State state)
     854{
     855    ASSERT(state.inDoctype());
     856    while (!src.isEmpty() && state.inDoctype()) {
     857        UChar c = *src;
     858        bool isWhitespace = c == '\r' || c == '\n' || c == '\t' || c == ' ';
     859        switch (m_doctypeToken.state()) {
     860            case DoctypeBegin: {
     861                m_doctypeToken.setState(DoctypeBeforeName);
     862                if (isWhitespace) {
     863                    src.advance(m_lineNumber);
     864                    if (inViewSourceMode())
     865                        m_doctypeToken.m_source.append(c);
     866                }
     867                break;
     868            }
     869            case DoctypeBeforeName: {
     870                if (c == '>') {
     871                    // Malformed.  Just exit.
     872                    src.advancePastNonNewline();
     873                    state.setInDoctype(false);
     874                    if (inViewSourceMode())
     875                        processDoctypeToken();
     876                } else if (isWhitespace) {
     877                    src.advance(m_lineNumber);
     878                    if (inViewSourceMode())
     879                        m_doctypeToken.m_source.append(c);
     880                } else
     881                    m_doctypeToken.setState(DoctypeName);
     882                break;
     883            }
     884            case DoctypeName: {
     885                if (c == '>') {
     886                    // Valid doctype. Emit it.
     887                    src.advancePastNonNewline();
     888                    state.setInDoctype(false);
     889                    processDoctypeToken();
     890                } else if (isWhitespace) {
     891                    m_doctypeSearchCount = 0; // Used now to scan for PUBLIC
     892                    m_doctypeSecondarySearchCount = 0; // Used now to scan for SYSTEM
     893                    m_doctypeToken.setState(DoctypeAfterName);
     894                    src.advance(m_lineNumber);
     895                    if (inViewSourceMode())
     896                        m_doctypeToken.m_source.append(c);
     897                } else {
     898                    src.advancePastNonNewline();
     899                    m_doctypeToken.m_name.append(c);
     900                    if (inViewSourceMode())
     901                        m_doctypeToken.m_source.append(c);
     902                }
     903                break;
     904            }
     905            case DoctypeAfterName: {
     906                if (c == '>') {
     907                    // Valid doctype. Emit it.
     908                    src.advancePastNonNewline();
     909                    state.setInDoctype(false);
     910                    processDoctypeToken();
     911                } else if (!isWhitespace) {
     912                    src.advancePastNonNewline();
     913                    if (toASCIILower(c) == publicStart[m_doctypeSearchCount]) {
     914                        m_doctypeSearchCount++;
     915                        if (m_doctypeSearchCount == 6)
     916                            // Found 'PUBLIC' sequence
     917                            m_doctypeToken.setState(DoctypeBeforePublicID);
     918                    } else if (m_doctypeSearchCount > 0) {
     919                        m_doctypeSearchCount = 0;
     920                        m_doctypeToken.setState(DoctypeBogus);
     921                    } else if (toASCIILower(c) == systemStart[m_doctypeSecondarySearchCount]) {
     922                        m_doctypeSecondarySearchCount++;
     923                        if (m_doctypeSecondarySearchCount == 6)
     924                            // Found 'SYSTEM' sequence
     925                            m_doctypeToken.setState(DoctypeBeforeSystemID);
     926                    } else {
     927                        m_doctypeSecondarySearchCount = 0;
     928                        m_doctypeToken.setState(DoctypeBogus);
     929                    }
     930                    if (inViewSourceMode())
     931                        m_doctypeToken.m_source.append(c);
     932                } else {
     933                    src.advance(m_lineNumber); // Whitespace keeps us in the after name state.
     934                    if (inViewSourceMode())
     935                        m_doctypeToken.m_source.append(c);
     936                }
     937                break;
     938            }
     939            case DoctypeBeforePublicID: {
     940                if (c == '\"' || c == '\'') {
     941                    tquote = c == '\"' ? DoubleQuote : SingleQuote;
     942                    m_doctypeToken.setState(DoctypePublicID);
     943                    src.advancePastNonNewline();
     944                    if (inViewSourceMode())
     945                        m_doctypeToken.m_source.append(c);
     946                } else if (c == '>') {
     947                    // Considered bogus.  Don't process the doctype.
     948                    src.advancePastNonNewline();
     949                    state.setInDoctype(false);
     950                    if (inViewSourceMode())
     951                        processDoctypeToken();
     952                } else if (isWhitespace) {
     953                    src.advance(m_lineNumber);
     954                    if (inViewSourceMode())
     955                        m_doctypeToken.m_source.append(c);
     956                } else
     957                    m_doctypeToken.setState(DoctypeBogus);
     958                break;
     959            }
     960            case DoctypePublicID: {
     961                if ((c == '\"' && tquote == DoubleQuote) || (c == '\'' && tquote == SingleQuote)) {
     962                    src.advancePastNonNewline();
     963                    m_doctypeToken.setState(DoctypeAfterPublicID);
     964                    if (inViewSourceMode())
     965                        m_doctypeToken.m_source.append(c);
     966                } else if (c == '>') {
     967                     // Considered bogus.  Don't process the doctype.
     968                    src.advancePastNonNewline();
     969                    state.setInDoctype(false);
     970                    if (inViewSourceMode())
     971                        processDoctypeToken();
     972                } else {
     973                    m_doctypeToken.m_publicID.append(c);
     974                    src.advance(m_lineNumber);
     975                    if (inViewSourceMode())
     976                        m_doctypeToken.m_source.append(c);
     977                }
     978                break;
     979            }
     980            case DoctypeAfterPublicID:
     981                if (c == '\"' || c == '\'') {
     982                    tquote = c == '\"' ? DoubleQuote : SingleQuote;
     983                    m_doctypeToken.setState(DoctypeSystemID);
     984                    src.advancePastNonNewline();
     985                    if (inViewSourceMode())
     986                        m_doctypeToken.m_source.append(c);
     987                } else if (c == '>') {
     988                    // Valid doctype. Emit it now.
     989                    src.advancePastNonNewline();
     990                    state.setInDoctype(false);
     991                    processDoctypeToken();
     992                } else if (isWhitespace) {
     993                    src.advance(m_lineNumber);
     994                    if (inViewSourceMode())
     995                        m_doctypeToken.m_source.append(c);
     996                } else
     997                    m_doctypeToken.setState(DoctypeBogus);
     998                break;
     999            case DoctypeBeforeSystemID:
     1000                if (c == '\"' || c == '\'') {
     1001                    tquote = c == '\"' ? DoubleQuote : SingleQuote;
     1002                    m_doctypeToken.setState(DoctypeSystemID);
     1003                    src.advancePastNonNewline();
     1004                    if (inViewSourceMode())
     1005                        m_doctypeToken.m_source.append(c);
     1006                } else if (c == '>') {
     1007                    // Considered bogus.  Don't process the doctype.
     1008                    src.advancePastNonNewline();
     1009                    state.setInDoctype(false);
     1010                } else if (isWhitespace) {
     1011                    src.advance(m_lineNumber);
     1012                    if (inViewSourceMode())
     1013                        m_doctypeToken.m_source.append(c);
     1014                } else
     1015                    m_doctypeToken.setState(DoctypeBogus);
     1016                break;
     1017            case DoctypeSystemID:
     1018                if ((c == '\"' && tquote == DoubleQuote) || (c == '\'' && tquote == SingleQuote)) {
     1019                    src.advancePastNonNewline();
     1020                    m_doctypeToken.setState(DoctypeAfterSystemID);
     1021                    if (inViewSourceMode())
     1022                        m_doctypeToken.m_source.append(c);
     1023                } else if (c == '>') {
     1024                     // Considered bogus.  Don't process the doctype.
     1025                    src.advancePastNonNewline();
     1026                    state.setInDoctype(false);
     1027                    if (inViewSourceMode())
     1028                        processDoctypeToken();
     1029                } else {
     1030                    m_doctypeToken.m_systemID.append(c);
     1031                    src.advance(m_lineNumber);
     1032                    if (inViewSourceMode())
     1033                        m_doctypeToken.m_source.append(c);
     1034                }
     1035                break;
     1036            case DoctypeAfterSystemID:
     1037                if (c == '>') {
     1038                    // Valid doctype. Emit it now.
     1039                    src.advancePastNonNewline();
     1040                    state.setInDoctype(false);
     1041                    processDoctypeToken();
     1042                } else if (isWhitespace) {
     1043                    src.advance(m_lineNumber);
     1044                    if (inViewSourceMode())
     1045                        m_doctypeToken.m_source.append(c);
     1046                } else
     1047                    m_doctypeToken.setState(DoctypeBogus);
     1048                break;
     1049            case DoctypeBogus:
     1050                if (c == '>') {
     1051                    // Done with the bogus doctype.
     1052                    src.advancePastNonNewline();
     1053                    state.setInDoctype(false);
     1054                    if (inViewSourceMode())
     1055                       processDoctypeToken();
     1056                } else {
     1057                    src.advance(m_lineNumber); // Just keep scanning for '>'
     1058                    if (inViewSourceMode())
     1059                        m_doctypeToken.m_source.append(c);
     1060                }
     1061                break;
     1062            default:
     1063                break;
     1064        }
     1065    }
     1066    return state;
     1067}
     1068
    8471069HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
    8481070{
     
    8631085        case TagName:
    8641086        {
    865 #if defined(TOKEN_DEBUG) && TOKEN_DEBUG > 1
    866             qDebug("TagName");
    867 #endif
    868             if (searchCount > 0)
    869             {
    870                 if (*src == commentStart[searchCount])
    871                 {
     1087            if (searchCount > 0) {
     1088                if (*src == commentStart[searchCount]) {
    8721089                    searchCount++;
    873                     if (searchCount == 4)
    874                     {
    875 #ifdef TOKEN_DEBUG
    876                         kdDebug( 6036 ) << "Found comment" << endl;
    877 #endif
     1090                    if (searchCount == 2)
     1091                        m_doctypeSearchCount++; // A '!' is also part of a doctype, so we are moving through that still as well.
     1092                    if (searchCount == 4) {
    8781093                        // Found '<!--' sequence
    8791094                        src.advancePastNonNewline();
     
    8861101                        // can handle this case.  Only do this in quirks mode. -dwh
    8871102                        if (!src.isEmpty() && *src == '>' && m_doc->inCompatMode()) {
    888                           state.setInComment(false);
    889                           src.advancePastNonNewline();
    890                           if (!src.isEmpty())
    891                               cBuffer[cBufferPos++] = *src;
    892                         }
    893                         else
     1103                            state.setInComment(false);
     1104                            src.advancePastNonNewline();
     1105                            if (!src.isEmpty())
     1106                                cBuffer[cBufferPos++] = *src;
     1107                        } else
    8941108                          state = parseComment(src, state);
    8951109
     
    9001114                    src.advancePastNonNewline();
    9011115                    break;
     1116                } else
     1117                    searchCount = 0; // Stop looking for '<!--' sequence
     1118            }
     1119           
     1120            if (m_doctypeSearchCount > 0) {
     1121                if (toASCIILower(*src) == doctypeStart[m_doctypeSearchCount]) {
     1122                    m_doctypeSearchCount++;
     1123                    cBuffer[cBufferPos++] = *src;
     1124                    src.advancePastNonNewline();
     1125                    if (m_doctypeSearchCount == 9) {
     1126                        // Found '<!DOCTYPE' sequence
     1127                        state.setInDoctype(true);
     1128                        state.setTagState(NoTag);
     1129                        m_doctypeToken.reset();
     1130                        if (inViewSourceMode())
     1131                            m_doctypeToken.m_source.append(cBuffer, cBufferPos);
     1132                        state = parseDoctype(src, state);
     1133                        m_cBufferPos = cBufferPos;
     1134                        return state;
     1135                    }
     1136                    break;
    9021137                }
    9031138                else
    904                     searchCount = 0; // Stop looking for '<!--' sequence
     1139                    m_doctypeSearchCount = 0; // Stop looking for '<!DOCTYPE' sequence
    9051140            }
    9061141
     
    14041639            else if (state.inComment())
    14051640                state = parseComment(src, state);
     1641            else if (state.inDoctype())
     1642                state = parseDoctype(src, state);
    14061643            else if (state.inServer())
    14071644                state = parseServer(src, state);
     
    14171654                    break;
    14181655                case '!': {
    1419                     // <!-- comment -->
    1420                     searchCount = 1; // Look for '<!--' sequence to start comment
    1421                    
     1656                    // <!-- comment --> or <!DOCTYPE ...>
     1657                    searchCount = 1; // Look for '<!--' sequence to start comment or '<!DOCTYPE' sequence to start doctype
     1658                    m_doctypeSearchCount = 1;
    14221659                    break;
    14231660                }
     
    15651802{
    15661803    // do this as long as we don't find matching comment ends
    1567     while((m_state.inComment() || m_state.inServer()) && scriptCode && scriptCodeSize) {
     1804    while ((m_state.inComment() || m_state.inServer()) && scriptCode && scriptCodeSize) {
    15681805        // we've found an unmatched comment start
    15691806        if (m_state.inComment())
     
    16341871}
    16351872
     1873void HTMLTokenizer::processDoctypeToken()
     1874{
     1875    if (inViewSourceMode())
     1876        static_cast<HTMLViewSourceDocument*>(m_doc)->addViewSourceDoctypeToken(&m_doctypeToken);
     1877    else
     1878        parser->parseDoctypeToken(&m_doctypeToken);
     1879}
     1880
    16361881HTMLTokenizer::~HTMLTokenizer()
    16371882{
  • trunk/WebCore/html/HTMLTokenizer.h

    r30127 r30431  
    8484};
    8585
     86enum DoctypeState {
     87    DoctypeBegin,
     88    DoctypeBeforeName,
     89    DoctypeName,
     90    DoctypeAfterName,
     91    DoctypeBeforePublicID,
     92    DoctypePublicID,
     93    DoctypeAfterPublicID,
     94    DoctypeBeforeSystemID,
     95    DoctypeSystemID,
     96    DoctypeAfterSystemID,
     97    DoctypeBogus
     98};
     99
     100class DoctypeToken {
     101public:
     102    DoctypeToken() {}
     103   
     104    void reset()
     105    {
     106        m_name.clear();
     107        m_publicID.clear();
     108        m_systemID.clear();
     109        m_state = DoctypeBegin;
     110        m_source.clear();
     111    }
     112
     113    DoctypeState state() { return m_state; }
     114    void setState(DoctypeState s) { m_state = s; }
     115
     116    Vector<UChar> m_name;
     117    Vector<UChar> m_publicID;
     118    Vector<UChar> m_systemID;
     119    DoctypeState m_state;
     120   
     121    Vector<UChar> m_source;
     122};
     123
    86124//-----------------------------------------------------------------------------
    87125
     
    119157
    120158    void reset();
     159
    121160    PassRefPtr<Node> processToken();
     161    void processDoctypeToken();
    122162
    123163    State processListing(SegmentedString, State);
    124164    State parseComment(SegmentedString&, State);
     165    State parseDoctype(SegmentedString&, State);
    125166    State parseServer(SegmentedString&, State);
    126167    State parseText(SegmentedString&, State);
     
    221262        bool inComment() const { return testBit(InComment); }
    222263        void setInComment(bool v) { setBit(InComment, v); }
     264        bool inDoctype() const { return testBit(InDoctype); }
     265        void setInDoctype(bool v) { setBit(InDoctype, v); }
    223266        bool inTextArea() const { return testBit(InTextArea); }
    224267        void setInTextArea(bool v) { setBit(InTextArea, v); }
     
    244287        bool hasEntityState() const { return m_bits & EntityMask; }
    245288
    246         bool needsSpecialWriteHandling() const { return m_bits & (InScript | InStyle | InXmp | InTextArea | InTitle | InIFrame | TagMask | EntityMask | InPlainText | InComment | InServer | InProcessingInstruction | StartTag); }
     289        bool needsSpecialWriteHandling() const { return m_bits & (InScript | InStyle | InXmp | InTextArea | InTitle | InIFrame | TagMask | EntityMask | InPlainText | InComment | InDoctype | InServer | InProcessingInstruction | StartTag); }
    247290
    248291    private:
     
    268311            LoadingExtScript = 1 << 22,
    269312            ForceSynchronous = 1 << 23,
    270             InIFrame = 1 << 24
     313            InIFrame = 1 << 24,
     314            InDoctype = 1 << 25
    271315        };
    272316
     
    284328
    285329    State m_state;
     330   
     331    DoctypeToken m_doctypeToken;
     332    int m_doctypeSearchCount;
     333    int m_doctypeSecondarySearchCount;
    286334
    287335    bool brokenServer;
     
    301349    // Stores characters if we are scanning for a string like "</script>"
    302350    UChar searchBuffer[10];
     351   
    303352    // Counts where we are in the string we are scanning for
    304353    int searchCount;
    305     // The string we are searching for
    306     const UChar* searchFor;
    307354    // the stopper string
    308355    const char* searchStopper;
    309356    // the stopper len
    310357    int searchStopperLen;
     358   
    311359    // if no more data is coming, just parse what we have (including ext scripts that
    312360    // may be still downloading) and finish
  • trunk/WebCore/html/HTMLViewSourceDocument.cpp

    r30243 r30431  
    109109    } else {
    110110        // Handle the tag.
    111         bool doctype = token->tagName.startsWith("!DOCTYPE", false);
    112        
    113         String classNameStr = doctype ? "webkit-html-doctype" : "webkit-html-tag";
     111        String classNameStr = "webkit-html-tag";
    114112        m_current = addSpanWithClassName(classNameStr);
    115113
     
    146144                        if (guide->at(i) == 'a') {
    147145                            String name = attr->name().toString();
    148                             if (doctype)
    149                                 addText(name, "webkit-html-doctype");
    150                             else {
    151                                 m_current = addSpanWithClassName("webkit-html-attribute-name");
    152                                 addText(name, "webkit-html-attribute-name");
    153                                 if (m_current != m_tbody)
    154                                     m_current = static_cast<Element*>(m_current->parent());
    155                             }
     146                           
     147                            m_current = addSpanWithClassName("webkit-html-attribute-name");
     148                            addText(name, "webkit-html-attribute-name");
     149                            if (m_current != m_tbody)
     150                                m_current = static_cast<Element*>(m_current->parent());
    156151                        } else {
    157152                            String value = attr->value().domString();
    158                             if (doctype)
    159                                 addText(value, "webkit-html-doctype");
    160                             else {
    161                                 // FIXME: XML could use namespace prefixes and confuse us.
    162                                 if (equalIgnoringCase(attr->name().localName(), "src") || equalIgnoringCase(attr->name().localName(), "href"))
    163                                     m_current = addLink(value, equalIgnoringCase(token->tagName, "a"));
    164                                 else
    165                                     m_current = addSpanWithClassName("webkit-html-attribute-value");
    166                                 addText(value, "webkit-html-attribute-value");
    167                                 if (m_current != m_tbody)
    168                                     m_current = static_cast<Element*>(m_current->parent());
    169                             }
     153                            // FIXME: XML could use namespace prefixes and confuse us.
     154                            if (equalIgnoringCase(attr->name().localName(), "src") || equalIgnoringCase(attr->name().localName(), "href"))
     155                                m_current = addLink(value, equalIgnoringCase(token->tagName, "a"));
     156                            else
     157                                m_current = addSpanWithClassName("webkit-html-attribute-value");
     158                            addText(value, "webkit-html-attribute-value");
     159                            if (m_current != m_tbody)
     160                                m_current = static_cast<Element*>(m_current->parent());
    170161                        }
    171162                    }
     
    183174        m_current = m_td;
    184175    }
     176}
     177
     178void HTMLViewSourceDocument::addViewSourceDoctypeToken(DoctypeToken* doctypeToken)
     179{
     180    if (!m_current)
     181        createContainingTable();
     182    m_current = addSpanWithClassName("webkit-html-doctype");
     183    String text = "<";
     184    text += String::adopt(doctypeToken->m_source);
     185    text += ">";
     186    addText(text, "webkit-html-doctype");
    185187}
    186188
  • trunk/WebCore/html/HTMLViewSourceDocument.h

    r29663 r30431  
    2929namespace WebCore {
    3030
     31class DoctypeToken;
    3132class Token;
    3233
     
    4041    void addViewSourceToken(Token*); // Used by the HTML tokenizer.
    4142    void addViewSourceText(const String&); // Used by the plaintext tokenizer.
    42    
     43    void addViewSourceDoctypeToken(DoctypeToken*);
     44
    4345private:
    4446    void createContainingTable();
  • trunk/WebCore/loader/FrameLoader.cpp

    r30368 r30431  
    991991    if (!m_receivedData) {
    992992        m_receivedData = true;
    993         m_frame->document()->determineParseMode(decoded);
    994993        if (m_decoder->encoding().usesVisualOrdering())
    995994            m_frame->document()->setVisuallyOrdered();
     
    48114810                // set cachePolicy to Cache to use the loaded resource
    48124811                newDoc->docLoader()->setCachePolicy(CachePolicyCache);
    4813                 newDoc->determineParseMode(m_pendingSourceInLowBandwidthDisplay);
    48144812                if (m_decoder->encoding().usesVisualOrdering())
    48154813                    newDoc->setVisuallyOrdered();                   
  • trunk/WebCore/page/Frame.cpp

    r30325 r30431  
    16911691{
    16921692    if (Document *doc = document())
    1693         if (DocumentType *doctype = doc->realDocType())
     1693        if (DocumentType *doctype = doc->doctype())
    16941694            return doctype->toString();
    16951695
  • trunk/WebCore/page/inspector/utilities.js

    r30146 r30431  
    426426        case Node.COMMENT_NODE:
    427427            return "<!--" + this.nodeValue + "-->";
     428           
     429        case Node.DOCUMENT_TYPE_NODE:
     430            var docType = "<!DOCTYPE " + this.nodeName;
     431            if (this.publicId) {
     432                docType += " PUBLIC \"" + this.publicId + "\"";
     433                if (this.systemId)
     434                    docType += " \"" + this.systemId + "\"";
     435            } else if (this.systemId)
     436                docType += " SYSTEM \"" + this.systemId + "\"";
     437            if (this.internalSubset)
     438                docType += " [" + this.internalSubset + "]";
     439            return docType + ">";
    428440    }
    429441
     
    644656            break;
    645657
     658        case Node.DOCUMENT_TYPE_NODE:
     659            info.title = "<span class=\"webkit-html-tag\">&lt;!DOCTYPE " + this.nodeName;
     660            if (this.publicId) {
     661                info.title += " PUBLIC \"" + this.publicId + "\"";
     662                if (this.systemId)
     663                    info.title += " \"" + this.systemId + "\"";
     664            } else if (this.systemId)
     665                info.title += " SYSTEM \"" + this.systemId + "\"";
     666            if (this.internalSubset)
     667                info.title += " [" + this.internalSubset + "]";
     668            info.title += "&gt;</span>";
     669            break;
    646670        default:
    647671            info.title = this.nodeName.toLowerCase().collapseWhitespace().escapeHTML();
  • trunk/WebCore/xml/XSLTProcessor.cpp

    r30243 r30431  
    259259        result->setBaseURL(ownerDocument->baseURL());
    260260    }
    261     result->determineParseMode(documentSource); // Make sure we parse in the correct mode.
    262261   
    263262    RefPtr<TextResourceDecoder> decoder = new TextResourceDecoder(sourceMIMEType);
Note: See TracChangeset for help on using the changeset viewer.