<!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>[171132] 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/171132">171132</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-07-15 19:58:21 -0700 (Tue, 15 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Fix touches inside accelerated overflow:scroll
https://bugs.webkit.org/show_bug.cgi?id=134961
<rdar://problem/16088789>
Reviewed by Benjamin Poulain.
When individual elements inside an overflow:scroll with -webkit-overflow-scrolling: touch
had touch event listeners, we would fail to take the scroll offset into account when
building the touch event region, causing touches on those elements to fail after scrolling.
Touch event region building uses RenderObject::absoluteClippedOverflowRect(), and that
code path tries to fix up repaint rects to work correctly in composited overflow:scroll.
However, that broke the touch region computation.
Fix by only ignoring the scroll offset for calls to computeRectForRepaint() which
have a non-null repaintContainer (which indicates that we're doing a repaint in the
compositing layer), and for which the repaintContainer is the containing block
which is using composited scrolling. This restores correct behavior to the event region
code which always calls this with a null repaintContainer.
* rendering/RenderBox.cpp:
(WebCore::shouldAppyContainersClipAndOffset):
(WebCore::RenderBox::computeRectForRepaint):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171131 => 171132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-16 02:26:49 UTC (rev 171131)
+++ trunk/Source/WebCore/ChangeLog 2014-07-16 02:58:21 UTC (rev 171132)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2014-07-15 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Fix touches inside accelerated overflow:scroll
+ https://bugs.webkit.org/show_bug.cgi?id=134961
+ <rdar://problem/16088789>
+
+ Reviewed by Benjamin Poulain.
+
+ When individual elements inside an overflow:scroll with -webkit-overflow-scrolling: touch
+ had touch event listeners, we would fail to take the scroll offset into account when
+ building the touch event region, causing touches on those elements to fail after scrolling.
+
+ Touch event region building uses RenderObject::absoluteClippedOverflowRect(), and that
+ code path tries to fix up repaint rects to work correctly in composited overflow:scroll.
+ However, that broke the touch region computation.
+
+ Fix by only ignoring the scroll offset for calls to computeRectForRepaint() which
+ have a non-null repaintContainer (which indicates that we're doing a repaint in the
+ compositing layer), and for which the repaintContainer is the containing block
+ which is using composited scrolling. This restores correct behavior to the event region
+ code which always calls this with a null repaintContainer.
+
+ * rendering/RenderBox.cpp:
+ (WebCore::shouldAppyContainersClipAndOffset):
+ (WebCore::RenderBox::computeRectForRepaint):
+
+2014-07-15 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> [iOS] Fix issues drawing subsampled image elements and CSS images
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134944
</span><span class="cx"> <rdar://problem/17634095>
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (171131 => 171132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-07-16 02:26:49 UTC (rev 171131)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-07-16 02:58:21 UTC (rev 171132)
</span><span class="lines">@@ -2110,6 +2110,18 @@
</span><span class="cx"> return r;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline bool shouldAppyContainersClipAndOffset(const RenderLayerModelObject* repaintContainer, RenderBox* containerBox)
+{
+#if PLATFORM(IOS)
+ if (!repaintContainer || repaintContainer != containerBox)
+ return true;
+
+ return !containerBox->hasLayer() || !containerBox->layer()->usesCompositedScrolling();
+#else
+ return true;
+#endif
+}
+
</ins><span class="cx"> void RenderBox::computeRectForRepaint(const RenderLayerModelObject* repaintContainer, LayoutRect& rect, bool fixed) const
</span><span class="cx"> {
</span><span class="cx"> // The rect we compute at each step is shifted by our x/y offset in the parent container's coordinate space.
</span><span class="lines">@@ -2200,15 +2212,11 @@
</span><span class="cx"> rect.setLocation(topLeft);
</span><span class="cx"> if (o->hasOverflowClip()) {
</span><span class="cx"> RenderBox* containerBox = toRenderBox(o);
</span><del>-#if PLATFORM(IOS)
- if (!containerBox->layer() || !containerBox->layer()->usesCompositedScrolling()) {
-#endif
- containerBox->applyCachedClipAndScrollOffsetForRepaint(rect);
- if (rect.isEmpty())
- return;
-#if PLATFORM(IOS)
- }
-#endif
</del><ins>+ if (shouldAppyContainersClipAndOffset(repaintContainer, containerBox)) {
+ containerBox->applyCachedClipAndScrollOffsetForRepaint(rect);
+ if (rect.isEmpty())
+ return;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (containerSkipped) {
</span></span></pre>
</div>
</div>
</body>
</html>