<!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>[172776] branches/safari-600.1-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/172776">172776</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-08-19 16:20:37 -0700 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/172656">r172656</a>. <rdar://problem/17961698></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsChangeLog">branches/safari-600.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCorerenderingRenderElementcpp">branches/safari-600.1-branch/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCorerenderingstyleRenderStylecpp">branches/safari-600.1-branch/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCorerenderingstyleRenderStyleh">branches/safari-600.1-branch/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCorerenderingstyleRenderStyleConstantsh">branches/safari-600.1-branch/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestscompositingcliprectandpositionchangeoncompositinglayerexpectedhtml">branches/safari-600.1-branch/LayoutTests/compositing/cliprect-and-position-change-on-compositing-layer-expected.html</a></li>
<li><a href="#branchessafari6001branchLayoutTestscompositingcliprectandpositionchangeoncompositinglayerhtml">branches/safari-600.1-branch/LayoutTests/compositing/cliprect-and-position-change-on-compositing-layer.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (172775 => 172776)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-19 23:12:54 UTC (rev 172775)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-19 23:20:37 UTC (rev 172776)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2014-08-19 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172656. <rdar://problem/17961698>
+
+ 2014-08-15 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION: Parts of the route/route options windows are invisible at maps.google.com
+ https://bugs.webkit.org/show_bug.cgi?id=135977
+ <rdar://problem/17961698>
+
+ Reviewed by Andreas Kling.
+
+ When the style change requires both layout and repaint, the style diff is set to
+ 'layout is needed' (and masks the repaint change) as normally layout is followed by a repaint.
+ However, in compositing context, layout may not be followed by repaint, so when the style diff
+ indicates layout, we need to figure out whether it implies repaint too.
+ This logic should eventually be moved from RenderElement to RenderLayerModelObject/RenderLayer.
+ -tracked here: webkit.org/b/135990
+
+ * compositing/cliprect-and-position-change-on-compositing-layer-expected.html: Added.
+ * compositing/cliprect-and-position-change-on-compositing-layer.html: Added.
+
+2014-08-19 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r172603
</span><span class="cx">
</span><span class="cx"> 2014-08-14 Martin Hock <mhock@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestscompositingcliprectandpositionchangeoncompositinglayerexpectedhtmlfromrev172656trunkLayoutTestscompositingcliprectandpositionchangeoncompositinglayerexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/compositing/cliprect-and-position-change-on-compositing-layer-expected.html (from rev 172656, trunk/LayoutTests/compositing/cliprect-and-position-change-on-compositing-layer-expected.html) (0 => 172776)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/compositing/cliprect-and-position-change-on-compositing-layer-expected.html (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/compositing/cliprect-and-position-change-on-compositing-layer-expected.html 2014-08-19 23:20:37 UTC (rev 172776)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that compositing layers get repainted properly when cliprect is applied with position change.</title>
+<style>
+ #foo {
+ position: absolute;
+ top: 1px;
+ left: 0px;
+ width: 100px;
+ height: 100px;
+ background-color: green;
+ -webkit-transform: translateZ(0);
+}
+</style>
+</head>
+<body>
+<div id=foo></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTestscompositingcliprectandpositionchangeoncompositinglayerhtmlfromrev172656trunkLayoutTestscompositingcliprectandpositionchangeoncompositinglayerhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/compositing/cliprect-and-position-change-on-compositing-layer.html (from rev 172656, trunk/LayoutTests/compositing/cliprect-and-position-change-on-compositing-layer.html) (0 => 172776)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/compositing/cliprect-and-position-change-on-compositing-layer.html (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/compositing/cliprect-and-position-change-on-compositing-layer.html 2014-08-19 23:20:37 UTC (rev 172776)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that compositing layers get repainted properly when cliprect is applied with position change.</title>
+<style>
+ #foo {
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ width: 100px;
+ height: 100px;
+ background-color: green;
+ clip: rect(70px, 102px, 102px, -1px);
+ -webkit-transform: translateZ(0);
+}
+</style>
+</head>
+<body>
+<div id=foo></div>
+<script>
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ setTimeout(function() {
+ var box = document.getElementById("foo");
+ box.style.clip = "rect(0px, 102px, 202px, 0px)";
+ box.style.top = "1px";
+ box.offsetHeight;
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172775 => 172776)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-19 23:12:54 UTC (rev 172775)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-19 23:20:37 UTC (rev 172776)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2014-08-19 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172656. <rdar://problem/17961698>
+
+ 2014-08-15 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION: Parts of the route/route options windows are invisible at maps.google.com
+ https://bugs.webkit.org/show_bug.cgi?id=135977
+ <rdar://problem/17961698>
+
+ Reviewed by Andreas Kling.
+
+ When the style change requires both layout and repaint, the style diff is set to
+ 'layout is needed' (and masks the repaint change) as normally layout is followed by a repaint.
+ However, in compositing context, layout may not be followed by repaint, so when the style diff
+ indicates layout, we need to figure out whether it implies repaint too.
+ This logic should eventually be moved from RenderElement to RenderLayerModelObject/RenderLayer.
+ -tracked here: webkit.org/b/135990
+
+ Test: compositing/cliprect-and-position-change-on-compositing-layer.html
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::setNeedsPositionedMovementLayout):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::changeRequiresLayerRepaint):
+ (WebCore::RenderStyle::diffRequiresLayerRepaint):
+ (WebCore::RenderStyle::diffRequiresRepaint): Deleted.
+ * rendering/style/RenderStyle.h:
+ * rendering/style/RenderStyleConstants.h:
+
+2014-08-19 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r172603
</span><span class="cx">
</span><span class="cx"> 2014-08-14 Martin Hock <mhock@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/rendering/RenderElement.cpp (172775 => 172776)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/rendering/RenderElement.cpp 2014-08-19 23:12:54 UTC (rev 172775)
+++ branches/safari-600.1-branch/Source/WebCore/rendering/RenderElement.cpp 2014-08-19 23:20:37 UTC (rev 172776)
</span><span class="lines">@@ -1028,7 +1028,7 @@
</span><span class="cx"> setNeedsPositionedMovementLayoutBit(true);
</span><span class="cx"> markContainingBlocksForLayout();
</span><span class="cx"> if (hasLayer()) {
</span><del>- if (oldStyle && style().diffRequiresRepaint(oldStyle))
</del><ins>+ if (oldStyle && style().diffRequiresLayerRepaint(*oldStyle, toRenderLayerModelObject(this)->layer()->isComposited()))
</ins><span class="cx"> setLayerNeedsFullRepaint();
</span><span class="cx"> else
</span><span class="cx"> setLayerNeedsFullRepaintForPositionedMovementLayout();
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/rendering/style/RenderStyle.cpp (172775 => 172776)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/rendering/style/RenderStyle.cpp 2014-08-19 23:12:54 UTC (rev 172775)
+++ branches/safari-600.1-branch/Source/WebCore/rendering/style/RenderStyle.cpp 2014-08-19 23:20:37 UTC (rev 172776)
</span><span class="lines">@@ -678,9 +678,10 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if (position() != StaticPosition) {
</span><del>- if (visual->clip != other->visual->clip
- || visual->hasClip != other->visual->hasClip)
</del><ins>+ if (visual->clip != other->visual->clip || visual->hasClip != other->visual->hasClip) {
+ changedContextSensitiveProperties |= ContextSensitivePropertyClipRect;
</ins><span class="cx"> return true;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="lines">@@ -809,10 +810,17 @@
</span><span class="cx"> return StyleDifferenceEqual;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderStyle::diffRequiresRepaint(const RenderStyle* style) const
</del><ins>+bool RenderStyle::diffRequiresLayerRepaint(const RenderStyle& style, bool isComposited) const
</ins><span class="cx"> {
</span><span class="cx"> unsigned changedContextSensitiveProperties = 0;
</span><del>- return changeRequiresRepaint(style, changedContextSensitiveProperties);
</del><ins>+
+ if (changeRequiresRepaint(&style, changedContextSensitiveProperties))
+ return true;
+
+ if (isComposited && changeRequiresLayerRepaint(&style, changedContextSensitiveProperties))
+ return changedContextSensitiveProperties & ContextSensitivePropertyClipRect;
+
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderStyle::setClip(Length top, Length right, Length bottom, Length left)
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/rendering/style/RenderStyle.h (172775 => 172776)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/rendering/style/RenderStyle.h 2014-08-19 23:12:54 UTC (rev 172775)
+++ branches/safari-600.1-branch/Source/WebCore/rendering/style/RenderStyle.h 2014-08-19 23:20:37 UTC (rev 172776)
</span><span class="lines">@@ -1708,7 +1708,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> StyleDifference diff(const RenderStyle*, unsigned& changedContextSensitiveProperties) const;
</span><del>- bool diffRequiresRepaint(const RenderStyle*) const;
</del><ins>+ bool diffRequiresLayerRepaint(const RenderStyle&, bool isComposited) const;
</ins><span class="cx">
</span><span class="cx"> bool isDisplayReplacedType() const { return isDisplayReplacedType(display()); }
</span><span class="cx"> bool isDisplayInlineType() const { return isDisplayInlineType(display()); }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/rendering/style/RenderStyleConstants.h (172775 => 172776)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-08-19 23:12:54 UTC (rev 172775)
+++ branches/safari-600.1-branch/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-08-19 23:20:37 UTC (rev 172776)
</span><span class="lines">@@ -64,7 +64,8 @@
</span><span class="cx"> ContextSensitivePropertyNone = 0,
</span><span class="cx"> ContextSensitivePropertyTransform = (1 << 0),
</span><span class="cx"> ContextSensitivePropertyOpacity = (1 << 1),
</span><del>- ContextSensitivePropertyFilter = (1 << 2)
</del><ins>+ ContextSensitivePropertyFilter = (1 << 2),
+ ContextSensitivePropertyClipRect = (1 << 3)
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Static pseudo styles. Dynamic ones are produced on the fly.
</span></span></pre>
</div>
</div>
</body>
</html>