<!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>[284902] trunk</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/284902">284902</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2021-10-26 14:50:28 -0700 (Tue, 26 Oct 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GPU Process] `DisplayList::Recorder::getCTM` should include the device scale factor
https://bugs.webkit.org/show_bug.cgi?id=230647

Reviewed by Simon Fraser.

Source/WebCore:

New test: BifurcatedGraphicsContextTests.ApplyDeviceScaleFactor

* platform/graphics/displaylists/DisplayListRecorder.cpp:
(WebCore::DisplayList::Recorder::getCTM const):
(WebCore::DisplayList::Recorder::applyDeviceScaleFactor):
applyDeviceScaleFactor previously did not apply the scale to the CTM,
causing the DisplayList::Recorder's idea of the CTM to get out of sync
with the context being replayed into.

We don't call GraphicsContext::scale() directly (like GraphicsContextCG does)
because applyDeviceScaleFactor on the replay side will apply the scale
to the replayed context's CTM.

Tools:

* TestWebKitAPI/Tests/WebCore/cg/BifurcatedGraphicsContextTestsCG.cpp:
(TestWebKitAPI::TEST):
Add a test that getCTM returns the correct scale after applyDeviceScaleFactor is called.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListRecordercpp">trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCorecgBifurcatedGraphicsContextTestsCGcpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/cg/BifurcatedGraphicsContextTestsCG.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (284901 => 284902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-10-26 21:49:46 UTC (rev 284901)
+++ trunk/Source/WebCore/ChangeLog      2021-10-26 21:50:28 UTC (rev 284902)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2021-10-26  Tim Horton  <timothy_horton@apple.com>
+
+        [GPU Process] `DisplayList::Recorder::getCTM` should include the device scale factor
+        https://bugs.webkit.org/show_bug.cgi?id=230647
+
+        Reviewed by Simon Fraser.
+
+        New test: BifurcatedGraphicsContextTests.ApplyDeviceScaleFactor
+
+        * platform/graphics/displaylists/DisplayListRecorder.cpp:
+        (WebCore::DisplayList::Recorder::getCTM const):
+        (WebCore::DisplayList::Recorder::applyDeviceScaleFactor):
+        applyDeviceScaleFactor previously did not apply the scale to the CTM,
+        causing the DisplayList::Recorder's idea of the CTM to get out of sync
+        with the context being replayed into.
+
+        We don't call GraphicsContext::scale() directly (like GraphicsContextCG does)
+        because applyDeviceScaleFactor on the replay side will apply the scale
+        to the replayed context's CTM.
+
</ins><span class="cx"> 2021-10-26  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Changing the src attribute of the <img> element inside an ImageDocument does not trigger a load
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListRecordercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp (284901 => 284902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp      2021-10-26 21:49:46 UTC (rev 284901)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp 2021-10-26 21:50:28 UTC (rev 284902)
</span><span class="lines">@@ -232,7 +232,6 @@
</span><span class="cx"> 
</span><span class="cx"> AffineTransform Recorder::getCTM(GraphicsContext::IncludeDeviceScale) const
</span><span class="cx"> {
</span><del>-    // FIXME: <https://webkit.org/b/230647> ([GPU Process] add support for `IncludeDeviceScale` inside `DisplayList::Recorder::getCTM`)
</del><span class="cx">     return currentState().ctm;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -495,6 +494,10 @@
</span><span class="cx"> 
</span><span class="cx"> void Recorder::applyDeviceScaleFactor(float deviceScaleFactor)
</span><span class="cx"> {
</span><ins>+    // We modify the state directly here instead of calling GraphicsContext::scale()
+    // because the recorded item will scale() when replayed.
+    currentState().scale({ deviceScaleFactor, deviceScaleFactor });
+
</ins><span class="cx">     // FIXME: this changes the baseCTM, which will invalidate all of our cached extents.
</span><span class="cx">     // Assert that it's only called early on?
</span><span class="cx">     recordApplyDeviceScaleFactor(deviceScaleFactor);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (284901 => 284902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-10-26 21:49:46 UTC (rev 284901)
+++ trunk/Tools/ChangeLog       2021-10-26 21:50:28 UTC (rev 284902)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-10-26  Tim Horton  <timothy_horton@apple.com>
+
+        [GPU Process] `DisplayList::Recorder::getCTM` should include the device scale factor
+        https://bugs.webkit.org/show_bug.cgi?id=230647
+
+        Reviewed by Simon Fraser.
+
+        * TestWebKitAPI/Tests/WebCore/cg/BifurcatedGraphicsContextTestsCG.cpp:
+        (TestWebKitAPI::TEST):
+        Add a test that getCTM returns the correct scale after applyDeviceScaleFactor is called.
+
</ins><span class="cx"> 2021-10-26  Jonathan Bedard  <jbedard@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [webkitscmpy] Comment and close pull-requests
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCorecgBifurcatedGraphicsContextTestsCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/cg/BifurcatedGraphicsContextTestsCG.cpp (284901 => 284902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/cg/BifurcatedGraphicsContextTestsCG.cpp  2021-10-26 21:49:46 UTC (rev 284901)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/cg/BifurcatedGraphicsContextTestsCG.cpp     2021-10-26 21:50:28 UTC (rev 284902)
</span><span class="lines">@@ -278,6 +278,32 @@
</span><span class="cx">     EXPECT_EQ(primaryContext.clipBounds(), FloatRect(25, 25, 50, 50));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+TEST(BifurcatedGraphicsContextTests, ApplyDeviceScaleFactor)
+{
+    auto colorSpace = DestinationColorSpace::SRGB();
+    auto primaryCGContext = adoptCF(CGBitmapContextCreate(nullptr, 100, 100, 8, 4 * 100, colorSpace.platformColorSpace(), kCGImageAlphaPremultipliedLast));
+
+    GraphicsContextCG primaryContextCG(primaryCGContext.get());
+    GraphicsContext& primaryContext = primaryContextCG;
+
+    InMemoryDisplayList displayList;
+    RecorderImpl secondaryContextDL(displayList, { }, FloatRect(0, 0, 100, 100), { });
+    GraphicsContext& secondaryContext = secondaryContextDL;
+
+    BifurcatedGraphicsContext ctx(primaryContext, secondaryContext);
+
+    ctx.applyDeviceScaleFactor(2);
+
+    auto primaryCTM = primaryContext.getCTM(GraphicsContext::IncludeDeviceScale::DefinitelyIncludeDeviceScale);
+    auto secondaryCTM = secondaryContext.getCTM(GraphicsContext::IncludeDeviceScale::DefinitelyIncludeDeviceScale);
+
+    EXPECT_EQ(primaryCTM.xScale(), secondaryCTM.xScale());
+    EXPECT_EQ(primaryCTM.yScale(), secondaryCTM.yScale());
+
+    EXPECT_EQ(primaryCTM.xScale(), 2);
+    EXPECT_EQ(primaryCTM.yScale(), 2);
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span><span class="cx"> 
</span><span class="cx"> #endif // USE(CG)
</span></span></pre>
</div>
</div>

</body>
</html>