<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[285334] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/285334">285334</a></dd>
<dt>Author</dt> <dd>heycam@apple.com</dd>
<dt>Date</dt> <dd>2021-11-04 21:52:41 -0700 (Thu, 04 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Factor out didDraw / didDrawEntireCanvas calls in canvas drawing functions
https://bugs.webkit.org/show_bug.cgi?id=232527
<rdar://problem/84834950>

Reviewed by Antti Koivisto.

No behavior change except for in drawImage, where the
paintCurrentFrameInContext code path now will check whether to call
didDrawEntireCanvas.

* html/canvas/CanvasRenderingContext2DBase.cpp:
(WebCore::CanvasRenderingContext2DBase::fillInternal):
(WebCore::CanvasRenderingContext2DBase::strokeInternal):
(WebCore::CanvasRenderingContext2DBase::fillRect):
(WebCore::CanvasRenderingContext2DBase::strokeRect):
(WebCore::CanvasRenderingContext2DBase::drawImage):
(WebCore::CanvasRenderingContext2DBase::didDraw):
(WebCore::CanvasRenderingContext2DBase::drawTextUnchecked):
* html/canvas/CanvasRenderingContext2DBase.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2DBasecpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2DBaseh">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (285333 => 285334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-11-05 04:06:12 UTC (rev 285333)
+++ trunk/Source/WebCore/ChangeLog      2021-11-05 04:52:41 UTC (rev 285334)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2021-11-04  Cameron McCormack  <heycam@apple.com>
</span><span class="cx"> 
</span><ins>+        Factor out didDraw / didDrawEntireCanvas calls in canvas drawing functions
+        https://bugs.webkit.org/show_bug.cgi?id=232527
+        <rdar://problem/84834950>
+
+        Reviewed by Antti Koivisto.
+
+        No behavior change except for in drawImage, where the
+        paintCurrentFrameInContext code path now will check whether to call
+        didDrawEntireCanvas.
+
+        * html/canvas/CanvasRenderingContext2DBase.cpp:
+        (WebCore::CanvasRenderingContext2DBase::fillInternal):
+        (WebCore::CanvasRenderingContext2DBase::strokeInternal):
+        (WebCore::CanvasRenderingContext2DBase::fillRect):
+        (WebCore::CanvasRenderingContext2DBase::strokeRect):
+        (WebCore::CanvasRenderingContext2DBase::drawImage):
+        (WebCore::CanvasRenderingContext2DBase::didDraw):
+        (WebCore::CanvasRenderingContext2DBase::drawTextUnchecked):
+        * html/canvas/CanvasRenderingContext2DBase.h:
+
+2021-11-04  Cameron McCormack  <heycam@apple.com>
+
</ins><span class="cx">         Avoid sending video data to Web process for canvas.drawImage(video)
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=230766
</span><span class="cx">         <rdar://problem/83576009>
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2DBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp (285333 => 285334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp        2021-11-05 04:06:12 UTC (rev 285333)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp   2021-11-05 04:52:41 UTC (rev 285334)
</span><span class="lines">@@ -1061,12 +1061,9 @@
</span><span class="cx">     } else
</span><span class="cx">         c->fillPath(path);
</span><span class="cx">     
</span><del>-    if (isEntireBackingStoreDirty())
-        didDraw(std::nullopt);
-    else if (repaintEntireCanvas)
-        didDrawEntireCanvas();
-    else
-        didDraw(path.fastBoundingRect());
</del><ins>+    didDraw(repaintEntireCanvas, [&] {
+        return path.fastBoundingRect();
+    });
</ins><span class="cx"> 
</span><span class="cx">     c->setFillRule(savedFillRule);
</span><span class="cx"> }
</span><span class="lines">@@ -1100,15 +1097,11 @@
</span><span class="cx">     } else
</span><span class="cx">         c->strokePath(path);
</span><span class="cx"> 
</span><del>-    if (isEntireBackingStoreDirty())
-        didDraw(std::nullopt);
-    else if (repaintEntireCanvas)
-        didDrawEntireCanvas();
-    else {
</del><ins>+    didDraw(repaintEntireCanvas, [&] {
</ins><span class="cx">         auto dirtyRect = path.fastBoundingRect();
</span><span class="cx">         inflateStrokeRect(dirtyRect);
</span><del>-        didDraw(dirtyRect);
-    }
</del><ins>+        return dirtyRect;
+    });
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void CanvasRenderingContext2DBase::clipInternal(const Path& path, CanvasFillRule windingRule)
</span><span class="lines">@@ -1270,12 +1263,7 @@
</span><span class="cx">     } else
</span><span class="cx">         c->fillRect(rect);
</span><span class="cx"> 
</span><del>-    if (isEntireBackingStoreDirty())
-        didDraw(std::nullopt);
-    else if (repaintEntireCanvas)
-        didDrawEntireCanvas();
-    else
-        didDraw(rect);
</del><ins>+    didDraw(repaintEntireCanvas, rect);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void CanvasRenderingContext2DBase::strokeRect(double x, double y, double width, double height)
</span><span class="lines">@@ -1310,15 +1298,11 @@
</span><span class="cx">     } else
</span><span class="cx">         c->strokeRect(rect, state().lineWidth);
</span><span class="cx"> 
</span><del>-    if (isEntireBackingStoreDirty())
-        didDraw(std::nullopt);
-    else if (repaintEntireCanvas)
-        didDrawEntireCanvas();
-    else {
</del><ins>+    didDraw(repaintEntireCanvas, [&] {
</ins><span class="cx">         auto boundingRect = rect;
</span><span class="cx">         boundingRect.inflate(state().lineWidth / 2);
</span><del>-        didDraw(boundingRect);
-    }
</del><ins>+        return boundingRect;
+    });
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void CanvasRenderingContext2DBase::setShadow(float width, float height, float blur, const String& colorString, std::optional<float> alpha)
</span><span class="lines">@@ -1582,12 +1566,7 @@
</span><span class="cx">     } else
</span><span class="cx">         c->drawImageForCanvas(*image, normalizedDstRect, normalizedSrcRect, options, colorSpace());
</span><span class="cx"> 
</span><del>-    if (isEntireBackingStoreDirty())
-        didDraw(std::nullopt);
-    else if (repaintEntireCanvas)
-        didDrawEntireCanvas();
-    else
-        didDraw(normalizedDstRect);
</del><ins>+    didDraw(repaintEntireCanvas, normalizedDstRect);
</ins><span class="cx"> 
</span><span class="cx">     if (image->drawsSVGImage())
</span><span class="cx">         image->setImageObserver(observer);
</span><span class="lines">@@ -1644,12 +1623,7 @@
</span><span class="cx">     } else
</span><span class="cx">         c->drawImageBuffer(*buffer, dstRect, srcRect, { state().globalComposite, state().globalBlend });
</span><span class="cx"> 
</span><del>-    if (isEntireBackingStoreDirty())
-        didDraw(std::nullopt);
-    else if (repaintEntireCanvas)
-        didDrawEntireCanvas();
-    else
-        didDraw(dstRect);
</del><ins>+    didDraw(repaintEntireCanvas, dstRect);
</ins><span class="cx"> 
</span><span class="cx">     return { };
</span><span class="cx"> }
</span><span class="lines">@@ -1676,17 +1650,14 @@
</span><span class="cx"> 
</span><span class="cx">     checkOrigin(&video);
</span><span class="cx"> 
</span><ins>+    bool repaintEntireCanvas = rectContainsCanvas(dstRect);
+
</ins><span class="cx"> #if USE(CG)
</span><span class="cx">     if (c->hasPlatformContext()) {
</span><span class="cx">         if (auto image = video.nativeImageForCurrentTime()) {
</span><span class="cx">             c->drawNativeImage(*image, FloatSize(video.videoWidth(), video.videoHeight()), dstRect, srcRect);
</span><span class="cx"> 
</span><del>-            if (isEntireBackingStoreDirty())
-                didDraw(std::nullopt);
-            else if (rectContainsCanvas(dstRect))
-                didDrawEntireCanvas();
-            else
-                didDraw(dstRect);
</del><ins>+            didDraw(repaintEntireCanvas, dstRect);
</ins><span class="cx"> 
</span><span class="cx">             return { };
</span><span class="cx">         }
</span><span class="lines">@@ -1701,10 +1672,7 @@
</span><span class="cx">     video.paintCurrentFrameInContext(*c, FloatRect(FloatPoint(), size(video)));
</span><span class="cx">     stateSaver.restore();
</span><span class="cx"> 
</span><del>-    if (isEntireBackingStoreDirty())
-        didDraw(std::nullopt);
-    else
-        didDraw(dstRect);
</del><ins>+    didDraw(repaintEntireCanvas, dstRect);
</ins><span class="cx"> 
</span><span class="cx">     return { };
</span><span class="cx"> }
</span><span class="lines">@@ -1752,12 +1720,7 @@
</span><span class="cx">     } else
</span><span class="cx">         c->drawImageBuffer(*buffer, dstRect, srcRect, { state().globalComposite, state().globalBlend });
</span><span class="cx"> 
</span><del>-    if (isEntireBackingStoreDirty())
-        didDraw(std::nullopt);
-    else if (repaintEntireCanvas)
-        didDrawEntireCanvas();
-    else
-        didDraw(dstRect);
</del><ins>+    didDraw(repaintEntireCanvas, dstRect);
</ins><span class="cx"> 
</span><span class="cx">     return { };
</span><span class="cx"> }
</span><span class="lines">@@ -2093,6 +2056,24 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void CanvasRenderingContext2DBase::didDraw(bool entireCanvas, const FloatRect& rect)
+{
+    return didDraw(entireCanvas, [&] {
+        return rect;
+    });
+}
+
+template<typename RectProvider>
+void CanvasRenderingContext2DBase::didDraw(bool entireCanvas, RectProvider rectProvider)
+{
+    if (isEntireBackingStoreDirty())
+        didDraw(std::nullopt);
+    else if (entireCanvas)
+        didDrawEntireCanvas();
+    else
+        didDraw(rectProvider());
+}
+
</ins><span class="cx"> void CanvasRenderingContext2DBase::clearAccumulatedDirtyRect()
</span><span class="cx"> {
</span><span class="cx">     m_dirtyRect = { };
</span><span class="lines">@@ -2533,12 +2514,7 @@
</span><span class="cx">     } else
</span><span class="cx">         fontProxy.drawBidiText(*c, textRun, location, FontCascade::UseFallbackIfFontNotReady);
</span><span class="cx"> 
</span><del>-    if (isEntireBackingStoreDirty())
-        didDraw(std::nullopt);
-    else if (repaintEntireCanvas)
-        didDrawEntireCanvas();
-    else
-        didDraw(textRect);
</del><ins>+    didDraw(repaintEntireCanvas, textRect);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Ref<TextMetrics> CanvasRenderingContext2DBase::measureTextInternal(const String& text)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2DBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h (285333 => 285334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h  2021-11-05 04:06:12 UTC (rev 285333)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h     2021-11-05 04:52:41 UTC (rev 285334)
</span><span class="lines">@@ -324,6 +324,8 @@
</span><span class="cx">     };
</span><span class="cx">     void didDraw(std::optional<FloatRect>, OptionSet<DidDrawOption> = { DidDrawOption::ApplyTransform, DidDrawOption::ApplyShadow, DidDrawOption::ApplyClip });
</span><span class="cx">     void didDrawEntireCanvas();
</span><ins>+    void didDraw(bool entireCanvas, const FloatRect&);
+    template<typename RectProvider> void didDraw(bool entireCanvas, RectProvider);
</ins><span class="cx"> 
</span><span class="cx">     void paintRenderingResultsToCanvas() override;
</span><span class="cx">     bool needsPreparationForDisplay() const final;
</span></span></pre>
</div>
</div>

</body>
</html>