<!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>[180050] 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/180050">180050</a></dd>
<dt>Author</dt> <dd>changseok.oh@collabora.com</dd>
<dt>Date</dt> <dd>2015-02-13 09:15:50 -0800 (Fri, 13 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Div having contentEditable and display:grid cannot be edited if it is empty.
https://bugs.webkit.org/show_bug.cgi?id=141465
Reviewed by Ryosuke Niwa.
Source/WebCore:
This bug is quite similar to webkit.org/b/141218. RenderGrid should be also treated as a candidate
for visible position as like RenderFlexibleBox. The only different situation between them is
that RenderGrid has a bug setting "0px" for logicalHeight when it is empty. RenderGrid should also have
a minimum height of a single line if it is editable as well as RenderFlexibleBox does.
Test: fast/events/key-events-in-editable-gridbox.html
* dom/Position.cpp:
(WebCore::Position::isCandidate):
(WebCore::Position::isRenderedCharacter):
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::layoutGridItems):
LayoutTests:
This tests if an editable grid box can be reedited after erasing all texts in it.
* fast/events/key-events-in-editable-gridbox-expected.txt: Added.
* fast/events/key-events-in-editable-gridbox.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>
<li><a href="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventskeyeventsineditablegridboxexpectedtxt">trunk/LayoutTests/fast/events/key-events-in-editable-gridbox-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventskeyeventsineditablegridboxhtml">trunk/LayoutTests/fast/events/key-events-in-editable-gridbox.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (180049 => 180050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-02-13 17:10:35 UTC (rev 180049)
+++ trunk/LayoutTests/ChangeLog        2015-02-13 17:15:50 UTC (rev 180050)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-02-13 ChangSeok Oh <changseok.oh@collabora.com>
+
+ Div having contentEditable and display:grid cannot be edited if it is empty.
+ https://bugs.webkit.org/show_bug.cgi?id=141465
+
+ Reviewed by Ryosuke Niwa.
+
+ This tests if an editable grid box can be reedited after erasing all texts in it.
+
+ * fast/events/key-events-in-editable-gridbox-expected.txt: Added.
+ * fast/events/key-events-in-editable-gridbox.html: Added.
+
</ins><span class="cx"> 2015-02-13 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Skip accessibility tests failing due to debug assertions.
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventskeyeventsineditablegridboxexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/key-events-in-editable-gridbox-expected.txt (0 => 180050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/key-events-in-editable-gridbox-expected.txt         (rev 0)
+++ trunk/LayoutTests/fast/events/key-events-in-editable-gridbox-expected.txt        2015-02-13 17:15:50 UTC (rev 180050)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+PASS targetDiv.innerText is "TEST"
+PASS targetDiv.innerText is ""
+PASS targetDiv.innerText is "TEST"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+TEST
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventskeyeventsineditablegridboxhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/key-events-in-editable-gridbox.html (0 => 180050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/key-events-in-editable-gridbox.html         (rev 0)
+++ trunk/LayoutTests/fast/events/key-events-in-editable-gridbox.html        2015-02-13 17:15:50 UTC (rev 180050)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test.js"></script>
+<style>
+ #target {
+ display: -webkit-grid;
+ }
+</style>
+<script>
+ var targetDiv;
+ function test()
+ {
+ targetDiv = document.getElementById('target');
+ targetDiv.focus();
+
+ // Move cursor to the end of line.
+ getSelection().modify('move', 'forward', 'lineboundary');
+
+ document.execCommand("insertText", false, "EST");
+ shouldBeEqualToString("targetDiv.innerText", "TEST");
+
+ document.execCommand("delete");
+ document.execCommand("delete");
+ document.execCommand("delete");
+ document.execCommand("delete");
+ document.execCommand("delete"); // Remove '\n'
+ shouldBeEmptyString("targetDiv.innerText");
+
+ document.execCommand("insertText", false, "TEST");
+ shouldBeEqualToString("targetDiv.innerText", "TEST");
+ }
+</script>
+</head>
+<body onload="test()">
+<div id="target" contentEditable>T</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180049 => 180050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-02-13 17:10:35 UTC (rev 180049)
+++ trunk/Source/WebCore/ChangeLog        2015-02-13 17:15:50 UTC (rev 180050)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-02-13 ChangSeok Oh <changseok.oh@collabora.com>
+
+ Div having contentEditable and display:grid cannot be edited if it is empty.
+ https://bugs.webkit.org/show_bug.cgi?id=141465
+
+ Reviewed by Ryosuke Niwa.
+
+ This bug is quite similar to webkit.org/b/141218. RenderGrid should be also treated as a candidate
+ for visible position as like RenderFlexibleBox. The only different situation between them is
+ that RenderGrid has a bug setting "0px" for logicalHeight when it is empty. RenderGrid should also have
+ a minimum height of a single line if it is editable as well as RenderFlexibleBox does.
+
+ Test: fast/events/key-events-in-editable-gridbox.html
+
+ * dom/Position.cpp:
+ (WebCore::Position::isCandidate):
+ (WebCore::Position::isRenderedCharacter):
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::layoutGridItems):
+
</ins><span class="cx"> 2015-02-12 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r176262): Invalid cast in WebCore`WebCore::RootInlineBox::selectionTop
</span></span></pre></div>
<a id="trunkSourceWebCoredomPositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Position.cpp (180049 => 180050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Position.cpp        2015-02-13 17:10:35 UTC (rev 180049)
+++ trunk/Source/WebCore/dom/Position.cpp        2015-02-13 17:15:50 UTC (rev 180050)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "PositionIterator.h"
</span><span class="cx"> #include "RenderBlock.h"
</span><span class="cx"> #include "RenderFlexibleBox.h"
</span><ins>+#include "RenderGrid.h"
</ins><span class="cx"> #include "RenderInline.h"
</span><span class="cx"> #include "RenderIterator.h"
</span><span class="cx"> #include "RenderLineBreak.h"
</span><span class="lines">@@ -915,11 +916,11 @@
</span><span class="cx"> {
</span><span class="cx"> if (isNull())
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> RenderObject* renderer = deprecatedNode()->renderer();
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (renderer->style().visibility() != VISIBLE)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -936,7 +937,7 @@
</span><span class="cx"> if (m_anchorNode->hasTagName(htmlTag))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (is<RenderBlockFlow>(*renderer) || is<RenderFlexibleBox>(*renderer)) {
</del><ins>+ if (is<RenderBlockFlow>(*renderer) || is<RenderFlexibleBox>(*renderer) || is<RenderGrid>(*renderer)) {
</ins><span class="cx"> RenderBlock& block = downcast<RenderBlock>(*renderer);
</span><span class="cx"> if (block.logicalHeight() || m_anchorNode->hasTagName(bodyTag)) {
</span><span class="cx"> if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(block))
</span><span class="lines">@@ -953,11 +954,11 @@
</span><span class="cx"> {
</span><span class="cx"> if (!is<Text>(deprecatedNode()))
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> RenderText* renderer = downcast<Text>(*deprecatedNode()).renderer();
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> return renderer->containsRenderedCharacterOffset(m_offset);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (180049 => 180050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp        2015-02-13 17:10:35 UTC (rev 180049)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp        2015-02-13 17:15:50 UTC (rev 180050)
</span><span class="lines">@@ -999,6 +999,14 @@
</span><span class="cx">
</span><span class="cx"> // min / max logical height is handled in updateLogicalHeight().
</span><span class="cx"> setLogicalHeight(logicalHeight() + borderAndPaddingLogicalHeight());
</span><ins>+ if (hasLineIfEmpty()) {
+ LayoutUnit minHeight = borderAndPaddingLogicalHeight()
+ + lineHeight(true, isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes)
+ + scrollbarLogicalHeight();
+ if (height() < minHeight)
+ setLogicalHeight(minHeight);
+ }
+
</ins><span class="cx"> clearGrid();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>