Changeset 234187 in webkit

Timestamp:

Jul 24, 2018 9:09:47 PM (6 years ago)

Author:

Simon Fraser

Message:

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

Reviewed by Zalan Bujtas.
Source/WebCore:

If a canvas has object-fit: cover or contain, repaints need to mapped through
the rect that is used to position the canvas in the element bounds, which is replacedContentRect().

Add a version of replacedContentRect() that doesn't require passing the intrinsicSize() since
all but RenderVideo just pass the RenderReplaced's intrinsicSize.

Test: fast/repaint/canvas-object-fit.html

• html/HTMLCanvasElement.cpp:

(WebCore::HTMLCanvasElement::didDraw):

• rendering/RenderHTMLCanvas.cpp:

(WebCore::RenderHTMLCanvas::paintReplaced):

• rendering/RenderImage.cpp:

(WebCore::RenderImage::updateInnerContentRect):
(WebCore::RenderImage::paintReplaced):

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::contentsBox const):

• rendering/RenderReplaced.h:

(WebCore::RenderReplaced::replacedContentRect const):

• rendering/shapes/ShapeOutsideInfo.cpp:

(WebCore::ShapeOutsideInfo::createShapeForImage const):

LayoutTests:

• fast/repaint/canvas-object-fit-expected.txt: Added.
• fast/repaint/canvas-object-fit.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/repaint/canvas-object-fit-expected.txt (added)
• LayoutTests/fast/repaint/canvas-object-fit.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLCanvasElement.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderHTMLCanvas.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderImage.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderLayerBacking.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderReplaced.h (modified) (1 diff)
• Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-07-24  Simon Fraser  <simon.fraser@apple.com>
+
+        Animation stops with object-fit:contain on an animated 2d canvas
+        https://bugs.webkit.org/show_bug.cgi?id=187840
+
+        Reviewed by Zalan Bujtas.
+
+        * fast/repaint/canvas-object-fit-expected.txt: Added.
+        * fast/repaint/canvas-object-fit.html: Added.
+
 2018-07-24  Basuke Suzuki  <Basuke.Suzuki@sony.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-07-24  Simon Fraser  <simon.fraser@apple.com>
+
+        Animation stops with object-fit:contain on an animated 2d canvas
+        https://bugs.webkit.org/show_bug.cgi?id=187840
+
+        Reviewed by Zalan Bujtas.
+        
+        If a canvas has object-fit: cover or contain, repaints need to mapped through
+        the rect that is used to position the canvas in the element bounds, which is replacedContentRect().
+        
+        Add a version of replacedContentRect() that doesn't require passing the intrinsicSize() since
+        all but RenderVideo just pass the RenderReplaced's intrinsicSize.
+
+        Test: fast/repaint/canvas-object-fit.html
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::didDraw):
+        * rendering/RenderHTMLCanvas.cpp:
+        (WebCore::RenderHTMLCanvas::paintReplaced):
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::updateInnerContentRect):
+        (WebCore::RenderImage::paintReplaced):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::contentsBox const):
+        * rendering/RenderReplaced.h:
+        (WebCore::RenderReplaced::replacedContentRect const):
+        * rendering/shapes/ShapeOutsideInfo.cpp:
+        (WebCore::ShapeOutsideInfo::createShapeForImage const):
+
 2018-07-24  Basuke Suzuki  <Basuke.Suzuki@sony.com>
 

trunk/Source/WebCore/html/HTMLCanvasElement.cpp

@@ -509 +509 @@
 
     FloatRect dirtyRect = rect;
-    if (RenderBox* ro = renderBox()) {
-        FloatRect destRect = ro->contentBoxRect();
+    if (auto* renderer = renderBox()) {
+        FloatRect destRect;
+        if (is<RenderReplaced>(renderer))
+            destRect = downcast<RenderReplaced>(renderer)->replacedContentRect();
+        else
+            destRect = renderer->contentBoxRect();
+
         // Inflate dirty rect to cover antialiasing on image buffers.
         if (drawingContext() && drawingContext()->shouldAntialias())
             dirtyRect.inflate(1);
+
         FloatRect r = mapRect(dirtyRect, FloatRect(0, 0, size().width(), size().height()), destRect);
         r.intersect(destRect);
+
         if (!r.isEmpty() && !m_dirtyRect.contains(r)) {
             m_dirtyRect.unite(r);
-            ro->repaintRectangle(enclosingIntRect(m_dirtyRect));
+            renderer->repaintRectangle(enclosingIntRect(m_dirtyRect));
         }
     }

trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp

@@ -75 +75 @@
     LayoutRect contentBoxRect = this->contentBoxRect();
     contentBoxRect.moveBy(paintOffset);
-    LayoutRect replacedContentRect = this->replacedContentRect(intrinsicSize());
+    LayoutRect replacedContentRect = this->replacedContentRect();
     replacedContentRect.moveBy(paintOffset);
 

trunk/Source/WebCore/rendering/RenderImage.cpp

@@ -286 +286 @@
 {
     // Propagate container size to image resource.
-    IntSize containerSize(replacedContentRect(intrinsicSize()).size());
+    IntSize containerSize(replacedContentRect().size());
     if (!containerSize.isEmpty()) {
         URL imageSourceURL;
@@ -498 +498 @@
     LayoutRect contentBoxRect = this->contentBoxRect();
     contentBoxRect.moveBy(paintOffset);
-    LayoutRect replacedContentRect = this->replacedContentRect(intrinsicSize());
+    LayoutRect replacedContentRect = this->replacedContentRect();
     replacedContentRect.moveBy(paintOffset);
     bool clip = !contentBoxRect.contains(replacedContentRect);

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -2345 +2345 @@
     if (is<RenderReplaced>(renderBox)) {
         RenderReplaced& renderReplaced = downcast<RenderReplaced>(renderBox);
-        contentsRect = renderReplaced.replacedContentRect(renderBox.intrinsicSize());
+        contentsRect = renderReplaced.replacedContentRect();
     } else
         contentsRect = renderBox.contentBoxRect();

trunk/Source/WebCore/rendering/RenderReplaced.h

@@ -35 +35 @@
 
     LayoutRect replacedContentRect(const LayoutSize& intrinsicSize) const;
+    LayoutRect replacedContentRect() const { return replacedContentRect(intrinsicSize()); }
 
     bool hasReplacedLogicalWidth() const;

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

@@ -152 +152 @@
     const LayoutRect& marginRect = getShapeImageMarginRect(m_renderer, m_referenceBoxLogicalSize);
     const LayoutRect& imageRect = is<RenderImage>(m_renderer)
-        ? downcast<RenderImage>(m_renderer).replacedContentRect(m_renderer.intrinsicSize())
+        ? downcast<RenderImage>(m_renderer).replacedContentRect()
         : LayoutRect(LayoutPoint(), imageSize);