Changeset 234203 in webkit


Ignore:
Timestamp:
Jul 25, 2018 10:10:10 AM (6 years ago)
Author:
david_fenton@apple.com
Message:

Unreviewed, rolling out r234187.

the layout test added with this change is flaky on the bots

Reverted changeset:

"Animation stops with object-fit:contain on an animated 2d
canvas"
​https://bugs.webkit.org/show_bug.cgi?id=187840
​https://trac.webkit.org/changeset/234187

Location:
trunk
Files:
2 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r234202 r234203  
     12018-07-25  David Fenton  <david_fenton@apple.com>
     2
     3        Unreviewed, rolling out r234187.
     4
     5        the layout test added with this change is flaky on the bots
     6
     7        Reverted changeset:
     8
     9        "Animation stops with object-fit:contain on an animated 2d
     10        canvas"
     11        https://bugs.webkit.org/show_bug.cgi?id=187840
     12        https://trac.webkit.org/changeset/234187
     13
    1142018-07-25  Andy VanWagoner  <andy@vanwagoner.family>
    215

  • trunk/Source/WebCore/ChangeLog

    r234197 r234203  
     12018-07-25  David Fenton  <david_fenton@apple.com>
     2
     3        Unreviewed, rolling out r234187.
     4
     5        the layout test added with this change is flaky on the bots
     6
     7        Reverted changeset:
     8
     9        "Animation stops with object-fit:contain on an animated 2d
     10        canvas"
     11        https://bugs.webkit.org/show_bug.cgi?id=187840
     12        https://trac.webkit.org/changeset/234187
     13
    1142018-07-25  Chris Dumez  <cdumez@apple.com>
    215

  • trunk/Source/WebCore/html/HTMLCanvasElement.cpp

    r234187 r234203  
    509509
    510510    FloatRect dirtyRect = rect;
    511     if (auto* renderer = renderBox()) {
    512         FloatRect destRect;
    513         if (is<RenderReplaced>(renderer))
    514             destRect = downcast<RenderReplaced>(renderer)->replacedContentRect();
    515         else
    516             destRect = renderer->contentBoxRect();
    517 
     511    if (RenderBox* ro = renderBox()) {
     512        FloatRect destRect = ro->contentBoxRect();
    518513        // Inflate dirty rect to cover antialiasing on image buffers.
    519514        if (drawingContext() && drawingContext()->shouldAntialias())
    520515            dirtyRect.inflate(1);
    521 
    522516        FloatRect r = mapRect(dirtyRect, FloatRect(0, 0, size().width(), size().height()), destRect);
    523517        r.intersect(destRect);
    524 
    525518        if (!r.isEmpty() && !m_dirtyRect.contains(r)) {
    526519            m_dirtyRect.unite(r);
    527             renderer->repaintRectangle(enclosingIntRect(m_dirtyRect));
     520            ro->repaintRectangle(enclosingIntRect(m_dirtyRect));
    528521        }
    529522    }

  • trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp

    r234187 r234203  
    7575    LayoutRect contentBoxRect = this->contentBoxRect();
    7676    contentBoxRect.moveBy(paintOffset);
    77     LayoutRect replacedContentRect = this->replacedContentRect();
     77    LayoutRect replacedContentRect = this->replacedContentRect(intrinsicSize());
    7878    replacedContentRect.moveBy(paintOffset);
    7979

  • trunk/Source/WebCore/rendering/RenderImage.cpp

    r234187 r234203  
    286286{
    287287    // Propagate container size to image resource.
    288     IntSize containerSize(replacedContentRect().size());
     288    IntSize containerSize(replacedContentRect(intrinsicSize()).size());
    289289    if (!containerSize.isEmpty()) {
    290290        URL imageSourceURL;
    … …  
    498498    LayoutRect contentBoxRect = this->contentBoxRect();
    499499    contentBoxRect.moveBy(paintOffset);
    500     LayoutRect replacedContentRect = this->replacedContentRect();
     500    LayoutRect replacedContentRect = this->replacedContentRect(intrinsicSize());
    501501    replacedContentRect.moveBy(paintOffset);
    502502    bool clip = !contentBoxRect.contains(replacedContentRect);

  • trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

    r234187 r234203  
    23452345    if (is<RenderReplaced>(renderBox)) {
    23462346        RenderReplaced& renderReplaced = downcast<RenderReplaced>(renderBox);
    2347         contentsRect = renderReplaced.replacedContentRect();
     2347        contentsRect = renderReplaced.replacedContentRect(renderBox.intrinsicSize());
    23482348    } else
    23492349        contentsRect = renderBox.contentBoxRect();

  • trunk/Source/WebCore/rendering/RenderReplaced.h

    r234187 r234203  
    3535
    3636    LayoutRect replacedContentRect(const LayoutSize& intrinsicSize) const;
    37     LayoutRect replacedContentRect() const { return replacedContentRect(intrinsicSize()); }
    3837
    3938    bool hasReplacedLogicalWidth() const;

  • trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp

    r234187 r234203  
    152152    const LayoutRect& marginRect = getShapeImageMarginRect(m_renderer, m_referenceBoxLogicalSize);
    153153    const LayoutRect& imageRect = is<RenderImage>(m_renderer)
    154         ? downcast<RenderImage>(m_renderer).replacedContentRect()
     154        ? downcast<RenderImage>(m_renderer).replacedContentRect(m_renderer.intrinsicSize())
    155155        : LayoutRect(LayoutPoint(), imageSize);
    156156
Note: See TracChangeset for help on using the changeset viewer.