Changeset 180050 in webkit for trunk/Source/WebCore/rendering/RenderGrid.cpp

Timestamp:

Feb 13, 2015, 9:15:50 AM (11 years ago)

Author:

ChangSeok Oh

Message:

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.

File:

• trunk/Source/WebCore/rendering/RenderGrid.cpp (modified) (1 diff)

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -1000 +1000 @@
     // min / max logical height is handled in updateLogicalHeight().
     setLogicalHeight(logicalHeight() + borderAndPaddingLogicalHeight());
+    if (hasLineIfEmpty()) {
+        LayoutUnit minHeight = borderAndPaddingLogicalHeight()
+            + lineHeight(true, isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes)
+            + scrollbarLogicalHeight();
+        if (height() < minHeight)
+            setLogicalHeight(minHeight);
+    }
+
     clearGrid();
 }