Changeset 26746 in webkit

Timestamp:

Oct 18, 2007, 9:21:34 AM (17 years ago)

Author:

mitz

Message:

WebCore:

Reviewed by Nikolas Zimmermann.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=15367 Assertion failure inspecting a document including soft hyphen code (0xad)

Test: fast/text/word-break-soft-hyphen.html

• rendering/RenderText.cpp: (WebCore::RenderText::calcPrefWidths): Changed to treat soft hyphens as word boundaries. This fixes the bug and is consistent with the fact that run rounding does occur at soft hyphens.

LayoutTests:

Reviewed by Nikolas Zimmermann.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=15367 Assertion failure inspecting a document including soft hyphen code (0xad)

• fast/text/word-break-soft-hyphen.html: Added.
• platform/mac/fast/text/word-break-soft-hyphen-expected.checksum: Added.
• platform/mac/fast/text/word-break-soft-hyphen-expected.png: Added.
• platform/mac/fast/text/word-break-soft-hyphen-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/word-break-soft-hyphen.html (added)
• LayoutTests/platform/mac/fast/text/word-break-soft-hyphen-expected.checksum (added)
• LayoutTests/platform/mac/fast/text/word-break-soft-hyphen-expected.png (added)
• LayoutTests/platform/mac/fast/text/word-break-soft-hyphen-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderText.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-10-18  Dan Bernstein  <dan.bernstein@apple.com>
+
+        Reviewed by Nikolas Zimmermann.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=15367
+          Assertion failure inspecting a document including soft hyphen code (0xad)
+
+        * fast/text/word-break-soft-hyphen.html: Added.
+        * platform/mac/fast/text/word-break-soft-hyphen-expected.checksum: Added.
+        * platform/mac/fast/text/word-break-soft-hyphen-expected.png: Added.
+        * platform/mac/fast/text/word-break-soft-hyphen-expected.txt: Added.
+
 2007-10-18  Nikolas Zimmermann  <zimmermann@kde.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-10-18  Dan Bernstein  <dan.bernstein@apple.com>
+
+        Reviewed by Nikolas Zimmermann.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=15367
+          Assertion failure inspecting a document including soft hyphen code (0xad)
+
+        Test: fast/text/word-break-soft-hyphen.html
+
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::calcPrefWidths): Changed to treat soft hyphens as 
+        word boundaries. This fixes the bug and is consistent with the fact that
+        run rounding does occur at soft hyphens.
+
 2007-10-18  Nikolas Zimmermann  <zimmermann@kde.org>
 

trunk/WebCore/rendering/RenderText.cpp

@@ -583 +583 @@
 
         // Ignore spaces and soft hyphens
-        if (ignoringSpaces || c == softHyphen) {
+        if (ignoringSpaces) {
             ASSERT(lastWordBoundary == i);
             lastWordBoundary++;
+            continue;
+        } else if (c == softHyphen) {
+            currMaxWidth += widthFromCache(f, lastWordBoundary, i - lastWordBoundary, leadWidth + currMaxWidth);
+            lastWordBoundary = i + 1;
             continue;
         }