<!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>[179944] 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/179944">179944</a></dd>
<dt>Author</dt> <dd>changseok.oh@collabora.com</dd>
<dt>Date</dt> <dd>2015-02-11 12:13:03 -0800 (Wed, 11 Feb 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Div having contentEditable and display:flex cannot be edited if it is empty.
https://bugs.webkit.org/show_bug.cgi?id=141218

Reviewed by Ryosuke Niwa.

Source/WebCore:

RenderFlexibleBox should be treated as a candidate for visible position. Visible selection
in an editable area is recalculated whenever an inner value of div is changed. If the inner value
is empty, the visible selection recalculated with DeleteSelectionCommand::m_endingPostion
is not correct. Because RenderBlockFlow is only considered but not RenderFlexibleBox
in Position::isCandidate so that a calculated ending VisiblePosition for an editable div
having &quot;display : flex&quot; goes weird and VisibleSelection is empty accordingly.

Test: fast/events/key-events-in-editable-flexbox.html

* dom/Position.cpp:
(WebCore::Position::isCandidate):

LayoutTests:

This tests if an editable flexbox can be reedited after erasing all texts in it.

* fast/events/key-events-in-editable-flexbox-expected.txt: Added.
* fast/events/key-events-in-editable-flexbox.html: Added.</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="#trunkSourceWebCoredomPositioncpp">trunk/Source/WebCore/dom/Position.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventskeyeventsineditableflexboxexpectedtxt">trunk/LayoutTests/fast/events/key-events-in-editable-flexbox-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventskeyeventsineditableflexboxhtml">trunk/LayoutTests/fast/events/key-events-in-editable-flexbox.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (179943 => 179944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-02-11 20:12:36 UTC (rev 179943)
+++ trunk/LayoutTests/ChangeLog        2015-02-11 20:13:03 UTC (rev 179944)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-02-11  ChangSeok Oh  &lt;changseok.oh@collabora.com&gt;
+
+        Div having contentEditable and display:flex cannot be edited if it is empty.
+        https://bugs.webkit.org/show_bug.cgi?id=141218
+
+        Reviewed by Ryosuke Niwa.
+
+        This tests if an editable flexbox can be reedited after erasing all texts in it.
+
+        * fast/events/key-events-in-editable-flexbox-expected.txt: Added.
+        * fast/events/key-events-in-editable-flexbox.html: Added.
+
</ins><span class="cx"> 2015-02-11  Sam Weinig  &lt;sam@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         performance.now can crash if accessed from a window that has navigated
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventskeyeventsineditableflexboxexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/key-events-in-editable-flexbox-expected.txt (0 => 179944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/key-events-in-editable-flexbox-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/events/key-events-in-editable-flexbox-expected.txt        2015-02-11 20:13:03 UTC (rev 179944)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+PASS targetDiv.innerText is &quot;TEST&quot;
+PASS targetDiv.innerText is &quot;&quot;
+PASS targetDiv.innerText is &quot;TEST&quot;
+PASS successfullyParsed is true
+
+TEST COMPLETE
+TEST
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventskeyeventsineditableflexboxhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/key-events-in-editable-flexbox.html (0 => 179944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/key-events-in-editable-flexbox.html                                (rev 0)
+++ trunk/LayoutTests/fast/events/key-events-in-editable-flexbox.html        2015-02-11 20:13:03 UTC (rev 179944)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;script src=&quot;../../resources/js-test.js&quot;&gt;&lt;/script&gt;
+&lt;style&gt;
+    #target {
+        display: flex;
+        display: -webkit-flex;
+    }
+&lt;/style&gt;
+&lt;script&gt;
+    var targetDiv;
+    function test()
+    {
+        targetDiv = document.getElementById('target');
+        targetDiv.focus();
+
+        // Move cursor to the end of line.
+        getSelection().modify('move', 'forward', 'lineboundary');
+
+        document.execCommand(&quot;insertText&quot;, false, &quot;EST&quot;);
+        shouldBeEqualToString(&quot;targetDiv.innerText&quot;, &quot;TEST&quot;);
+
+        document.execCommand(&quot;delete&quot;);
+        document.execCommand(&quot;delete&quot;);
+        document.execCommand(&quot;delete&quot;);
+        document.execCommand(&quot;delete&quot;);
+        document.execCommand(&quot;delete&quot;); // Remove '\n'
+        shouldBeEmptyString(&quot;targetDiv.innerText&quot;);
+
+        document.execCommand(&quot;insertText&quot;, false, &quot;TEST&quot;);
+        shouldBeEqualToString(&quot;targetDiv.innerText&quot;, &quot;TEST&quot;);
+    }
+&lt;/script&gt;
+&lt;/head&gt;
+&lt;body onload=&quot;test()&quot;&gt;
+&lt;div id=&quot;target&quot; contentEditable&gt;T&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179943 => 179944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-02-11 20:12:36 UTC (rev 179943)
+++ trunk/Source/WebCore/ChangeLog        2015-02-11 20:13:03 UTC (rev 179944)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-02-11  ChangSeok Oh  &lt;changseok.oh@collabora.com&gt;
</span><span class="cx"> 
</span><ins>+        Div having contentEditable and display:flex cannot be edited if it is empty.
+        https://bugs.webkit.org/show_bug.cgi?id=141218
+
+        Reviewed by Ryosuke Niwa.
+
+        RenderFlexibleBox should be treated as a candidate for visible position. Visible selection
+        in an editable area is recalculated whenever an inner value of div is changed. If the inner value
+        is empty, the visible selection recalculated with DeleteSelectionCommand::m_endingPostion
+        is not correct. Because RenderBlockFlow is only considered but not RenderFlexibleBox
+        in Position::isCandidate so that a calculated ending VisiblePosition for an editable div
+        having &quot;display : flex&quot; goes weird and VisibleSelection is empty accordingly.
+
+        Test: fast/events/key-events-in-editable-flexbox.html
+
+        * dom/Position.cpp:
+        (WebCore::Position::isCandidate):
+
+2015-02-11  ChangSeok Oh  &lt;changseok.oh@collabora.com&gt;
+
</ins><span class="cx">         Activate ReliefLogger of a memory pressure handler for linux system.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=123611
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomPositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Position.cpp (179943 => 179944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Position.cpp        2015-02-11 20:12:36 UTC (rev 179943)
+++ trunk/Source/WebCore/dom/Position.cpp        2015-02-11 20:13:03 UTC (rev 179944)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include &quot;Logging.h&quot;
</span><span class="cx"> #include &quot;PositionIterator.h&quot;
</span><span class="cx"> #include &quot;RenderBlock.h&quot;
</span><ins>+#include &quot;RenderFlexibleBox.h&quot;
</ins><span class="cx"> #include &quot;RenderInline.h&quot;
</span><span class="cx"> #include &quot;RenderIterator.h&quot;
</span><span class="cx"> #include &quot;RenderLineBreak.h&quot;
</span><span class="lines">@@ -934,9 +935,9 @@
</span><span class="cx"> 
</span><span class="cx">     if (m_anchorNode-&gt;hasTagName(htmlTag))
</span><span class="cx">         return false;
</span><del>-        
-    if (is&lt;RenderBlockFlow&gt;(*renderer)) {
-        RenderBlockFlow&amp; block = downcast&lt;RenderBlockFlow&gt;(*renderer);
</del><ins>+
+    if (is&lt;RenderBlockFlow&gt;(*renderer) || is&lt;RenderFlexibleBox&gt;(*renderer)) {
+        RenderBlock&amp; block = downcast&lt;RenderBlock&gt;(*renderer);
</ins><span class="cx">         if (block.logicalHeight() || m_anchorNode-&gt;hasTagName(bodyTag)) {
</span><span class="cx">             if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(block))
</span><span class="cx">                 return atFirstEditingPositionForNode() &amp;&amp; !Position::nodeIsUserSelectNone(deprecatedNode());
</span></span></pre>
</div>
</div>

</body>
</html>