Changeset 150065 in webkit

Timestamp:

May 14, 2013, 5:27:03 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Ellipsis text is placed to wrong position, when the truncated text is fully cut off in RTL direction.
​https://bugs.webkit.org/show_bug.cgi?id=115858

Patch by Zalan Bujtas <Alan Bujtas> on 2013-05-14
Reviewed by Darin Adler.

Source/WebCore:

Take text direction into account to calculate ellipsis position in case of
full truncation.

Test: fast/css/text-overflow-ellipsis-full-truncate-rtl.html

• rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::placeEllipsisBox):

LayoutTests:

• fast/css/text-overflow-ellipsis-full-truncate-rtl-expected.html: Added.
• fast/css/text-overflow-ellipsis-full-truncate-rtl.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/text-overflow-ellipsis-full-truncate-rtl-expected.html (added)
• LayoutTests/fast/css/text-overflow-ellipsis-full-truncate-rtl.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/InlineTextBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-05-14  Zalan Bujtas  <zalan@apple.com>
+
+        Ellipsis text is placed to wrong position, when the truncated text is fully cut off in RTL direction.
+        https://bugs.webkit.org/show_bug.cgi?id=115858
+
+        Reviewed by Darin Adler.
+
+        * fast/css/text-overflow-ellipsis-full-truncate-rtl-expected.html: Added.
+        * fast/css/text-overflow-ellipsis-full-truncate-rtl.html: Added.
+
 2013-05-14  Zoltan Arvai  <zarvai@inf.u-szeged.hu>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-14  Zalan Bujtas  <zalan@apple.com>
+
+        Ellipsis text is placed to wrong position, when the truncated text is fully cut off in RTL direction.
+        https://bugs.webkit.org/show_bug.cgi?id=115858
+
+        Reviewed by Darin Adler.
+
+        Take text direction into account to calculate ellipsis position in case of
+        full truncation.
+
+        Test: fast/css/text-overflow-ellipsis-full-truncate-rtl.html
+
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::placeEllipsisBox):
+
 2013-05-14  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -290 +290 @@
             m_truncation = cFullTruncation;
             truncatedWidth += ellipsisWidth;
-            return min(ellipsisX, x());
+            return flowIsLTR ? min(ellipsisX, x()) : max(ellipsisX, right() - ellipsisWidth);
         }