<!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>[201901] 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/201901">201901</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-09 19:06:30 -0700 (Thu, 09 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] -webkit-overflow-scrolling: touch; ignores pointer-events: none;
https://bugs.webkit.org/show_bug.cgi?id=119839
<rdar://problem/9671514>
Patch by Antoine Quint <graouts@apple.com> on 2016-06-09
Reviewed by Simon Fraser.
Source/WebCore:
Propagate a "userInteractionEnabled" flag from the Web process which is used to turn off
user interaction on a UIScrollView created for -webkit-overflow-scrolling: touch.
Test: fast/scrolling/ios/touch-scroll-pointer-events-none.html
* platform/graphics/GraphicsLayer.cpp:
(WebCore::GraphicsLayer::GraphicsLayer):
* platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::userInteractionEnabled):
(WebCore::GraphicsLayer::setUserInteractionEnabled):
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::setUserInteractionEnabled):
(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
(WebCore::GraphicsLayerCA::updateUserInteractionEnabled):
* platform/graphics/ca/GraphicsLayerCA.h:
* platform/graphics/ca/PlatformCALayer.h:
* platform/graphics/ca/cocoa/PlatformCALayerCocoa.h:
* platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
(PlatformCALayerCocoa::userInteractionEnabled):
(PlatformCALayerCocoa::setUserInteractionEnabled):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateAfterDescendants):
Source/WebKit2:
Propagate a "userInteractionEnabled" flag from the Web process which is used to turn off
user interaction on a UIScrollView created for -webkit-overflow-scrolling: touch.
* Shared/mac/RemoteLayerTreePropertyApplier.mm:
(WebKit::RemoteLayerTreePropertyApplier::applyProperties):
* Shared/mac/RemoteLayerTreeTransaction.h:
* Shared/mac/RemoteLayerTreeTransaction.mm:
(WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties):
(WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
(WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):
(WebKit::dumpChangedLayers):
* WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
(WebKit::PlatformCALayerRemote::userInteractionEnabled):
(WebKit::PlatformCALayerRemote::setUserInteractionEnabled):
* WebProcess/WebPage/mac/PlatformCALayerRemote.h:
LayoutTests:
* fast/scrolling/ios/touch-scroll-pointer-events-none-expected.txt: Added.
* fast/scrolling/ios/touch-scroll-pointer-events-none.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="#trunkSourceWebCoreplatformgraphicsGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayerh">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoah">trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm">trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerTreePropertyAppliermm">trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionh">trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm">trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemotecpp">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteh">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastscrollingiostouchscrollpointereventsnoneexpectedtxt">trunk/LayoutTests/fast/scrolling/ios/touch-scroll-pointer-events-none-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastscrollingiostouchscrollpointereventsnonehtml">trunk/LayoutTests/fast/scrolling/ios/touch-scroll-pointer-events-none.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201900 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-10 02:03:33 UTC (rev 201900)
+++ trunk/LayoutTests/ChangeLog 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-09 Antoine Quint <graouts@apple.com>
+
+ [iOS] -webkit-overflow-scrolling: touch; ignores pointer-events: none;
+ https://bugs.webkit.org/show_bug.cgi?id=119839
+ <rdar://problem/9671514>
+
+ Reviewed by Simon Fraser.
+
+ * fast/scrolling/ios/touch-scroll-pointer-events-none-expected.txt: Added.
+ * fast/scrolling/ios/touch-scroll-pointer-events-none.html: Added.
+
</ins><span class="cx"> 2016-06-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> WorkerNavigator property should exist on WorkerGlobalScope
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingiostouchscrollpointereventsnoneexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/ios/touch-scroll-pointer-events-none-expected.txt (0 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/ios/touch-scroll-pointer-events-none-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/scrolling/ios/touch-scroll-pointer-events-none-expected.txt 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+PASS hitElement.id is "under-target"
+PASS scroller.scrollTop is 0
+swipe complete
+PASS scroller.scrollTop is 0
+PASS document.scrollingElement.scrollTop is 90
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastscrollingiostouchscrollpointereventsnonehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/ios/touch-scroll-pointer-events-none.html (0 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/ios/touch-scroll-pointer-events-none.html (rev 0)
+++ trunk/LayoutTests/fast/scrolling/ios/touch-scroll-pointer-events-none.html 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -0,0 +1,92 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <meta name="viewport" content="initial-scale=1.0">
+ <style>
+ body {
+ margin: 0;
+ height: 2000px;
+ }
+
+ .box {
+ height: 100px;
+ width: 100px;
+ background-color: blue;
+ }
+
+ .outer {
+ position: absolute;
+ top: 0;
+ }
+
+ .box:hover {
+ background-color: green;
+ }
+
+ .container {
+ position: absolute;
+ top: 50px;
+ left: 50px;
+ height: 300px;
+ width: 300px;
+ overflow: scroll;
+ -webkit-overflow-scrolling: touch;
+ border: 1px solid black;
+ pointer-events: none;
+ box-shadow: 0 0 10px black;
+ }
+
+ .content {
+ height: 600px;
+ }
+ </style>
+ <script src="../../../resources/js-test-pre.js"></script>
+ <script>
+ window.jsTestIsAsync = true;
+
+ function getUIScript()
+ {
+ return `
+ (function() {
+ uiController.dragFromPointToPoint(60, 200, 60, 100, 0.5, function() {
+ uiController.uiScriptComplete("");
+ });
+ })();`
+ }
+
+ var hitElement;
+ function runTest()
+ {
+ hitElement = document.elementFromPoint(20, 20);
+ shouldBeEqualToString("hitElement.id", "under-target");
+
+ var scroller = document.getElementById('scroller');
+ shouldBe("scroller.scrollTop", "0");
+
+ if (testRunner.runUIScript) {
+ testRunner.runUIScript(getUIScript(), function() {
+ debug("swipe complete");
+ shouldBe("scroller.scrollTop", "0");
+ shouldBe("document.scrollingElement.scrollTop", "90");
+ finishJSTest();
+ });
+ }
+ }
+ window.addEventListener('load', runTest, false);
+ </script>
+</head>
+<body>
+<div class="outer box" id="under-target">
+</div>
+
+<div id="scroller" class="container" onscroll="debug('overflow scroll')">
+ <div class="content">
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+ <div class="inner box" style="visibility: visible">
+ </div>
+ </div>
+</div>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201900 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-10 02:03:33 UTC (rev 201900)
+++ trunk/Source/WebCore/ChangeLog 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-06-09 Antoine Quint <graouts@apple.com>
+
+ [iOS] -webkit-overflow-scrolling: touch; ignores pointer-events: none;
+ https://bugs.webkit.org/show_bug.cgi?id=119839
+ <rdar://problem/9671514>
+
+ Reviewed by Simon Fraser.
+
+ Propagate a "userInteractionEnabled" flag from the Web process which is used to turn off
+ user interaction on a UIScrollView created for -webkit-overflow-scrolling: touch.
+
+ Test: fast/scrolling/ios/touch-scroll-pointer-events-none.html
+
+ * platform/graphics/GraphicsLayer.cpp:
+ (WebCore::GraphicsLayer::GraphicsLayer):
+ * platform/graphics/GraphicsLayer.h:
+ (WebCore::GraphicsLayer::userInteractionEnabled):
+ (WebCore::GraphicsLayer::setUserInteractionEnabled):
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::setUserInteractionEnabled):
+ (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
+ (WebCore::GraphicsLayerCA::updateUserInteractionEnabled):
+ * platform/graphics/ca/GraphicsLayerCA.h:
+ * platform/graphics/ca/PlatformCALayer.h:
+ * platform/graphics/ca/cocoa/PlatformCALayerCocoa.h:
+ * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+ (PlatformCALayerCocoa::userInteractionEnabled):
+ (PlatformCALayerCocoa::setUserInteractionEnabled):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateAfterDescendants):
+
</ins><span class="cx"> 2016-06-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> WorkerNavigator property should exist on WorkerGlobalScope
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (201900 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2016-06-10 02:03:33 UTC (rev 201900)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -128,6 +128,7 @@
</span><span class="cx"> , m_showRepaintCounter(false)
</span><span class="cx"> , m_isMaskLayer(false)
</span><span class="cx"> , m_isTrackingDisplayListReplay(false)
</span><ins>+ , m_userInteractionEnabled(true)
</ins><span class="cx"> , m_paintingPhase(GraphicsLayerPaintAllWithOverflowClip)
</span><span class="cx"> , m_contentsOrientation(CompositingCoordinatesTopDown)
</span><span class="cx"> , m_parent(nullptr)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (201900 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2016-06-10 02:03:33 UTC (rev 201900)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -346,6 +346,9 @@
</span><span class="cx"> bool contentsAreVisible() const { return m_contentsVisible; }
</span><span class="cx"> virtual void setContentsVisible(bool b) { m_contentsVisible = b; }
</span><span class="cx">
</span><ins>+ bool userInteractionEnabled() const { return m_userInteractionEnabled; }
+ virtual void setUserInteractionEnabled(bool b) { m_userInteractionEnabled = b; }
+
</ins><span class="cx"> bool acceleratesDrawing() const { return m_acceleratesDrawing; }
</span><span class="cx"> virtual void setAcceleratesDrawing(bool b) { m_acceleratesDrawing = b; }
</span><span class="cx">
</span><span class="lines">@@ -626,6 +629,7 @@
</span><span class="cx"> bool m_showRepaintCounter : 1;
</span><span class="cx"> bool m_isMaskLayer : 1;
</span><span class="cx"> bool m_isTrackingDisplayListReplay : 1;
</span><ins>+ bool m_userInteractionEnabled : 1;
</ins><span class="cx">
</span><span class="cx"> GraphicsLayerPaintingPhase m_paintingPhase;
</span><span class="cx"> CompositingCoordinatesOrientation m_contentsOrientation; // affects orientation of layer contents
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (201900 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2016-06-10 02:03:33 UTC (rev 201900)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -676,6 +676,15 @@
</span><span class="cx"> noteSublayersChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void GraphicsLayerCA::setUserInteractionEnabled(bool userInteractionEnabled)
+{
+ if (userInteractionEnabled == m_userInteractionEnabled)
+ return;
+
+ GraphicsLayer::setUserInteractionEnabled(userInteractionEnabled);
+ noteLayerPropertyChanged(UserInteractionEnabledChanged);
+}
+
</ins><span class="cx"> void GraphicsLayerCA::setAcceleratesDrawing(bool acceleratesDrawing)
</span><span class="cx"> {
</span><span class="cx"> if (acceleratesDrawing == m_acceleratesDrawing)
</span><span class="lines">@@ -1579,6 +1588,9 @@
</span><span class="cx"> if (m_uncommittedChanges & ContentsVisibilityChanged)
</span><span class="cx"> updateContentsVisibility();
</span><span class="cx">
</span><ins>+ if (m_uncommittedChanges & UserInteractionEnabledChanged)
+ updateUserInteractionEnabled();
+
</ins><span class="cx"> // Note that contentsScale can affect whether the layer can be opaque.
</span><span class="cx"> if (m_uncommittedChanges & ContentsOpaqueChanged)
</span><span class="cx"> updateContentsOpaque(pageScaleFactor);
</span><span class="lines">@@ -1884,6 +1896,11 @@
</span><span class="cx"> m_layer->setContentsHidden(!m_contentsVisible);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void GraphicsLayerCA::updateUserInteractionEnabled()
+{
+ m_layer->setUserInteractionEnabled(m_userInteractionEnabled);
+}
+
</ins><span class="cx"> void GraphicsLayerCA::updateContentsOpaque(float pageScaleFactor)
</span><span class="cx"> {
</span><span class="cx"> bool contentsOpaque = m_contentsOpaque;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (201900 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2016-06-10 02:03:33 UTC (rev 201900)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -91,6 +91,7 @@
</span><span class="cx"> WEBCORE_EXPORT void setContentsVisible(bool) override;
</span><span class="cx"> WEBCORE_EXPORT void setAcceleratesDrawing(bool) override;
</span><span class="cx"> WEBCORE_EXPORT void setUsesDisplayListDrawing(bool) override;
</span><ins>+ WEBCORE_EXPORT void setUserInteractionEnabled(bool) override;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setBackgroundColor(const Color&) override;
</span><span class="cx">
</span><span class="lines">@@ -399,6 +400,7 @@
</span><span class="cx"> void updateDrawsContent();
</span><span class="cx"> void updateCoverage();
</span><span class="cx"> void updateBackgroundColor();
</span><ins>+ void updateUserInteractionEnabled();
</ins><span class="cx">
</span><span class="cx"> void updateContentsImage();
</span><span class="cx"> void updateContentsPlatformLayer();
</span><span class="lines">@@ -495,6 +497,7 @@
</span><span class="cx"> BlendModeChanged = 1LLU << 34,
</span><span class="cx"> ShapeChanged = 1LLU << 35,
</span><span class="cx"> WindRuleChanged = 1LLU << 36,
</span><ins>+ UserInteractionEnabledChanged = 1LLU << 37,
</ins><span class="cx"> };
</span><span class="cx"> typedef uint64_t LayerChangeFlags;
</span><span class="cx"> enum ScheduleFlushOrNot { ScheduleFlush, DontScheduleFlush };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h (201900 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2016-06-10 02:03:33 UTC (rev 201900)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -161,6 +161,8 @@
</span><span class="cx"> // Used to disable user interaction for some platforms.
</span><span class="cx"> virtual bool contentsHidden() const = 0;
</span><span class="cx"> virtual void setContentsHidden(bool) = 0;
</span><ins>+ virtual bool userInteractionEnabled() const = 0;
+ virtual void setUserInteractionEnabled(bool) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual bool geometryFlipped() const = 0;
</span><span class="cx"> virtual void setGeometryFlipped(bool) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.h (201900 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.h 2016-06-10 02:03:33 UTC (rev 201900)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.h 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -93,6 +93,9 @@
</span><span class="cx"> bool contentsHidden() const override;
</span><span class="cx"> void setContentsHidden(bool) override;
</span><span class="cx">
</span><ins>+ bool userInteractionEnabled() const override;
+ void setUserInteractionEnabled(bool) override;
+
</ins><span class="cx"> void setBackingStoreAttached(bool) override;
</span><span class="cx"> bool backingStoreAttached() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (201900 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2016-06-10 02:03:33 UTC (rev 201900)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -628,6 +628,15 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool PlatformCALayerCocoa::userInteractionEnabled() const
+{
+ return true;
+}
+
+void PlatformCALayerCocoa::setUserInteractionEnabled(bool)
+{
+}
+
</ins><span class="cx"> void PlatformCALayerCocoa::setBackingStoreAttached(bool)
</span><span class="cx"> {
</span><span class="cx"> // We could throw away backing store here with setContents:nil.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (201900 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-06-10 02:03:33 UTC (rev 201900)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -1071,8 +1071,10 @@
</span><span class="cx"> updateDrawsContent(isSimpleContainer);
</span><span class="cx">
</span><span class="cx"> m_graphicsLayer->setContentsVisible(m_owningLayer.hasVisibleContent() || isPaintDestinationForDescendantLayers());
</span><del>- if (m_scrollingLayer)
</del><ins>+ if (m_scrollingLayer) {
</ins><span class="cx"> m_scrollingLayer->setContentsVisible(renderer().style().visibility() == VISIBLE);
</span><ins>+ m_scrollingLayer->setUserInteractionEnabled(renderer().style().pointerEvents() != PE_NONE);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Avoid repaints when clip path changes.
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (201900 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-10 02:03:33 UTC (rev 201900)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-06-09 Antoine Quint <graouts@apple.com>
+
+ [iOS] -webkit-overflow-scrolling: touch; ignores pointer-events: none;
+ https://bugs.webkit.org/show_bug.cgi?id=119839
+ <rdar://problem/9671514>
+
+ Reviewed by Simon Fraser.
+
+ Propagate a "userInteractionEnabled" flag from the Web process which is used to turn off
+ user interaction on a UIScrollView created for -webkit-overflow-scrolling: touch.
+
+ * Shared/mac/RemoteLayerTreePropertyApplier.mm:
+ (WebKit::RemoteLayerTreePropertyApplier::applyProperties):
+ * Shared/mac/RemoteLayerTreeTransaction.h:
+ * Shared/mac/RemoteLayerTreeTransaction.mm:
+ (WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties):
+ (WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
+ (WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):
+ (WebKit::dumpChangedLayers):
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+ (WebKit::PlatformCALayerRemote::userInteractionEnabled):
+ (WebKit::PlatformCALayerRemote::setUserInteractionEnabled):
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.h:
+
</ins><span class="cx"> 2016-06-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove OriginAndDatabases.cpp, it's unused
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreePropertyAppliermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm (201900 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm 2016-06-10 02:03:33 UTC (rev 201900)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -331,10 +331,10 @@
</span><span class="cx"> maskOwnerLayer.mask = maskView.layer;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- if (properties.changedProperties & RemoteLayerTreeTransaction::ContentsHiddenChanged)
- view.userInteractionEnabled = !properties.contentsHidden;
</del><span class="cx">
</span><ins>+ if (properties.changedProperties & (RemoteLayerTreeTransaction::ContentsHiddenChanged | RemoteLayerTreeTransaction::UserInteractionEnabledChanged))
+ view.userInteractionEnabled = !properties.contentsHidden && properties.userInteractionEnabled;
+
</ins><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h (201900 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h 2016-06-10 02:03:33 UTC (rev 201900)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -89,6 +89,7 @@
</span><span class="cx"> AnimationsChanged = 1LLU << 34,
</span><span class="cx"> EdgeAntialiasingMaskChanged = 1LLU << 35,
</span><span class="cx"> CustomAppearanceChanged = 1LLU << 36,
</span><ins>+ UserInteractionEnabledChanged = 1LLU << 37,
</ins><span class="cx"> };
</span><span class="cx"> typedef uint64_t LayerChange;
</span><span class="cx">
</span><span class="lines">@@ -166,6 +167,7 @@
</span><span class="cx"> bool masksToBounds;
</span><span class="cx"> bool opaque;
</span><span class="cx"> bool contentsHidden;
</span><ins>+ bool userInteractionEnabled;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> explicit RemoteLayerTreeTransaction();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm (201900 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2016-06-10 02:03:33 UTC (rev 201900)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -104,6 +104,7 @@
</span><span class="cx"> , masksToBounds(false)
</span><span class="cx"> , opaque(false)
</span><span class="cx"> , contentsHidden(false)
</span><ins>+ , userInteractionEnabled(true)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -142,6 +143,7 @@
</span><span class="cx"> , masksToBounds(other.masksToBounds)
</span><span class="cx"> , opaque(other.opaque)
</span><span class="cx"> , contentsHidden(other.contentsHidden)
</span><ins>+ , userInteractionEnabled(other.userInteractionEnabled)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: LayerProperties should reference backing store by ID, so that two layers can have the same backing store (for clones).
</span><span class="cx"> // FIXME: LayerProperties shouldn't be copyable; PlatformCALayerRemote::clone should copy the relevant properties.
</span><span class="lines">@@ -273,6 +275,9 @@
</span><span class="cx">
</span><span class="cx"> if (changedProperties & CustomAppearanceChanged)
</span><span class="cx"> encoder.encodeEnum(customAppearance);
</span><ins>+
+ if (changedProperties & UserInteractionEnabledChanged)
+ encoder << userInteractionEnabled;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RemoteLayerTreeTransaction::LayerProperties::decode(IPC::ArgumentDecoder& decoder, LayerProperties& result)
</span><span class="lines">@@ -491,6 +496,11 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (result.changedProperties & UserInteractionEnabledChanged) {
+ if (!decoder.decode(result.userInteractionEnabled))
+ return false;
+ }
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -814,6 +824,9 @@
</span><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::CustomAppearanceChanged)
</span><span class="cx"> ts.dumpProperty("customAppearance", layerProperties.customAppearance);
</span><ins>+
+ if (layerProperties.changedProperties & RemoteLayerTreeTransaction::UserInteractionEnabledChanged)
+ ts.dumpProperty("userInteractionEnabled", layerProperties.userInteractionEnabled);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemotecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (201900 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2016-06-10 02:03:33 UTC (rev 201900)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -527,6 +527,20 @@
</span><span class="cx"> m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::ContentsHiddenChanged);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool PlatformCALayerRemote::userInteractionEnabled() const
+{
+ return m_properties.userInteractionEnabled;
+}
+
+void PlatformCALayerRemote::setUserInteractionEnabled(bool value)
+{
+ if (m_properties.userInteractionEnabled == value)
+ return;
+
+ m_properties.userInteractionEnabled = value;
+ m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::UserInteractionEnabledChanged);
+}
+
</ins><span class="cx"> void PlatformCALayerRemote::setBackingStoreAttached(bool value)
</span><span class="cx"> {
</span><span class="cx"> if (m_properties.backingStoreAttached == value)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h (201900 => 201901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2016-06-10 02:03:33 UTC (rev 201900)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2016-06-10 02:06:30 UTC (rev 201901)
</span><span class="lines">@@ -97,6 +97,9 @@
</span><span class="cx"> bool contentsHidden() const override;
</span><span class="cx"> void setContentsHidden(bool) override;
</span><span class="cx">
</span><ins>+ bool userInteractionEnabled() const override;
+ void setUserInteractionEnabled(bool) override;
+
</ins><span class="cx"> void setBackingStoreAttached(bool) override;
</span><span class="cx"> bool backingStoreAttached() const override;
</span><span class="cx"> bool backingContributesToMemoryEstimate() const override { return backingStoreAttached(); }
</span></span></pre>
</div>
</div>
</body>
</html>