<!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>[248772] 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/248772">248772</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2019-08-16 08:48:03 -0700 (Fri, 16 Aug 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Content in <iframe> should override "touch-action" set in embedding document
https://bugs.webkit.org/show_bug.cgi?id=200204
<rdar://problem/54355249>

Reviewed by Antoine Quint.

Source/WebCore:

Test: pointerevents/ios/touch-action-region-frame.html

Subframes where content doesn't use any touch-action properties won't generate event region for their main layer.
As a result the touch-action property gets computed in UI process to the parent frames touch-action (instead of 'auto').

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

Generate event region for the main layer of subframes.

LayoutTests:

* pointerevents/ios/touch-action-region-frame-expected.txt: Added.
* pointerevents/ios/touch-action-region-frame.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestspointereventsiostouchactionregionframeexpectedtxt">trunk/LayoutTests/pointerevents/ios/touch-action-region-frame-expected.txt</a></li>
<li><a href="#trunkLayoutTestspointereventsiostouchactionregionframehtml">trunk/LayoutTests/pointerevents/ios/touch-action-region-frame.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (248771 => 248772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-08-16 15:04:39 UTC (rev 248771)
+++ trunk/LayoutTests/ChangeLog 2019-08-16 15:48:03 UTC (rev 248772)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-08-16  Antti Koivisto  <antti@apple.com>
+
+        Content in <iframe> should override "touch-action" set in embedding document
+        https://bugs.webkit.org/show_bug.cgi?id=200204
+        <rdar://problem/54355249>
+
+        Reviewed by Antoine Quint.
+
+        * pointerevents/ios/touch-action-region-frame-expected.txt: Added.
+        * pointerevents/ios/touch-action-region-frame.html: Added.
+
</ins><span class="cx"> 2019-08-16  Chris Lord  <clord@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Update WebGL test expectations for WebKit WPE
</span></span></pre></div>
<a id="trunkLayoutTestspointereventsiostouchactionregionframeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/pointerevents/ios/touch-action-region-frame-expected.txt (0 => 248772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/pointerevents/ios/touch-action-region-frame-expected.txt                               (rev 0)
+++ trunk/LayoutTests/pointerevents/ios/touch-action-region-frame-expected.txt  2019-08-16 15:48:03 UTC (rev 248772)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+ 
+(GraphicsLayer
+  (anchor 0.00 0.00)
+  (bounds 300.00 1016.00)
+  (children 1
+    (GraphicsLayer
+      (bounds 300.00 1016.00)
+      (drawsContent 1)
+      (event region
+        (rect (0,0) width=300 height=1016)
+      )
+      (children 1
+        (GraphicsLayer
+        )
+      )
+    )
+  )
+)
+(GraphicsLayer
+  (anchor 0.00 0.00)
+  (bounds 300.00 1016.00)
+  (children 1
+    (GraphicsLayer
+      (bounds 300.00 1016.00)
+      (drawsContent 1)
+      (event region
+        (rect (0,0) width=300 height=1016)
+        (touch-action
+          (manipulation          
+            (rect (0,0) width=27 height=8)
+            (rect (0,8) width=292 height=11)
+            (rect (8,19) width=284 height=989)
+          )
+        )
+      )
+      (children 1
+        (GraphicsLayer
+        )
+      )
+    )
+  )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestspointereventsiostouchactionregionframehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/pointerevents/ios/touch-action-region-frame.html (0 => 248772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/pointerevents/ios/touch-action-region-frame.html                               (rev 0)
+++ trunk/LayoutTests/pointerevents/ios/touch-action-region-frame.html  2019-08-16 15:48:03 UTC (rev 248772)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ internal:AsyncOverflowScrollingEnabled=true internal:AsyncFrameScrollingEnabled=true ] -->
+<html>
+<style>
+body { touch-action: none; }
+</style>
+<body onload="test()">
+<iframe srcdoc="<body style='height:1000px'>Test</body>"></iframe>
+<iframe srcdoc="<body style='height:1000px;touch-action:manipulation'>Test</body>"></iframe>
+
+<pre id="results"></pre>
+<script>
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+}
+
+function test() {
+    if (!window.internals)
+        return;
+    for (const frame of document.querySelectorAll("iframe")) {
+        const doc = frame.contentDocument;
+        results.innerText += internals.layerTreeAsText(doc, internals.LAYER_TREE_INCLUDES_EVENT_REGION |  internals.LAYER_TREE_INCLUDES_ROOT_LAYER_PROPERTIES);
+    }
+    testRunner.notifyDone();
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (248771 => 248772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-08-16 15:04:39 UTC (rev 248771)
+++ trunk/Source/WebCore/ChangeLog      2019-08-16 15:48:03 UTC (rev 248772)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2019-08-16  Antti Koivisto  <antti@apple.com>
+
+        Content in <iframe> should override "touch-action" set in embedding document
+        https://bugs.webkit.org/show_bug.cgi?id=200204
+        <rdar://problem/54355249>
+
+        Reviewed by Antoine Quint.
+
+        Test: pointerevents/ios/touch-action-region-frame.html
+
+        Subframes where content doesn't use any touch-action properties won't generate event region for their main layer.
+        As a result the touch-action property gets computed in UI process to the parent frames touch-action (instead of 'auto').
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateEventRegion):
+
+        Generate event region for the main layer of subframes.
+
</ins><span class="cx"> 2019-08-16  Miguel Gomez  <magomez@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK][WPE] Move TextureMapperAnimation to the nicosia namespace as Nicosia::Animation
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (248771 => 248772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp    2019-08-16 15:04:39 UTC (rev 248771)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp       2019-08-16 15:48:03 UTC (rev 248772)
</span><span class="lines">@@ -1588,7 +1588,7 @@
</span><span class="cx"> #if ENABLE(POINTER_EVENTS)
</span><span class="cx">     hasTouchActionElements = renderer().document().mayHaveElementsWithNonAutoTouchAction();
</span><span class="cx"> #endif
</span><del>-    if (m_owningLayer.isRenderViewLayer() && !hasTouchActionElements)
</del><ins>+    if (m_isMainFrameRenderViewLayer && !hasTouchActionElements)
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     GraphicsContext nullContext(nullptr);
</span></span></pre>
</div>
</div>

</body>
</html>