--This
authorbdakin <bdakin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 May 2006 18:20:56 +0000 (18:20 +0000)
committerbdakin <bdakin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 May 2006 18:20:56 +0000 (18:20 +0000)
commit0656ddf645dd5f4a8e98232ef5df6a672d8a4f35
treec6e212ee8664fb18b61c8d8802a9a3e203d4af2f
parent0ff1a18d9335c7bfc1d15082aec31cbe8e38ef4e
--This
       Reviewed by Hyatt.

        Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=8732
        Backgrounds with background-size and background-origin do not
        always lay out correctly

        * platform/cairo/ImageCairo.cpp:
        (WebCore::Image::drawTiled): We no longer need to scale the source
        point since it will now come in with the scale already taken into
        account.
        * platform/mac/ImageMac.mm:
        (WebCore::Image::drawTiled): Same as above.
        * rendering/RenderBox.cpp:
        (WebCore::cacluateBackgroundSize): Now calculate the background
        size in a helper method.
        (WebCore::RenderBox::paintBackgroundExtended): Calculate the
        background size before calculating cx, cy, cw, ch, sx, and sy so
        that they can all be calculated with the scaled image size taken
        into account.

M    LayoutTests/ChangeLog
M    LayoutTests/fast/backgrounds/size/backgroundSize18-expected.checksum
M    LayoutTests/fast/backgrounds/size/backgroundSize12-expected.png
M    LayoutTests/fast/backgrounds/size/backgroundSize19-expected.checksum
M    LayoutTests/fast/backgrounds/size/backgroundSize10-expected.png
M    LayoutTests/fast/backgrounds/size/backgroundSize18-expected.png
M    LayoutTests/fast/backgrounds/size/backgroundSize19-expected.png
M    LayoutTests/fast/backgrounds/size/backgroundSize10-expected.checksum
M    LayoutTests/fast/backgrounds/size/backgroundSize12-expected.checksum
M    WebCore/platform/mac/ImageMac.mm
M    WebCore/platform/cairo/ImageCairo.cpp
M    WebCore/rendering/RenderBox.cpp
M    WebCore/ChangeLog

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14181 268f45cc-cd09-0410-ab3c-d52691b4dbfc
13 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/backgrounds/size/backgroundSize10-expected.checksum
LayoutTests/fast/backgrounds/size/backgroundSize10-expected.png
LayoutTests/fast/backgrounds/size/backgroundSize12-expected.checksum
LayoutTests/fast/backgrounds/size/backgroundSize12-expected.png
LayoutTests/fast/backgrounds/size/backgroundSize18-expected.checksum
LayoutTests/fast/backgrounds/size/backgroundSize18-expected.png
LayoutTests/fast/backgrounds/size/backgroundSize19-expected.checksum
LayoutTests/fast/backgrounds/size/backgroundSize19-expected.png
WebCore/ChangeLog
WebCore/platform/cairo/ImageCairo.cpp
WebCore/platform/mac/ImageMac.mm
WebCore/rendering/RenderBox.cpp