<!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>[163831] branches/safari-537.75-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/163831">163831</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-02-10 16:03:44 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/156082">r156082</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53775branchLayoutTestsChangeLog">branches/safari-537.75-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreChangeLog">branches/safari-537.75-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebCorerenderingRenderNamedFlowThreadcpp">branches/safari-537.75-branch/Source/WebCore/rendering/RenderNamedFlowThread.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53775branchLayoutTestsfastregionsgetregionflowrangesinlinesvgexpectedtxt">branches/safari-537.75-branch/LayoutTests/fast/regions/get-region-flow-ranges-inline-svg-expected.txt</a></li>
<li><a href="#branchessafari53775branchLayoutTestsfastregionsgetregionflowrangesinlinesvghtml">branches/safari-537.75-branch/LayoutTests/fast/regions/get-region-flow-ranges-inline-svg.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53775branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/LayoutTests/ChangeLog (163830 => 163831)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-02-10 23:59:16 UTC (rev 163830)
+++ branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-02-11 00:03:44 UTC (rev 163831)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-02-10 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r156082
+
+ 2013-09-18 Mihnea Ovidenie <mihnea@adobe.com>
+
+ [CSSRegions] Failed to retrieve named flow ranges for content with inline svg
+ https://bugs.webkit.org/show_bug.cgi?id=121489
+
+ Reviewed by David Hyatt.
+
+ * fast/regions/get-region-flow-ranges-inline-svg-expected.txt: Added.
+ * fast/regions/get-region-flow-ranges-inline-svg.html: Added.
+
+2014-02-10 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r158676
</span><span class="cx">
</span><span class="cx"> 2013-11-05 Daniel Bates <dabates@apple.com>
</span></span></pre></div>
<a id="branchessafari53775branchLayoutTestsfastregionsgetregionflowrangesinlinesvgexpectedtxtfromrev156082trunkLayoutTestsfastregionsgetregionflowrangesinlinesvgexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.75-branch/LayoutTests/fast/regions/get-region-flow-ranges-inline-svg-expected.txt (from rev 156082, trunk/LayoutTests/fast/regions/get-region-flow-ranges-inline-svg-expected.txt) (0 => 163831)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/fast/regions/get-region-flow-ranges-inline-svg-expected.txt (rev 0)
+++ branches/safari-537.75-branch/LayoutTests/fast/regions/get-region-flow-ranges-inline-svg-expected.txt 2014-02-11 00:03:44 UTC (rev 163831)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+Test that getting the region ranges when the flowing content has inline svg does not crash.
+
+On success you should see PASS below.
+
+PASS
+
+
</ins></span></pre></div>
<a id="branchessafari53775branchLayoutTestsfastregionsgetregionflowrangesinlinesvghtmlfromrev156082trunkLayoutTestsfastregionsgetregionflowrangesinlinesvghtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.75-branch/LayoutTests/fast/regions/get-region-flow-ranges-inline-svg.html (from rev 156082, trunk/LayoutTests/fast/regions/get-region-flow-ranges-inline-svg.html) (0 => 163831)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/fast/regions/get-region-flow-ranges-inline-svg.html (rev 0)
+++ branches/safari-537.75-branch/LayoutTests/fast/regions/get-region-flow-ranges-inline-svg.html 2014-02-11 00:03:44 UTC (rev 163831)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ #article { -webkit-flow-into: flow; }
+ #region { -webkit-flow-from: flow; width: 100px; height: 100px; }
+ </style>
+ </head>
+ <body>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ </script>
+ <p>Test that getting the region ranges when the flowing content has inline svg does not crash.</p>
+ <p>On success you should see PASS below.</p>
+ <p id="output"></p>
+ <div id="article">
+ <svg xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <rect width="100" height="100" style="fill:rgb(0,255,0)"/>
+ </svg>
+ </div>
+ <div id="region"></div>
+ <script>
+ var range = document.getElementById("region").webkitGetRegionFlowRanges();
+ document.getElementById("output").innerHTML = "PASS";
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (163830 => 163831)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-10 23:59:16 UTC (rev 163830)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-11 00:03:44 UTC (rev 163831)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-02-10 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r156082
+
+ 2013-09-18 Mihnea Ovidenie <mihnea@adobe.com>
+
+ [CSSRegions] Failed to retrieve named flow ranges for content with inline svg
+ https://bugs.webkit.org/show_bug.cgi?id=121489
+
+ Reviewed by David Hyatt.
+
+ The inline SVG element behaves like a replaced element in HTML context. When computing the ranges
+ that are displayed inside a region for a named flow that contains an inline SVG element, we have
+ to treat the SVG as a replaced and run the checks only for the SVG root element, skipping the
+ other SVG elements inside.
+
+ Test: fast/regions/get-region-flow-ranges-inline-svg.html
+
+ * rendering/RenderNamedFlowThread.cpp:
+ (WebCore::nextNodeInsideContentNode): Add function to retrieve the next node in traversal
+ under the contentNode subtree that should be used for getRanges inspection.
+ (WebCore::RenderNamedFlowThread::getRanges): Replace NodeTravesal::next with nextNodeInsideContentNode.
+
+2014-02-10 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r153507
</span><span class="cx">
</span><span class="cx"> 2013-07-30 Chris Fleizach <cfleizach@apple.com>
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCorerenderingRenderNamedFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/rendering/RenderNamedFlowThread.cpp (163830 => 163831)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/rendering/RenderNamedFlowThread.cpp 2014-02-10 23:59:16 UTC (rev 163830)
+++ branches/safari-537.75-branch/Source/WebCore/rendering/RenderNamedFlowThread.cpp 2014-02-11 00:03:44 UTC (rev 163831)
</span><span class="lines">@@ -477,6 +477,17 @@
</span><span class="cx"> && logicalTopForBox < logicalBottomForRegion && logicalTopForRegion < logicalBottomForBox;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Retrieve the next node to be visited while computing the ranges inside a region.
+static Node* nextNodeInsideContentNode(const Node* currNode, const Node* contentNode)
+{
+ ASSERT(currNode);
+ ASSERT(contentNode && contentNode->inNamedFlow());
+
+ if (currNode->renderer() && currNode->renderer()->isSVGRoot())
+ return NodeTraversal::nextSkippingChildren(currNode, contentNode);
+ return NodeTraversal::next(currNode, contentNode);
+}
+
</ins><span class="cx"> void RenderNamedFlowThread::getRanges(Vector<RefPtr<Range> >& rangeObjects, const RenderRegion* region) const
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit logicalTopForRegion;
</span><span class="lines">@@ -514,7 +525,7 @@
</span><span class="cx"> bool skipOverOutsideNodes = false;
</span><span class="cx"> Node* lastEndNode = 0;
</span><span class="cx">
</span><del>- for (Node* node = contentNode; node; node = NodeTraversal::next(node, contentNode)) {
</del><ins>+ for (Node* node = contentNode; node; node = nextNodeInsideContentNode(node, contentNode)) {
</ins><span class="cx"> RenderObject* renderer = node->renderer();
</span><span class="cx"> if (!renderer)
</span><span class="cx"> continue;
</span></span></pre>
</div>
</div>
</body>
</html>