<!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>[177047] branches/safari-600.1.4.13-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/177047">177047</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-12-09 16:36:45 -0800 (Tue, 09 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/173061">r173061</a>. rdar://problem/19131928</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001413branchLayoutTestsChangeLog">branches/safari-600.1.4.13-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001413branchSourceWebCoreChangeLog">branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001413branchSourceWebCorerenderingRenderObjectcpp">branches/safari-600.1.4.13-branch/Source/WebCore/rendering/RenderObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001413branchLayoutTestsfastregionsselectionselectallwithoutregionsexpectedtxt">branches/safari-600.1.4.13-branch/LayoutTests/fast/regions/selection/select-all-without-regions-expected.txt</a></li>
<li><a href="#branchessafari6001413branchLayoutTestsfastregionsselectionselectallwithoutregionshtml">branches/safari-600.1.4.13-branch/LayoutTests/fast/regions/selection/select-all-without-regions.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001413branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.13-branch/LayoutTests/ChangeLog (177046 => 177047)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.13-branch/LayoutTests/ChangeLog 2014-12-10 00:34:20 UTC (rev 177046)
+++ branches/safari-600.1.4.13-branch/LayoutTests/ChangeLog 2014-12-10 00:36:45 UTC (rev 177047)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-12-09 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r173061.
+
+ 2014-08-28 Mihnea Ovidenie <mihnea@adobe.com>
+
+ [CSSRegions] Incorrect selection clearing on a document without regions
+ https://bugs.webkit.org/show_bug.cgi?id=134901
+
+ Reviewed by David Hyatt.
+
+ * fast/regions/selection/select-all-without-regions-expected.txt: Added.
+ * fast/regions/selection/select-all-without-regions.html: Added.
+
+2014-12-09 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r173046.
</span><span class="cx">
</span><span class="cx"> 2014-08-27 Daniel Bates <dabates@apple.com>
</span></span></pre></div>
<a id="branchessafari6001413branchLayoutTestsfastregionsselectionselectallwithoutregionsexpectedtxtfromrev175515branchessafari6003branchLayoutTestsfastregionsselectionselectallwithoutregionsexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.13-branch/LayoutTests/fast/regions/selection/select-all-without-regions-expected.txt (from rev 175515, branches/safari-600.3-branch/LayoutTests/fast/regions/selection/select-all-without-regions-expected.txt) (0 => 177047)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.13-branch/LayoutTests/fast/regions/selection/select-all-without-regions-expected.txt (rev 0)
+++ branches/safari-600.1.4.13-branch/LayoutTests/fast/regions/selection/select-all-without-regions-expected.txt 2014-12-10 00:36:45 UTC (rev 177047)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+"PASS"
+
</ins></span></pre></div>
<a id="branchessafari6001413branchLayoutTestsfastregionsselectionselectallwithoutregionshtmlfromrev175515branchessafari6003branchLayoutTestsfastregionsselectionselectallwithoutregionshtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.13-branch/LayoutTests/fast/regions/selection/select-all-without-regions.html (from rev 175515, branches/safari-600.3-branch/LayoutTests/fast/regions/selection/select-all-without-regions.html) (0 => 177047)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.13-branch/LayoutTests/fast/regions/selection/select-all-without-regions.html (rev 0)
+++ branches/safari-600.1.4.13-branch/LayoutTests/fast/regions/selection/select-all-without-regions.html 2014-12-10 00:36:45 UTC (rev 177047)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style id="style">
+ #content-for-region {
+ -webkit-flow-into: flow;
+ height: 50px;
+ }
+ </style>
+ </head>
+ <body>
+ <div id="content-for-region"></div>
+ "PASS"
+ <div></div>
+ <script>
+ if (window.testRunner)
+ window.testRunner.dumpAsText();
+ document.execCommand("SelectAll");
+ var elem = document.getElementById("style");
+ elem.innerHTML="X";
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001413branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog (177046 => 177047)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog 2014-12-10 00:34:20 UTC (rev 177046)
+++ branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog 2014-12-10 00:36:45 UTC (rev 177047)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2014-12-09 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r173061.
+
+ 2014-08-28 Mihnea Ovidenie <mihnea@adobe.com>
+
+ [CSSRegions] Incorrect selection clearing on a document without regions
+ https://bugs.webkit.org/show_bug.cgi?id=134901
+
+ Reviewed by David Hyatt.
+
+ When we select all the content of document with named flows but without regions,
+ the start and end points of selection is cached in RenderView. However, since
+ the document has named flows, the selection is split between the subtrees. During the split,
+ it is possible that the cached end-points of the original selection are not included
+ in any of the resulting subtree selection and they are not marked accordingly.
+ In order to process the selection clearing correctly, we have to take the original
+ selection end-points into account.
+
+ Test: fast/regions/selection/select-all-without-regions.html
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::isSelectionBorder):
+
+2014-12-09 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r173046.
</span><span class="cx">
</span><span class="cx"> 2014-08-27 Daniel Bates <dabates@apple.com>
</span></span></pre></div>
<a id="branchessafari6001413branchSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.13-branch/Source/WebCore/rendering/RenderObject.cpp (177046 => 177047)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.13-branch/Source/WebCore/rendering/RenderObject.cpp 2014-12-10 00:34:20 UTC (rev 177046)
+++ branches/safari-600.1.4.13-branch/Source/WebCore/rendering/RenderObject.cpp 2014-12-10 00:36:45 UTC (rev 177047)
</span><span class="lines">@@ -1891,7 +1891,11 @@
</span><span class="cx"> bool RenderObject::isSelectionBorder() const
</span><span class="cx"> {
</span><span class="cx"> SelectionState st = selectionState();
</span><del>- return st == SelectionStart || st == SelectionEnd || st == SelectionBoth;
</del><ins>+ return st == SelectionStart
+ || st == SelectionEnd
+ || st == SelectionBoth
+ || view().selectionStart() == this
+ || view().selectionEnd() == this;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void RenderObject::clearLayoutRootIfNeeded() const
</span></span></pre>
</div>
</div>
</body>
</html>