Changeset 143483 in webkit

Timestamp:

Feb 20, 2013 11:51:03 AM (11 years ago)

Author:

robert@webkit.org

Message:

No caret on empty contenteditable element with negative text-indent
​https://bugs.webkit.org/show_bug.cgi?id=108633

Reviewed by Ryosuke Niwa.

Source/WebCore:

Test: fast/repaint/paint-caret-in-div-with-negative-indent.html

When an editable element has a negative text indent we won't paint the caret when the
element is empty because it falls outside the element's border box. To ensure the caret is painted,
account for any negative indent with our overflow.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::computeOverflow):

LayoutTests:

• fast/repaint/paint-caret-in-div-with-negative-indent-expected.png: Added.
• fast/repaint/paint-caret-in-div-with-negative-indent-expected.txt: Added.
• fast/repaint/paint-caret-in-div-with-negative-indent.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/repaint/paint-caret-in-div-with-negative-indent-expected.png (added)
• LayoutTests/fast/repaint/paint-caret-in-div-with-negative-indent-expected.txt (added)
• LayoutTests/fast/repaint/paint-caret-in-div-with-negative-indent.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-20  Robert Hogan  <robert@webkit.org>
+
+        No caret on empty contenteditable element with negative text-indent
+        https://bugs.webkit.org/show_bug.cgi?id=108633
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/repaint/paint-caret-in-div-with-negative-indent-expected.png: Added.
+        * fast/repaint/paint-caret-in-div-with-negative-indent-expected.txt: Added.
+        * fast/repaint/paint-caret-in-div-with-negative-indent.html: Added.
+
 2013-02-20  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-20  Robert Hogan  <robert@webkit.org>
+
+        No caret on empty contenteditable element with negative text-indent
+        https://bugs.webkit.org/show_bug.cgi?id=108633
+
+        Reviewed by Ryosuke Niwa.
+
+        Test: fast/repaint/paint-caret-in-div-with-negative-indent.html
+
+        When an editable element has a negative text indent we won't paint the caret when the
+        element is empty because it falls outside the element's border box. To ensure the caret is painted,
+        account for any negative indent with our overflow.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::computeOverflow):
+
 2013-02-20  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -1729 +1729 @@
     }
         
+    // Allow our overflow to catch cases where the caret in an empty editable element with negative text indent needs to get painted.
+    LayoutUnit textIndent = textIndentOffset();
+    if (textIndent < 0) {
+        LayoutRect clientRect(clientBoxRect());
+        LayoutRect rectToApply = LayoutRect(clientRect.x() + min<LayoutUnit>(0, textIndent), clientRect.y(), clientRect.width() - min<LayoutUnit>(0, textIndent), clientRect.height());
+        addVisualOverflow(rectToApply);
+    }
+
     // Add visual overflow from box-shadow and border-image-outset.
     addVisualEffectOverflow();