<!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>[160857] branches/safari-537.74-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/160857">160857</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2013-12-19 13:55:49 -0800 (Thu, 19 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/160819">r160819</a>: <rdar://problems/15701133></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53774branchLayoutTestsChangeLog">branches/safari-537.74-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53774branchSourceWebCoreChangeLog">branches/safari-537.74-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53774branchSourceWebCorerenderingLogicalSelectionOffsetCachesh">branches/safari-537.74-branch/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53774branchLayoutTestssvgtextselecttextinsidenonstaticpositionexpectedtxt">branches/safari-537.74-branch/LayoutTests/svg/text/select-text-inside-non-static-position-expected.txt</a></li>
<li><a href="#branchessafari53774branchLayoutTestssvgtextselecttextinsidenonstaticpositionhtml">branches/safari-537.74-branch/LayoutTests/svg/text/select-text-inside-non-static-position.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53774branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/LayoutTests/ChangeLog (160856 => 160857)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/LayoutTests/ChangeLog 2013-12-19 21:52:15 UTC (rev 160856)
+++ branches/safari-537.74-branch/LayoutTests/ChangeLog 2013-12-19 21:55:49 UTC (rev 160857)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-12-19 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r160819: <rdar://problems/15701133>
+
+ 2013-12-18 Ryosuke Niwa <rniwa@webkit.org>
+
+ Crash in WebCore::LogicalSelectionOffsetCaches::LogicalSelectionOffsetCaches
+ https://bugs.webkit.org/show_bug.cgi?id=125970
+
+ Reviewed by Antti Koivisto.
+
+ Added a regression test.
+
+ * svg/text/select-text-inside-non-static-position-expected.txt: Added.
+ * svg/text/select-text-inside-non-static-position.html: Added.
+
</ins><span class="cx"> 2013-12-11 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merged patch from <rdar://problems/15474133>. This patch is a port of r157821.
</span></span></pre></div>
<a id="branchessafari53774branchLayoutTestssvgtextselecttextinsidenonstaticpositionexpectedtxtfromrev160819trunkLayoutTestssvgtextselecttextinsidenonstaticpositionexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.74-branch/LayoutTests/svg/text/select-text-inside-non-static-position-expected.txt (from rev 160819, trunk/LayoutTests/svg/text/select-text-inside-non-static-position-expected.txt) (0 => 160857)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/LayoutTests/svg/text/select-text-inside-non-static-position-expected.txt (rev 0)
+++ branches/safari-537.74-branch/LayoutTests/svg/text/select-text-inside-non-static-position-expected.txt 2013-12-19 21:55:49 UTC (rev 160857)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This tests selecting text inside a non-statically positioned SVG content. WebKit should not hit assertions. PASS.
</ins></span></pre></div>
<a id="branchessafari53774branchLayoutTestssvgtextselecttextinsidenonstaticpositionhtmlfromrev160819trunkLayoutTestssvgtextselecttextinsidenonstaticpositionhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.74-branch/LayoutTests/svg/text/select-text-inside-non-static-position.html (from rev 160819, trunk/LayoutTests/svg/text/select-text-inside-non-static-position.html) (0 => 160857)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/LayoutTests/svg/text/select-text-inside-non-static-position.html (rev 0)
+++ branches/safari-537.74-branch/LayoutTests/svg/text/select-text-inside-non-static-position.html 2013-12-19 21:55:49 UTC (rev 160857)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+* {
+ position: -webkit-sticky;
+ -webkit-transform: scaleX(2);
+}
+</style>
+</head>
+<body>
+<p id="description">This tests selecting text inside a non-statically positioned SVG content. WebKit should not hit assertions.</p>
+<svg style="width: 50px; height: 50px; border: 1px solid black;">
+<text>svg text</text>
+</svg>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+document.execCommand("SelectAll");
+
+document.querySelector('style').remove();
+document.write('PASS');
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari53774branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebCore/ChangeLog (160856 => 160857)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebCore/ChangeLog 2013-12-19 21:52:15 UTC (rev 160856)
+++ branches/safari-537.74-branch/Source/WebCore/ChangeLog 2013-12-19 21:55:49 UTC (rev 160857)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2013-12-19 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r160819: <rdar://problems/15701133>
+
+ 2013-12-18 Ryosuke Niwa <rniwa@webkit.org>
+
+ Crash in WebCore::LogicalSelectionOffsetCaches::LogicalSelectionOffsetCaches
+ https://bugs.webkit.org/show_bug.cgi?id=125970
+
+ Reviewed by Antti Koivisto.
+
+ The bug was caused by containingBlockForAbsolutePosition returning a non-RenderBlock render object.
+ Fixed the bug by obtaining its containg block.
+
+ Also changed the return type of containingBlockForFixedPosition, containingBlockForAbsolutePosition,
+ containingBlockForObjectInFlow from RenderElement to RenderBlock as all callers of these functions
+ had assumed the return value to be an instance of RenderBlock.
+
+ Test: svg/text/select-text-inside-non-static-position.html
+
+ * rendering/LogicalSelectionOffsetCaches.h:
+ (WebCore::containingBlockForFixedPosition):
+ (WebCore::containingBlockForAbsolutePosition):
+ (WebCore::containingBlockForObjectInFlow):
+ (WebCore::LogicalSelectionOffsetCaches::LogicalSelectionOffsetCaches):
+
</ins><span class="cx"> 2013-12-11 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merged patch from <rdar://problems/15474133>. This patch is a port of r157821.
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebCorerenderingLogicalSelectionOffsetCachesh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h (160856 => 160857)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h 2013-12-19 21:52:15 UTC (rev 160856)
+++ branches/safari-537.74-branch/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h 2013-12-19 21:55:49 UTC (rev 160857)
</span><span class="lines">@@ -40,16 +40,16 @@
</span><span class="cx"> return (object->isInline() && !object->isReplaced()) || !object->isRenderBlock();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline RenderObject* containingBlockForFixedPosition(RenderObject* parent)
</del><ins>+static inline RenderBlock* containingBlockForFixedPosition(RenderObject* parent)
</ins><span class="cx"> {
</span><span class="cx"> RenderObject* object = parent;
</span><span class="cx"> while (object && !object->canContainFixedPositionObjects())
</span><span class="cx"> object = object->parent();
</span><span class="cx"> ASSERT(!object || !object->isAnonymousBlock());
</span><del>- return object;
</del><ins>+ return toRenderBlock(object);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static inline RenderObject* containingBlockForAbsolutePosition(RenderObject* parent)
</del><ins>+static inline RenderBlock* containingBlockForAbsolutePosition(RenderObject* parent)
</ins><span class="cx"> {
</span><span class="cx"> RenderObject* object = parent;
</span><span class="cx"> while (object && !isContainingBlockCandidateForAbsolutelyPositionedObject(object))
</span><span class="lines">@@ -59,21 +59,21 @@
</span><span class="cx"> // not the inline itself, to avoid having a positioned objects list in all RenderInlines
</span><span class="cx"> // and use RenderBlock* as RenderObject::containingBlock's return type.
</span><span class="cx"> // Use RenderBlock::container() to obtain the inline.
</span><del>- if (object && object->isRenderInline())
</del><ins>+ if (object && !object->isRenderBlock())
</ins><span class="cx"> object = object->containingBlock();
</span><span class="cx">
</span><span class="cx"> while (object && object->isAnonymousBlock())
</span><span class="cx"> object = object->containingBlock();
</span><span class="cx">
</span><del>- return object;
</del><ins>+ return toRenderBlock(object);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static inline RenderObject* containingBlockForObjectInFlow(RenderObject* parent)
</del><ins>+static inline RenderBlock* containingBlockForObjectInFlow(RenderObject* parent)
</ins><span class="cx"> {
</span><span class="cx"> RenderObject* object = parent;
</span><span class="cx"> while (object && isNonRenderBlockInline(object))
</span><span class="cx"> object = object->parent();
</span><del>- return object;
</del><ins>+ return toRenderBlock(object);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class LogicalSelectionOffsetCaches {
</span><span class="lines">@@ -139,9 +139,9 @@
</span><span class="cx"> RenderObject* parent = rootBlock->parent();
</span><span class="cx">
</span><span class="cx"> // LogicalSelectionOffsetCaches should not be used on an orphaned tree.
</span><del>- m_containingBlockForFixedPosition.setBlock(toRenderBlock(containingBlockForFixedPosition(parent)), 0);
- m_containingBlockForAbsolutePosition.setBlock(toRenderBlock(containingBlockForAbsolutePosition(parent)), 0);
- m_containingBlockForInflowPosition.setBlock(toRenderBlock(containingBlockForObjectInFlow(parent)), 0);
</del><ins>+ m_containingBlockForFixedPosition.setBlock(containingBlockForFixedPosition(parent), 0);
+ m_containingBlockForAbsolutePosition.setBlock(containingBlockForAbsolutePosition(parent), 0);
+ m_containingBlockForInflowPosition.setBlock(containingBlockForObjectInFlow(parent), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LogicalSelectionOffsetCaches(RenderBlock* block, const LogicalSelectionOffsetCaches& cache)
</span></span></pre>
</div>
</div>
</body>
</html>