Changeset 223553 in webkit

Timestamp:

Oct 17, 2017 10:13:56 AM (7 years ago)

Author:

dbates@webkit.org

Message:

ASSERTION FAILED: m_truncation != cFullTruncation in InlineTextBox::clampedOffset()
​https://bugs.webkit.org/show_bug.cgi?id=178322

Reviewed by Darin Adler.

Source/WebCore:

It is acceptable for InlineTextBox::clampedOffset() to be called for a fully truncated box,
say a person clicks on the ellipsis in a truncated text run. Restore the behavior prior to
r223259 and return the clamped offset.

Test: fast/text/click-ellipsis-assertion-failure.html

• rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::clampedOffset const):

LayoutTests:

Add a test to ensure that clicking on the ellipsis in a truncated text run does not
cause an assertion failure in a debug build.

• fast/text/click-ellipsis-assertion-failure-expected.txt: Added.
• fast/text/click-ellipsis-assertion-failure.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/click-ellipsis-assertion-failure-expected.txt (added)
• LayoutTests/fast/text/click-ellipsis-assertion-failure.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/InlineTextBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-10-17  Daniel Bates  <dabates@apple.com>
+
+        ASSERTION FAILED: m_truncation != cFullTruncation in InlineTextBox::clampedOffset()
+        https://bugs.webkit.org/show_bug.cgi?id=178322
+
+        Reviewed by Darin Adler.
+
+        Add a test to ensure that clicking on the ellipsis in a truncated text run does not
+        cause an assertion failure in a debug build.
+
+        * fast/text/click-ellipsis-assertion-failure-expected.txt: Added.
+        * fast/text/click-ellipsis-assertion-failure.html: Added.
+
 2017-10-17  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-17  Daniel Bates  <dabates@apple.com>
+
+        ASSERTION FAILED: m_truncation != cFullTruncation in InlineTextBox::clampedOffset()
+        https://bugs.webkit.org/show_bug.cgi?id=178322
+
+        Reviewed by Darin Adler.
+
+        It is acceptable for InlineTextBox::clampedOffset() to be called for a fully truncated box,
+        say a person clicks on the ellipsis in a truncated text run. Restore the behavior prior to
+        r223259 and return the clamped offset.
+
+        Test: fast/text/click-ellipsis-assertion-failure.html
+
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::clampedOffset const):
+
 2017-10-17  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -592 +592 @@
 unsigned InlineTextBox::clampedOffset(unsigned x) const
 {
-    ASSERT(m_truncation != cFullTruncation);
     unsigned offset = std::max(std::min(x, m_start + m_len), m_start) - m_start;
+    if (m_truncation == cFullTruncation)
+        return offset;
     if (m_truncation != cNoTruncation)
         offset = std::min<unsigned>(offset, m_truncation);