<!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>[160720] 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/160720">160720</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-17 12:11:56 -0800 (Tue, 17 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/160717">r160717</a>.
http://trac.webkit.org/changeset/160717
https://bugs.webkit.org/show_bug.cgi?id=125863
New tests are failing, and possibly broke an existing test
(Requested by ap on #webkit).
Source/WebCore:
* rendering/FlowThreadController.cpp:
(WebCore::FlowThreadController::collectFixedPositionedLayers):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::paintFixedLayersInNamedFlows):
(WebCore::RenderLayer::hitTestFixedLayersInNamedFlows):
LayoutTests:
* fast/regions/repaint/fixed-in-named-flow-cb-changed-expected.txt: Removed.
* fast/regions/repaint/fixed-in-named-flow-cb-changed.html: Removed.
* fast/regions/repaint/fixed-in-named-flow-cb-changed2-expected.txt: Removed.
* fast/regions/repaint/fixed-in-named-flow-cb-changed2.html: Removed.</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="#trunkSourceWebCorerenderingFlowThreadControllercpp">trunk/Source/WebCore/rendering/FlowThreadController.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastregionsrepaintfixedinnamedflowcbchangedexpectedtxt">trunk/LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastregionsrepaintfixedinnamedflowcbchangedhtml">trunk/LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsrepaintfixedinnamedflowcbchanged2expectedtxt">trunk/LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastregionsrepaintfixedinnamedflowcbchanged2html">trunk/LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed2.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160719 => 160720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-17 20:10:12 UTC (rev 160719)
+++ trunk/LayoutTests/ChangeLog 2013-12-17 20:11:56 UTC (rev 160720)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-12-17 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r160717.
+ http://trac.webkit.org/changeset/160717
+ https://bugs.webkit.org/show_bug.cgi?id=125863
+
+ New tests are failing, and possibly broke an existing test
+ (Requested by ap on #webkit).
+
+ * fast/regions/repaint/fixed-in-named-flow-cb-changed-expected.txt: Removed.
+ * fast/regions/repaint/fixed-in-named-flow-cb-changed.html: Removed.
+ * fast/regions/repaint/fixed-in-named-flow-cb-changed2-expected.txt: Removed.
+ * fast/regions/repaint/fixed-in-named-flow-cb-changed2.html: Removed.
+
</ins><span class="cx"> 2013-12-17 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Invalid dir attributes should resolve to ltr
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsrepaintfixedinnamedflowcbchangedexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed-expected.txt (160719 => 160720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed-expected.txt 2013-12-17 20:10:12 UTC (rev 160719)
+++ trunk/LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed-expected.txt 2013-12-17 20:11:56 UTC (rev 160720)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-(repaint rects
- (rect 150 150 100 100)
- (rect 50 50 50 50)
- (rect 150 150 100 100)
- (rect 200 200 50 50)
- (rect 100 100 200 200)
- (rect 100 100 200 200)
- (rect 100 100 200 200)
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastregionsrepaintfixedinnamedflowcbchangedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed.html (160719 => 160720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed.html 2013-12-17 20:10:12 UTC (rev 160719)
+++ trunk/LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed.html 2013-12-17 20:11:56 UTC (rev 160720)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
- <head>
- <script>
- if (window.internals)
- window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(false);
- </script>
- <script src="../repaint/resources/text-based-repaint.js"></script>
- <style>
- #red { position: absolute; top: 200px; left: 200px; width: 50px; height: 50px; background-color: red;}
-
- #region { -webkit-flow-from: flow; position: absolute; top: 100px; left: 100px; width: 200px; height: 200px; }
-
- #parent { -webkit-flow-into: flow; position: absolute; top: 50px; left: 50px; width: 100px; height: 100px; }
-
- #fixed { position: fixed; top: 50px; left: 50px; width: 50px; height: 50px; background-color: green; }
-
- .transformed { -webkit-transform: scale3d(1, 1, 1); }
- </style>
- </head>
- <body onload="runRepaintTest()">
- <!--
- Test for WebKit bug: https://bugs.webkit.org/show_bug.cgi?id=125756
- That that a fixed positioned element whose parent gets a 3d transform dynamically is correctly re-positioned relative to the parent.
- On success, you should see a green rectangle and no red.
- -->
- <div id="red"></div>
- <div id="parent">
- <div id="fixed"></div>
- </div>
- <div id="region"></div>
- <script>
- function repaintTest() {
- document.getElementById("parent").className = "transformed";
- }
- </script>
- </body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastregionsrepaintfixedinnamedflowcbchanged2expectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed2-expected.txt (160719 => 160720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed2-expected.txt 2013-12-17 20:10:12 UTC (rev 160719)
+++ trunk/LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed2-expected.txt 2013-12-17 20:11:56 UTC (rev 160720)
</span><span class="lines">@@ -1,5 +0,0 @@
</span><del>-(repaint rects
- (rect 50 50 50 50)
- (rect 100 100 200 200)
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastregionsrepaintfixedinnamedflowcbchanged2html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed2.html (160719 => 160720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed2.html 2013-12-17 20:10:12 UTC (rev 160719)
+++ trunk/LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed2.html 2013-12-17 20:11:56 UTC (rev 160720)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
- <head>
- <script>
- if (window.internals)
- window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(false);
- </script>
- <script src="../repaint/resources/text-based-repaint.js"></script>
- <style>
- #red { position: absolute; top: 50px; left: 50px; width: 50px; height: 50px; background-color: red;}
-
- #region { -webkit-flow-from: flow; position: absolute; top: 100px; left: 100px; width: 200px; height: 200px; }
-
- #parent { -webkit-flow-into: flow; position: absolute; top: 50px; left: 50px; width: 100px; height: 100px; }
-
- #fixed { position: fixed; top: 50px; left: 50px; width: 50px; height: 50px; background-color: green; }
-
- .transformed { -webkit-transform: scale3d(1, 1, 1); }
- </style>
- </head>
- <body onload="runRepaintTest()">
- <!--
- Test for WebKit bug: https://bugs.webkit.org/show_bug.cgi?id=125756
- Test that a fixed positioned element whose parent dynamically looses its transformation is correctly re-positioned relative to the view.
- On success, you should see a green rectangle and no red.
- -->
- <div id="red"></div>
- <div id="parent" class="transformed">
- <div id="fixed"></div>
- </div>
-
- <div id="region"></div>
-
- <script>
- function repaintTest() {
- document.getElementById("parent").className = "";
- }
- </script>
- </body>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160719 => 160720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-17 20:10:12 UTC (rev 160719)
+++ trunk/Source/WebCore/ChangeLog 2013-12-17 20:11:56 UTC (rev 160720)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-12-17 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r160717.
+ http://trac.webkit.org/changeset/160717
+ https://bugs.webkit.org/show_bug.cgi?id=125863
+
+ New tests are failing, and possibly broke an existing test
+ (Requested by ap on #webkit).
+
+ * rendering/FlowThreadController.cpp:
+ (WebCore::FlowThreadController::collectFixedPositionedLayers):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::paintFixedLayersInNamedFlows):
+ (WebCore::RenderLayer::hitTestFixedLayersInNamedFlows):
+
</ins><span class="cx"> 2013-12-17 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Invalid dir attributes should resolve to ltr
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingFlowThreadControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/FlowThreadController.cpp (160719 => 160720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/FlowThreadController.cpp 2013-12-17 20:10:12 UTC (rev 160719)
+++ trunk/Source/WebCore/rendering/FlowThreadController.cpp 2013-12-17 20:11:56 UTC (rev 160720)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+
</ins><span class="cx"> #include "FlowThreadController.h"
</span><span class="cx">
</span><span class="cx"> #include "NamedFlowCollection.h"
</span><span class="lines">@@ -279,15 +280,8 @@
</span><span class="cx"> return m_mapNamedFlowContentElement.contains(&contentElement);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Helper for the sorting of layers by z-index.
-static inline bool compareZIndex(RenderLayer* first, RenderLayer* second)
-{
- return first->zIndex() < second->zIndex();
-}
-
-// Collect the fixed positioned layers that have the named flows as containing block.
</del><ins>+// Collect the fixed positioned layers that have the named flows as containing block
</ins><span class="cx"> // These layers are painted and hit-tested starting from RenderView not from regions.
</span><del>-// The list of layers is returned sorted by z-index.
</del><span class="cx"> void FlowThreadController::collectFixedPositionedLayers(Vector<RenderLayer*>& fixedPosLayers) const
</span><span class="cx"> {
</span><span class="cx"> for (auto iter = m_renderNamedFlowThreadList->begin(), end = m_renderNamedFlowThreadList->end(); iter != end; ++iter) {
</span><span class="lines">@@ -298,27 +292,17 @@
</span><span class="cx"> if (!flowRenderer->hasRegions())
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- RenderLayer* flowThreadLayer = flowRenderer->layer();
- if (Vector<RenderLayer*>* negZOrderList = flowThreadLayer->negZOrderList()) {
- for (size_t i = 0, size = negZOrderList->size(); i < size; ++i) {
- RenderLayer* currLayer = negZOrderList->at(i);
- if (currLayer->renderer().style().position() != FixedPosition)
</del><ins>+ // Iterate over the fixed positioned elements in the flow thread
+ TrackedRendererListHashSet* positionedDescendants = flowRenderer->positionedObjects();
+ if (positionedDescendants) {
+ for (auto it = positionedDescendants->begin(), end = positionedDescendants->end(); it != end; ++it) {
+ RenderBox* box = *it;
+ if (!box->fixedPositionedWithNamedFlowContainingBlock())
</ins><span class="cx"> continue;
</span><del>- fixedPosLayers.append(currLayer);
</del><ins>+ fixedPosLayers.append(box->layer());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- if (Vector<RenderLayer*>* posZOrderList = flowThreadLayer->posZOrderList()) {
- for (size_t i = 0, size = posZOrderList->size(); i < size; ++i) {
- RenderLayer* currLayer = posZOrderList->at(i);
- if (currLayer->renderer().style().position() != FixedPosition)
- continue;
- fixedPosLayers.append(currLayer);
- }
- }
</del><span class="cx"> }
</span><del>-
- std::stable_sort(fixedPosLayers.begin(), fixedPosLayers.end(), compareZIndex);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (160719 => 160720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-12-17 20:10:12 UTC (rev 160719)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-12-17 20:11:56 UTC (rev 160720)
</span><span class="lines">@@ -4044,6 +4044,9 @@
</span><span class="cx"> Vector<RenderLayer*> fixedLayers;
</span><span class="cx"> renderer().view().flowThreadController().collectFixedPositionedLayers(fixedLayers);
</span><span class="cx">
</span><ins>+ // Sort the fixed layers list
+ std::stable_sort(fixedLayers.begin(), fixedLayers.end(), compareZIndex);
+
</ins><span class="cx"> // Paint the layers
</span><span class="cx"> for (size_t i = 0; i < fixedLayers.size(); ++i) {
</span><span class="cx"> RenderLayer* fixedLayer = fixedLayers.at(i);
</span><span class="lines">@@ -4791,6 +4794,9 @@
</span><span class="cx"> Vector<RenderLayer*> fixedLayers;
</span><span class="cx"> renderer().view().flowThreadController().collectFixedPositionedLayers(fixedLayers);
</span><span class="cx">
</span><ins>+ // Sort the fixed layers list
+ std::stable_sort(fixedLayers.begin(), fixedLayers.end(), compareZIndex);
+
</ins><span class="cx"> // Hit test the layers
</span><span class="cx"> RenderLayer* resultLayer = 0;
</span><span class="cx"> for (int i = fixedLayers.size() - 1; i >= 0; --i) {
</span></span></pre>
</div>
</div>
</body>
</html>