<!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>[245379] branches/safari-608.1.24-branch</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/245379">245379</a></dd>
<dt>Author</dt> <dd>kocsen_chung@apple.com</dd>
<dt>Date</dt> <dd>2019-05-15 22:43:11 -0700 (Wed, 15 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/245175">r245175</a>. rdar://problem/50584991

    Event region generation needs to know about backing-sharing
    https://bugs.webkit.org/show_bug.cgi?id=197694
    <rdar://problem/50584991>

    Reviewed by Simon Fraser.

    Source/WebCore:

    Test: pointerevents/ios/touch-action-region-backing-sharing.html

    * rendering/RenderLayerBacking.cpp:
    (WebCore::RenderLayerBacking::updateEventRegion):

    Gather event region from backing sharing layers too.

    LayoutTests:

    * platform/ios-wk2/TestExpectations:
    * pointerevents/ios/touch-action-region-backing-sharing-expected.txt: Added.
    * pointerevents/ios/touch-action-region-backing-sharing.html: Added.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245175 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari608124branchLayoutTestsChangeLog">branches/safari-608.1.24-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari608124branchSourceWebCoreChangeLog">branches/safari-608.1.24-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari608124branchSourceWebCorerenderingRenderLayerBackingcpp">branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari608124branchLayoutTestspointereventsiostouchactionregionbackingsharingexpectedtxt">branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing-expected.txt</a></li>
<li><a href="#branchessafari608124branchLayoutTestspointereventsiostouchactionregionbackingsharinghtml">branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari608124branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24-branch/LayoutTests/ChangeLog (245378 => 245379)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24-branch/LayoutTests/ChangeLog    2019-05-16 05:43:07 UTC (rev 245378)
+++ branches/safari-608.1.24-branch/LayoutTests/ChangeLog       2019-05-16 05:43:11 UTC (rev 245379)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2019-05-15  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r245175. rdar://problem/50584991
+
+    Event region generation needs to know about backing-sharing
+    https://bugs.webkit.org/show_bug.cgi?id=197694
+    <rdar://problem/50584991>
+    
+    Reviewed by Simon Fraser.
+    
+    Source/WebCore:
+    
+    Test: pointerevents/ios/touch-action-region-backing-sharing.html
+    
+    * rendering/RenderLayerBacking.cpp:
+    (WebCore::RenderLayerBacking::updateEventRegion):
+    
+    Gather event region from backing sharing layers too.
+    
+    LayoutTests:
+    
+    * platform/ios-wk2/TestExpectations:
+    * pointerevents/ios/touch-action-region-backing-sharing-expected.txt: Added.
+    * pointerevents/ios/touch-action-region-backing-sharing.html: Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245175 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-10  Antti Koivisto  <antti@apple.com>
+
+            Event region generation needs to know about backing-sharing
+            https://bugs.webkit.org/show_bug.cgi?id=197694
+            <rdar://problem/50584991>
+
+            Reviewed by Simon Fraser.
+
+            * platform/ios-wk2/TestExpectations:
+            * pointerevents/ios/touch-action-region-backing-sharing-expected.txt: Added.
+            * pointerevents/ios/touch-action-region-backing-sharing.html: Added.
+
</ins><span class="cx"> 2019-05-15  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Revert r245025. rdar://problem/50753129
</span></span></pre></div>
<a id="branchessafari608124branchLayoutTestspointereventsiostouchactionregionbackingsharingexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing-expected.txt (0 => 245379)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing-expected.txt                           (rev 0)
+++ branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing-expected.txt      2019-05-16 05:43:11 UTC (rev 245379)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+(GraphicsLayer
+  (anchor 0.00 0.00)
+  (bounds 800.00 600.00)
+  (deep color 1)
+  (children 1
+    (GraphicsLayer
+      (bounds 800.00 600.00)
+      (contentsOpaque 1)
+      (event region
+        (rect (0,0) width=800 height=600)
+      )
+      (deep color 1)
+      (children 2
+        (GraphicsLayer
+          (position 8.00 13.00)
+          (bounds 200.00 200.00)
+          (event region
+            (rect (0,0) width=500 height=500)
+          )
+          (deep color 1)
+          (children 1
+            (GraphicsLayer
+              (bounds 200.00 200.00)
+              (children 1
+                (GraphicsLayer
+                  (anchor 0.00 0.00)
+                  (bounds 500.00 500.00)
+                  (drawsContent 1)
+                  (deep color 1)
+                )
+              )
+            )
+          )
+        )
+        (GraphicsLayer
+          (position 8.00 13.00)
+          (bounds 150.00 150.00)
+          (drawsContent 1)
+          (event region
+            (rect (0,0) width=100 height=50)
+            (rect (0,50) width=150 height=50)
+            (rect (50,100) width=100 height=50)
+            (touch-action
+              (none              
+                (rect (0,0) width=100 height=50)
+                (rect (0,50) width=150 height=50)
+                (rect (50,100) width=100 height=50)
+              )
+            )
+          )
+          (deep color 1)
+        )
+      )
+    )
+  )
+)
+
</ins></span></pre></div>
<a id="branchessafari608124branchLayoutTestspointereventsiostouchactionregionbackingsharinghtml"></a>
<div class="addfile"><h4>Added: branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing.html (0 => 245379)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing.html                           (rev 0)
+++ branches/safari-608.1.24-branch/LayoutTests/pointerevents/ios/touch-action-region-backing-sharing.html      2019-05-16 05:43:11 UTC (rev 245379)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ internal:AsyncOverflowScrollingEnabled=true ] -->
+<html>
+<style>
+.scroll { position:absolute; width:200px; height:200px; overflow:scroll }
+.scrollcontent {  width:500px; height:500px; background:green; }
+.overlap { position:absolute; width:100px; height:100px; background:blue; touch-action: none; }
+</style>
+<body>
+<div class="scroll"><div class="scrollcontent"></div></div>
+<div class="overlap">
+    <div class="overlap" style="left:50px; top:50px"></div>
+</div>
+<pre id="results"></pre>
+<script>
+if (window.testRunner)
+    testRunner.dumpAsText();
+if (window.internals)
+    results.innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_EVENT_REGION);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari608124branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24-branch/Source/WebCore/ChangeLog (245378 => 245379)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24-branch/Source/WebCore/ChangeLog 2019-05-16 05:43:07 UTC (rev 245378)
+++ branches/safari-608.1.24-branch/Source/WebCore/ChangeLog    2019-05-16 05:43:11 UTC (rev 245379)
</span><span class="lines">@@ -1,5 +1,48 @@
</span><span class="cx"> 2019-05-15  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r245175. rdar://problem/50584991
+
+    Event region generation needs to know about backing-sharing
+    https://bugs.webkit.org/show_bug.cgi?id=197694
+    <rdar://problem/50584991>
+    
+    Reviewed by Simon Fraser.
+    
+    Source/WebCore:
+    
+    Test: pointerevents/ios/touch-action-region-backing-sharing.html
+    
+    * rendering/RenderLayerBacking.cpp:
+    (WebCore::RenderLayerBacking::updateEventRegion):
+    
+    Gather event region from backing sharing layers too.
+    
+    LayoutTests:
+    
+    * platform/ios-wk2/TestExpectations:
+    * pointerevents/ios/touch-action-region-backing-sharing-expected.txt: Added.
+    * pointerevents/ios/touch-action-region-backing-sharing.html: Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245175 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-10  Antti Koivisto  <antti@apple.com>
+
+            Event region generation needs to know about backing-sharing
+            https://bugs.webkit.org/show_bug.cgi?id=197694
+            <rdar://problem/50584991>
+
+            Reviewed by Simon Fraser.
+
+            Test: pointerevents/ios/touch-action-region-backing-sharing.html
+
+            * rendering/RenderLayerBacking.cpp:
+            (WebCore::RenderLayerBacking::updateEventRegion):
+
+            Gather event region from backing sharing layers too.
+
+2019-05-15  Kocsen Chung  <kocsen_chung@apple.com>
+
</ins><span class="cx">         Cherry-pick r245156. rdar://problem/50590818
</span><span class="cx"> 
</span><span class="cx">     Refine AudioSession route sharing policy
</span></span></pre></div>
<a id="branchessafari608124branchSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (245378 => 245379)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerBacking.cpp  2019-05-16 05:43:07 UTC (rev 245378)
+++ branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerBacking.cpp     2019-05-16 05:43:11 UTC (rev 245379)
</span><span class="lines">@@ -1443,6 +1443,9 @@
</span><span class="cx">     auto paintFlags = RenderLayer::paintLayerPaintingCompositingAllPhasesFlags() | RenderLayer::PaintLayerCollectingEventRegion;
</span><span class="cx">     m_owningLayer.paintLayerContents(nullContext, paintingInfo, paintFlags);
</span><span class="cx"> 
</span><ins>+    for (auto& layerWeakPtr : m_backingSharingLayers)
+        layerWeakPtr->paintLayerContents(nullContext, paintingInfo, paintFlags);
+
</ins><span class="cx">     auto contentOffset = roundedIntSize(contentOffsetInCompositingLayer());
</span><span class="cx">     eventRegion.translate(contentOffset);
</span><span class="cx">     m_graphicsLayer->setEventRegion(WTFMove(eventRegion));
</span></span></pre>
</div>
</div>

</body>
</html>