⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 102191 in webkit


Ignore:
Timestamp:
Dec 6, 2011, 4:41:42 PM (15 years ago)
Author:
Lucas Forschler
Message:

Merged r95129.

Location:
branches/safari-534.53-branch
Files:
8 edited
6 copied

Legend:

Unmodified
Added
Removed

  • branches/safari-534.53-branch/LayoutTests/ChangeLog

    r102189 r102191  
     12011-12-06  Lucas Forschler  <lforschler@apple.com>
     2
     3    Merge 95129
     4
     5    2011-09-14  David Hyatt  <hyatt@apple.com>
     6
     7            https://bugs.webkit.org/show_bug.cgi?id=52736
     8
     9            Tiles were not being properly centered within border image sides for the "repeat"
     10            keyword. This patch fixes the buggy math behind the pattern tiling to actually get
     11            the initial phases correct.
     12
     13            Reviewed by Sam Weinig.
     14
     15            * fast/borders/border-image-massive-scale.html: Added.
     16            * fast/borders/border-image-scaled-gradient.html: Added.
     17            * platform/mac/fast/borders/border-image-massive-scale-expected.png: Added.
     18            * platform/mac/fast/borders/border-image-massive-scale-expected.txt: Added.
     19            * platform/mac/fast/borders/border-image-outset-expected.png:
     20            * platform/mac/fast/borders/border-image-outset-in-shorthand-expected.png:
     21            * platform/mac/fast/borders/border-image-outset-split-inline-expected.png:
     22            * platform/mac/fast/borders/border-image-outset-split-inline-vertical-lr-expected.png:
     23            * platform/mac/fast/borders/border-image-scaled-gradient-expected.png: Added.
     24            * platform/mac/fast/borders/border-image-scaled-gradient-expected.txt: Added.
     25            * platform/mac/fast/borders/border-image-side-reduction-expected.png:
     26
    1272011-12-06  Lucas Forschler  <lforschler@apple.com>
    228

  • branches/safari-534.53-branch/Source/WebCore/ChangeLog

    r102189 r102191  
     12011-12-06  Lucas Forschler  <lforschler@apple.com>
     2
     3    Merge 95129
     4
     5    2011-09-14  David Hyatt  <hyatt@apple.com>
     6
     7            https://bugs.webkit.org/show_bug.cgi?id=52736
     8
     9            Tiles were not being properly centered within border image sides for the "repeat"
     10            keyword. This patch fixes the buggy math behind the pattern tiling to actually get
     11            the initial phases correct.
     12
     13            Reviewed by Sam Weinig.
     14
     15            Added new tests in fast/borders and updated broken existing tests.
     16
     17            * platform/graphics/Image.cpp:
     18            (WebCore::Image::drawTiled):
     19
    1202011-12-06  Lucas Forschler  <lforschler@apple.com>
    221

  • branches/safari-534.53-branch/Source/WebCore/platform/graphics/Image.cpp

    r102189 r102191  
    153153    float hPhase = tileScaleFactor.width() * srcRect.x();
    154154    float vPhase = tileScaleFactor.height() * srcRect.y();
     155    float scaledTileWidth = tileScaleFactor.width() * srcRect.width();
     156    float scaledTileHeight = tileScaleFactor.height() * srcRect.height();
    155157    if (hRule == Image::RepeatTile)
    156         hPhase -= fmodf(dstRect.width(), tileScaleFactor.width() * srcRect.width()) / 2.0f;
     158        hPhase -= (dstRect.width() - scaledTileWidth) / 2;
    157159    if (vRule == Image::RepeatTile)
    158         vPhase -= fmodf(dstRect.height(), tileScaleFactor.height() * srcRect.height()) / 2.0f;
     160        vPhase -= (dstRect.height() - scaledTileHeight) / 2;
    159161    FloatPoint patternPhase(dstRect.x() - hPhase, dstRect.y() - vPhase);
    160162   
Note: See TracChangeset for help on using the changeset viewer.