Changeset 30454 in webkit

Timestamp:

Feb 20, 2008, 9:00:10 PM (17 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Dave Hyatt.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17464 REGRESSION: Crash in RenderBlock::findNextLineBreak reading r30444 commit email in GMail

Test: fast/text/wbr-in-pre-crash.html

• rendering/bidi.cpp: (WebCore::RenderBlock::findNextLineBreak):

LayoutTests:

Reviewed by Dave Hyatt.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=17464 REGRESSION: Crash in RenderBlock::findNextLineBreak reading r30444 commit email in GMail

• fast/text/wbr-in-pre-crash.html: Added.
• platform/mac-leopard/fast/text/wbr-in-pre-crash-expected.checksum: Added.
• platform/mac-leopard/fast/text/wbr-in-pre-crash-expected.png: Added.
• platform/mac/fast/text/wbr-in-pre-crash-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/wbr-in-pre-crash.html (added)
• LayoutTests/platform/mac-leopard/fast/text/wbr-in-pre-crash-expected.checksum (added)
• LayoutTests/platform/mac-leopard/fast/text/wbr-in-pre-crash-expected.png (added)
• LayoutTests/platform/mac/fast/text/wbr-in-pre-crash-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/bidi.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-02-20  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=17464
+          REGRESSION: Crash in RenderBlock::findNextLineBreak reading r30444 commit email in GMail
+
+        * fast/text/wbr-in-pre-crash.html: Added.
+        * platform/mac-leopard/fast/text/wbr-in-pre-crash-expected.checksum: Added.
+        * platform/mac-leopard/fast/text/wbr-in-pre-crash-expected.png: Added.
+        * platform/mac/fast/text/wbr-in-pre-crash-expected.txt: Added.
+
 2008-02-20  Michael Knaup  <michael.knaup@mac.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-20  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=17464
+          REGRESSION: Crash in RenderBlock::findNextLineBreak reading r30444 commit email in GMail
+
+        Test: fast/text/wbr-in-pre-crash.html
+
+        * rendering/bidi.cpp:
+        (WebCore::RenderBlock::findNextLineBreak):
+
 2008-02-20  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/rendering/bidi.cpp

@@ -1701 +1701 @@
                         }
                         if (lineWasTooWide || w + tmpW > width) {
-                            if (lBreak.obj && shouldPreserveNewline(lBreak.obj) && lBreak.obj->isText() && static_cast<RenderText*>(lBreak.obj)->characters()[lBreak.pos] == '\n') {
+                            if (lBreak.obj && shouldPreserveNewline(lBreak.obj) && lBreak.obj->isText() && !static_cast<RenderText*>(lBreak.obj)->isWordBreak() && static_cast<RenderText*>(lBreak.obj)->characters()[lBreak.pos] == '\n') {
                                 if (!stoppedIgnoringSpaces && pos > 0) {
                                     // We need to stop right before the newline and then start up again.