<!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>[179568] branches/safari-600.5-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/179568">179568</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-02-03 13:40:24 -0800 (Tue, 03 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>2015-02-03 Dean Jackson <dino@apple.com>
Merge <a href="http://trac.webkit.org/projects/webkit/changeset/178380">r178380</a>. <rdar://problem/19465133>
2015-01-13 Dean Jackson <dino@apple.com>
Filters aren't applied to elements in columns after the first
https://bugs.webkit.org/show_bug.cgi?id=140331
Reviewed by Simon Fraser.
The important bits of this change came from Simon.
Filters and clipping were not taking columns into
account when using their offset rectangles. The fix
is to recalculate the rects if you're in such a
situation.
Tests: fast/multicol/clip-in-columns.html
fast/multicol/filter-in-columns.html
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::hasFilterThatIsPainting): New method used
to check if we're about to paint a filter.
(WebCore::RenderLayer::setupFilters): Use the new helper if possible.
(WebCore::RenderLayer::paintLayerContents): If we're in columns,
and we either have a clip or a filter, recalculate the offset rectangles.
* rendering/RenderLayer.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchSourceWebCoreChangeLog">branches/safari-600.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderLayercpp">branches/safari-600.5-branch/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderLayerh">branches/safari-600.5-branch/Source/WebCore/rendering/RenderLayer.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6005branchLayoutTestsfastmulticolclipincolumnsexpectedhtml">branches/safari-600.5-branch/LayoutTests/fast/multicol/clip-in-columns-expected.html</a></li>
<li><a href="#branchessafari6005branchLayoutTestsfastmulticolclipincolumnshtml">branches/safari-600.5-branch/LayoutTests/fast/multicol/clip-in-columns.html</a></li>
<li><a href="#branchessafari6005branchLayoutTestsfastmulticolfilterincolumnsexpectedhtml">branches/safari-600.5-branch/LayoutTests/fast/multicol/filter-in-columns-expected.html</a></li>
<li><a href="#branchessafari6005branchLayoutTestsfastmulticolfilterincolumnshtml">branches/safari-600.5-branch/LayoutTests/fast/multicol/filter-in-columns.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchLayoutTestsfastmulticolclipincolumnsexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-600.5-branch/LayoutTests/fast/multicol/clip-in-columns-expected.html (0 => 179568)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/fast/multicol/clip-in-columns-expected.html (rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/multicol/clip-in-columns-expected.html 2015-02-03 21:40:24 UTC (rev 179568)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<style>
+section {
+ height: 200px;
+ width: 300px;
+ position: relative;
+}
+
+p {
+ padding: 0;
+ margin: 0;
+}
+
+.break-after {
+ page-break-after: always;
+}
+
+.clipped {
+ position: absolute;
+ left: 150px;
+ top: 0;
+ width: 150px;
+ background: blue;
+ color: white;
+ -webkit-clip-path: polygon(5px 5px, 60px 5px, 60px 20px, 5px 20px);
+}
+</style>
+<section>
+<p class="break-after">Hello</p>
+<p class="clipped">World</p>
+</section>
</ins><span class="cx">Property changes on: branches/safari-600.5-branch/LayoutTests/fast/multicol/clip-in-columns-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="branchessafari6005branchLayoutTestsfastmulticolclipincolumnshtml"></a>
<div class="addfile"><h4>Added: branches/safari-600.5-branch/LayoutTests/fast/multicol/clip-in-columns.html (0 => 179568)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/fast/multicol/clip-in-columns.html (rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/multicol/clip-in-columns.html 2015-02-03 21:40:24 UTC (rev 179568)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<style>
+section {
+ columns: 2;
+ column-gap: 0;
+ height: 200px;
+ width: 300px;
+}
+
+p {
+ padding: 0;
+ margin: 0;
+}
+
+.break-after {
+ page-break-after: always;
+}
+
+.clipped {
+ background: blue;
+ color: white;
+ -webkit-clip-path: polygon(5px 5px, 60px 5px, 60px 20px, 5px 20px);
+}
+</style>
+<section>
+<p class="break-after">Hello</p>
+<p class="clipped">World</p>
+</section>
</ins><span class="cx">Property changes on: branches/safari-600.5-branch/LayoutTests/fast/multicol/clip-in-columns.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="branchessafari6005branchLayoutTestsfastmulticolfilterincolumnsexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-600.5-branch/LayoutTests/fast/multicol/filter-in-columns-expected.html (0 => 179568)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/fast/multicol/filter-in-columns-expected.html (rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/multicol/filter-in-columns-expected.html 2015-02-03 21:40:24 UTC (rev 179568)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<style>
+section {
+ height: 200px;
+ width: 300px;
+ position: relative;
+}
+
+p {
+ padding: 0;
+ margin: 0;
+}
+
+.break-after {
+ page-break-after: always;
+}
+
+.filtered {
+ position: absolute;
+ left: 150px;
+ top: 0;
+ width: 150px;
+ background: white;
+ -webkit-filter: invert();
+}
+</style>
+<section>
+<p class="break-after">Hello</p>
+<p class="filtered">World</p>
+</section>
</ins><span class="cx">Property changes on: branches/safari-600.5-branch/LayoutTests/fast/multicol/filter-in-columns-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="branchessafari6005branchLayoutTestsfastmulticolfilterincolumnshtml"></a>
<div class="addfile"><h4>Added: branches/safari-600.5-branch/LayoutTests/fast/multicol/filter-in-columns.html (0 => 179568)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/fast/multicol/filter-in-columns.html (rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/multicol/filter-in-columns.html 2015-02-03 21:40:24 UTC (rev 179568)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<style>
+section {
+ columns: 2;
+ column-gap: 0;
+ height: 200px;
+ width: 300px;
+}
+
+p {
+ padding: 0;
+ margin: 0;
+}
+
+.break-after {
+ page-break-after: always;
+}
+
+.filtered {
+ background: white;
+ -webkit-filter: invert();
+}
+</style>
+<section>
+<p class="break-after">Hello</p>
+<p class="filtered">World</p>
+</section>
</ins><span class="cx">Property changes on: branches/safari-600.5-branch/LayoutTests/fast/multicol/filter-in-columns.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="branchessafari6005branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (179567 => 179568)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-02-03 21:37:56 UTC (rev 179567)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-02-03 21:40:24 UTC (rev 179568)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-02-03 Dean Jackson <dino@apple.com>
+
+ Merge r178380. <rdar://problem/19465133>
+
+ 2015-01-13 Dean Jackson <dino@apple.com>
+
+ Filters aren't applied to elements in columns after the first
+ https://bugs.webkit.org/show_bug.cgi?id=140331
+
+ Reviewed by Simon Fraser.
+
+ The important bits of this change came from Simon.
+ Filters and clipping were not taking columns into
+ account when using their offset rectangles. The fix
+ is to recalculate the rects if you're in such a
+ situation.
+
+ Tests: fast/multicol/clip-in-columns.html
+ fast/multicol/filter-in-columns.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::hasFilterThatIsPainting): New method used
+ to check if we're about to paint a filter.
+ (WebCore::RenderLayer::setupFilters): Use the new helper if possible.
+ (WebCore::RenderLayer::paintLayerContents): If we're in columns,
+ and we either have a clip or a filter, recalculate the offset rectangles.
+ * rendering/RenderLayer.h:
+
</ins><span class="cx"> 2015-02-02 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r178661. rdar://problem/19617731
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderLayer.cpp (179567 => 179568)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderLayer.cpp 2015-02-03 21:37:56 UTC (rev 179567)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderLayer.cpp 2015-02-03 21:40:24 UTC (rev 179568)
</span><span class="lines">@@ -3882,24 +3882,35 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><del>-
-std::unique_ptr<FilterEffectRendererHelper> RenderLayer::setupFilters(GraphicsContext* context, LayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags, const LayoutSize& offsetFromRoot, LayoutRect& rootRelativeBounds, bool& rootRelativeBoundsComputed)
</del><ins>+bool RenderLayer::hasFilterThatIsPainting(GraphicsContext* context, PaintLayerFlags paintFlags) const
</ins><span class="cx"> {
</span><span class="cx"> if (context->paintingDisabled())
</span><del>- return nullptr;
</del><ins>+ return false;
</ins><span class="cx">
</span><span class="cx"> if (paintFlags & PaintLayerPaintingOverlayScrollbars)
</span><del>- return nullptr;
</del><ins>+ return false;
</ins><span class="cx">
</span><span class="cx"> FilterInfo* filterInfo = FilterInfo::getIfExists(*this);
</span><span class="cx"> bool hasPaintedFilter = filterInfo && filterInfo->renderer() && paintsWithFilters();
</span><span class="cx"> if (!hasPaintedFilter)
</span><del>- return nullptr;
</del><ins>+ return false;
</ins><span class="cx">
</span><span class="cx"> auto filterPainter = std::make_unique<FilterEffectRendererHelper>(hasPaintedFilter);
</span><span class="cx"> if (!filterPainter->haveFilterEffect())
</span><ins>+ return false;
+
+ return true;
+}
+
+std::unique_ptr<FilterEffectRendererHelper> RenderLayer::setupFilters(GraphicsContext* context, LayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags, const LayoutSize& offsetFromRoot, LayoutRect& rootRelativeBounds, bool& rootRelativeBoundsComputed)
+{
+ if (!hasFilterThatIsPainting(context, paintFlags))
</ins><span class="cx"> return nullptr;
</span><del>-
</del><ins>+
+ FilterInfo* filterInfo = FilterInfo::getIfExists(*this);
+ bool hasPaintedFilter = filterInfo && filterInfo->renderer() && paintsWithFilters();
+ auto filterPainter = std::make_unique<FilterEffectRendererHelper>(hasPaintedFilter);
+
</ins><span class="cx"> LayoutRect filterRepaintRect = filterInfo->dirtySourceRect();
</span><span class="cx"> filterRepaintRect.move(offsetFromRoot);
</span><span class="cx">
</span><span class="lines">@@ -4020,13 +4031,20 @@
</span><span class="cx"> bool needToAdjustSubpixelQuantization = setupFontSubpixelQuantization(context, didQuantizeFonts);
</span><span class="cx">
</span><span class="cx"> // Apply clip-path to context.
</span><del>- bool hasClipPath = setupClipPath(context, paintingInfo, offsetFromRoot, rootRelativeBounds, rootRelativeBoundsComputed);
</del><ins>+ LayoutSize columnAwareOffsetFromRoot = offsetFromRoot;
+#if ENABLE(CSS_FILTERS)
+ if (renderer().flowThreadContainingBlock() && (renderer().hasClipPath() || hasFilterThatIsPainting(context, paintFlags)))
+#else
+ if (renderer().flowThreadContainingBlock() && renderer().hasClipPath())
+#endif
+ columnAwareOffsetFromRoot = toLayoutSize(convertToLayerCoords(paintingInfo.rootLayer, LayoutPoint(), AdjustForColumns));
+ bool hasClipPath = setupClipPath(context, paintingInfo, columnAwareOffsetFromRoot, rootRelativeBounds, rootRelativeBoundsComputed);
</ins><span class="cx">
</span><span class="cx"> LayerPaintingInfo localPaintingInfo(paintingInfo);
</span><span class="cx">
</span><span class="cx"> GraphicsContext* transparencyLayerContext = context;
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><del>- std::unique_ptr<FilterEffectRendererHelper> filterPainter = setupFilters(context, localPaintingInfo, paintFlags, offsetFromRoot, rootRelativeBounds, rootRelativeBoundsComputed);
</del><ins>+ std::unique_ptr<FilterEffectRendererHelper> filterPainter = setupFilters(context, localPaintingInfo, paintFlags, columnAwareOffsetFromRoot, rootRelativeBounds, rootRelativeBoundsComputed);
</ins><span class="cx"> if (filterPainter) {
</span><span class="cx"> context = filterPainter->filterContext();
</span><span class="cx"> if (context != transparencyLayerContext && haveTransparency) {
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderLayer.h (179567 => 179568)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderLayer.h 2015-02-03 21:37:56 UTC (rev 179567)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderLayer.h 2015-02-03 21:40:24 UTC (rev 179568)
</span><span class="lines">@@ -984,6 +984,7 @@
</span><span class="cx"> bool setupFontSubpixelQuantization(GraphicsContext*, bool& didQuantizeFonts);
</span><span class="cx"> bool setupClipPath(GraphicsContext*, const LayerPaintingInfo&, const LayoutSize& offsetFromRoot, LayoutRect& rootRelativeBounds, bool& rootRelativeBoundsComputed);
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><ins>+ bool hasFilterThatIsPainting(GraphicsContext*, PaintLayerFlags) const;
</ins><span class="cx"> std::unique_ptr<FilterEffectRendererHelper> setupFilters(GraphicsContext*, LayerPaintingInfo&, PaintLayerFlags, const LayoutSize& offsetFromRoot, LayoutRect& rootRelativeBounds, bool& rootRelativeBoundsComputed);
</span><span class="cx"> GraphicsContext* applyFilters(FilterEffectRendererHelper*, GraphicsContext* originalContext, LayerPaintingInfo&, LayerFragments&);
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>