LayoutTests:

LayoutTests:

        Reviewed by Geoff.

        New test to keep the mistake I made in r17680 from happening again.

        * fast/block/margin-collapse/negative-margins-expected.checksum: Added.
        * fast/block/margin-collapse/negative-margins-expected.png: Added.
        * fast/block/margin-collapse/negative-margins-expected.txt: Added.
        * fast/block/margin-collapse/negative-margins.html: Added.

WebCore:

        Reviewed by Geoff.

        Fix the change in behavior I caused in r17680 with my build fix.

        * rendering/RenderObject.cpp:
        (WebCore::RenderObject::maxTopMargin):
        (WebCore::RenderObject::maxBottomMargin):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17691 268f45cc-cd09-0410-ab3c-d52691b4dbfc