Changeset 114461 in webkit

Timestamp:

Apr 17, 2012, 4:10:21 PM (13 years ago)

Author:

yi.4.shen@nokia.com

Message:

Caret is not rendered properly inside an input element with text-indent
​https://bugs.webkit.org/show_bug.cgi?id=82688

Reviewed by Ryosuke Niwa.

For an empty input element, there is no RenderText. Instead, RenderBlock::localCaretRect provides
the caret position for rendering the caret in the empty input element. To get correct caret rect,
textIndentOffset() should be used to adjust the caret's position.

Source/WebCore:

Test: editing/style/text-indent.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::localCaretRect):

LayoutTests:

• editing/style/text-indent-expected.txt: Added.
• editing/style/text-indent.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/style/text-indent-expected.txt (added)
• LayoutTests/editing/style/text-indent.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-04-17  Yi Shen  <yi.4.shen@nokia.com>
+
+        Caret is not rendered properly inside an input element with text-indent
+        https://bugs.webkit.org/show_bug.cgi?id=82688
+
+        Reviewed by Ryosuke Niwa.
+
+        For an empty input element, there is no RenderText. Instead, RenderBlock::localCaretRect provides
+        the caret position for rendering the caret in the empty input element. To get correct caret rect,
+        textIndentOffset() should be used to adjust the caret's position.
+
+        * editing/style/text-indent-expected.txt: Added.
+        * editing/style/text-indent.html: Added.
+
 2012-04-17  Vincent Scheib  <scheib@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-17  Yi Shen  <yi.4.shen@nokia.com>
+
+        Caret is not rendered properly inside an input element with text-indent
+        https://bugs.webkit.org/show_bug.cgi?id=82688
+
+        Reviewed by Ryosuke Niwa.
+
+        For an empty input element, there is no RenderText. Instead, RenderBlock::localCaretRect provides
+        the caret position for rendering the caret in the empty input element. To get correct caret rect,
+        textIndentOffset() should be used to adjust the caret's position.
+
+        Test: editing/style/text-indent.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::localCaretRect):
+
 2012-04-17  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -6483 +6483 @@
     switch (alignment) {
         case alignLeft:
+            if (currentStyle->isLeftToRightDirection())
+                x += textIndentOffset();
             break;
         case alignCenter:
             x = (x + w - (borderRight() + paddingRight())) / 2;
+            if (currentStyle->isLeftToRightDirection())
+                x += textIndentOffset() / 2;
+            else
+                x -= textIndentOffset() / 2;
             break;
         case alignRight:
             x = w - (borderRight() + paddingRight()) - caretWidth;
+            if (!currentStyle->isLeftToRightDirection())
+                x -= textIndentOffset();
             break;
     }
+    x = min(x, w - borderRight() - paddingRight() - caretWidth);
 
     if (extraWidthToEndOfLine) {