Implement baseline alignment support for inline blocks. Inline blocks are supposed...
authorhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 Aug 2005 20:58:29 +0000 (20:58 +0000)
committerhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 Aug 2005 20:58:29 +0000 (20:58 +0000)
commita658ba84d234ba48ddee25fe96ca40272b29645c
tree086a6a701ba4d6cbc9481b550f281818347c681a
parentb46a3885a723e1e5fbc6b25bf19e861fe1b7e7a0
Implement baseline alignment support for inline blocks.  Inline blocks are supposed to use
the baseline of the last line in the block as their baseline.  For marquees we still
bottom align, since marquees really have no discernible baseline in many cases (and this
retains compatibility with WinIE).

        Reviewed by cblu

        Test cases added: 006.html in fast/inline-block

        * khtml/rendering/render_block.cpp:
        (khtml::RenderBlock::baselinePosition):
        (khtml::RenderBlock::getBaselineOfLastLineBox):
        * khtml/rendering/render_block.h:
        * khtml/rendering/render_object.h:
        (khtml::RenderObject::getBaselineOfLastLineBox):
        * layout-tests/css1/box_properties/acid_test-expected.txt:
        * layout-tests/fast/css/MarqueeLayoutTest-expected.txt:
        * layout-tests/fast/forms/007-expected.txt:
        * layout-tests/fast/inline-block/001-expected.txt:
        * layout-tests/fast/inline-block/001.html:
        * layout-tests/fast/inline-block/006-expected.txt: Added.
        * layout-tests/fast/inline-block/006.html: Added.
        * layout-tests/fast/selectors/064-expected.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@10108 268f45cc-cd09-0410-ab3c-d52691b4dbfc
12 files changed:
LayoutTests/css1/box_properties/acid_test-expected.txt
LayoutTests/fast/css/MarqueeLayoutTest-expected.txt
LayoutTests/fast/forms/007-expected.txt
LayoutTests/fast/inline-block/001-expected.txt
LayoutTests/fast/inline-block/001.html
LayoutTests/fast/inline-block/006-expected.txt [new file with mode: 0644]
LayoutTests/fast/inline-block/006.html [new file with mode: 0644]
LayoutTests/fast/selectors/064-expected.txt
WebCore/ChangeLog-2005-08-23
WebCore/khtml/rendering/render_block.cpp
WebCore/khtml/rendering/render_block.h
WebCore/khtml/rendering/render_object.h