Changeset 30412 in webkit

Timestamp:

Feb 19, 2008, 1:13:19 PM (17 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Darin Adler.

• fix <rdar://problem/5637569> CrashTracer: [REGRESSION] 620 crashes in Safari at com.apple.WebCore: WebCore::RenderBox::setStaticY + 15

Test: fast/text/wbr-styled.html

Changed RenderWordBreak to inherit from RenderText instead of
RenderInline.

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::calcInlinePrefWidths):
• rendering/RenderFlow.h:
• rendering/RenderText.cpp: (WebCore::RenderText::renderName): (WebCore::RenderText::isTextFragment): (WebCore::RenderText::isWordBreak):
• rendering/RenderText.h:
• rendering/RenderWordBreak.cpp: (WebCore::RenderWordBreak::RenderWordBreak):
• rendering/RenderWordBreak.h:
• rendering/bidi.cpp: (WebCore::RenderBlock::findNextLineBreak):

LayoutTests:

Reviewed by Darin Adler.

• test for <rdar://problem/5637569> CrashTracer: [REGRESSION] 620 crashes in Safari at com.apple.WebCore: WebCore::RenderBox::setStaticY + 15

• fast/text/wbr-styled.html: Added.
• platform/mac-leopard/fast/text/wbr-styled-expected.checksum: Added.
• platform/mac-leopard/fast/text/wbr-styled-expected.png: Added.
• platform/mac/fast/css-generated-content/wbr-with-before-content-expected.txt:
• platform/mac/fast/text/wbr-pre-expected.txt:
• platform/mac/fast/text/wbr-styled-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/wbr-styled.html (added)
• LayoutTests/platform/mac-leopard/fast/text/wbr-styled-expected.checksum (added)
• LayoutTests/platform/mac-leopard/fast/text/wbr-styled-expected.png (added)
• LayoutTests/platform/mac/fast/css-generated-content/wbr-with-before-content-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/text/wbr-pre-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/text/wbr-styled-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBlock.cpp (modified) (8 diffs)
• WebCore/rendering/RenderFlow.h (modified) (1 diff)
• WebCore/rendering/RenderText.cpp (modified) (1 diff)
• WebCore/rendering/RenderText.h (modified) (1 diff)
• WebCore/rendering/RenderWordBreak.cpp (modified) (2 diffs)
• WebCore/rendering/RenderWordBreak.h (modified) (3 diffs)
• WebCore/rendering/bidi.cpp (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-02-19  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - test for <rdar://problem/5637569> CrashTracer: [REGRESSION] 620 crashes in Safari at com.apple.WebCore: WebCore::RenderBox::setStaticY + 15
+
+        * fast/text/wbr-styled.html: Added.
+        * platform/mac-leopard/fast/text/wbr-styled-expected.checksum: Added.
+        * platform/mac-leopard/fast/text/wbr-styled-expected.png: Added.
+        * platform/mac/fast/css-generated-content/wbr-with-before-content-expected.txt:
+        * platform/mac/fast/text/wbr-pre-expected.txt:
+        * platform/mac/fast/text/wbr-styled-expected.txt: Added.
+
 2008-02-18  Dan Bernstein  <mitz@apple.com>
 

trunk/LayoutTests/platform/mac/fast/css-generated-content/wbr-with-before-content-expected.txt

@@ -11 +11 @@
           RenderText {#text} at (0,3) size 21x18
             text run at (0,3) width 21: "foo"
-          RenderWordBreak {WBR} at (0,0) size 0x18
-            RenderInline (generated) at (0,0) size 0x18
-              RenderText at (21,3) size 0x18
-                text run at (21,3) width 0: "\x{0}"
+          RenderWordBreak {WBR} at (0,0) size 0x0
           RenderText {#text} at (21,3) size 20x18
             text run at (21,3) width 20: "bar"

trunk/LayoutTests/platform/mac/fast/text/wbr-pre-expected.txt

@@ -7 +7 @@
         RenderText {#text} at (0,0) size 184x15
           text run at (0,0) width 184: "[ONE] This is the first"
-        RenderWordBreak {WBR} at (0,0) size 0x15
+        RenderWordBreak {WBR} at (0,0) size 0x0
         RenderText {#text} at (184,0) size 568x45
           text run at (184,0) width 48: " line."

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-19  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - fix <rdar://problem/5637569> CrashTracer: [REGRESSION] 620 crashes in Safari at com.apple.WebCore: WebCore::RenderBox::setStaticY + 15
+
+        Test: fast/text/wbr-styled.html
+
+        Changed RenderWordBreak to inherit from RenderText instead of
+        RenderInline.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::calcInlinePrefWidths):
+        * rendering/RenderFlow.h:
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::renderName):
+        (WebCore::RenderText::isTextFragment):
+        (WebCore::RenderText::isWordBreak):
+        * rendering/RenderText.h:
+        * rendering/RenderWordBreak.cpp:
+        (WebCore::RenderWordBreak::RenderWordBreak):
+        * rendering/RenderWordBreak.h:
+        * rendering/bidi.cpp:
+        (WebCore::RenderBlock::findNextLineBreak):
+
 2008-02-19  Anders Carlsson  <andersca@apple.com>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -3653 +3653 @@
                     
                     child->setPrefWidthsDirty(false);
-
-                    if (static_cast<RenderFlow*>(child)->isWordBreak()) {
-                        // End a line and start a new line.
-                        m_minPrefWidth = max(inlineMin, m_minPrefWidth);
-                        inlineMin = 0;
-                    }
-                }
-                else {
+                } else {
                     // Inline replaced elts add in their margins to their min/max values.
                     int margins = 0;
@@ -3689 +3682 @@
                 } else
                     clearPreviousFloat = false;
-                
+
                 bool canBreakReplacedElement = !child->isImage() || allowImagesToBreak;
                 if (canBreakReplacedElement && (autoWrap || oldAutoWrap) || clearPreviousFloat) {
@@ -3701 +3694 @@
                     inlineMax = 0;
                 }
-                
+
                 // Add in text-indent.  This is added in only once.
                 int ti = 0;
@@ -3710 +3703 @@
                     childMax+=ti;
                 }
-                
+
                 // Add our width to the max.
                 inlineMax += childMax;
@@ -3733 +3726 @@
                     trailingSpaceChild = 0;
                 }
-            }
-            else if (child->isText())
-            {
+            } else if (child->isText()) {
                 // Case (3). Text.
                 RenderText* t = static_cast<RenderText *>(child);
+
+                if (t->isWordBreak()) {
+                    m_minPrefWidth = max(inlineMin, m_minPrefWidth);
+                    inlineMin = 0;
+                    continue;
+                }
 
                 // Determine if we have a breakable character.  Pass in
@@ -3780 +3777 @@
                 if (!hasBreakableChar) {
                     inlineMin += childMin;
-                }
-                else {
+                } else {
                     // We have a breakable character.  Now we need to know if
                     // we start and end with whitespace.
@@ -3811 +3807 @@
                     m_maxPrefWidth = max(childMax, m_maxPrefWidth);
                     inlineMax = endMax;
-                }
-                else
+                } else
                     inlineMax += childMax;
             }
@@ -3830 +3825 @@
     if (style()->collapseWhiteSpace())
         stripTrailingSpace(inlineMax, inlineMin, trailingSpaceChild);
-    
+
     m_minPrefWidth = max(inlineMin, m_minPrefWidth);
     m_maxPrefWidth = max(inlineMax, m_maxPrefWidth);

trunk/WebCore/rendering/RenderFlow.h

@@ -103 +103 @@
     virtual bool hasColumns() const { return m_hasColumns; }
 
-    virtual bool isWordBreak() const { ASSERT(isInlineFlow()); return false; }
-
     void checkConsistency() const;
 

trunk/WebCore/rendering/RenderText.cpp

@@ -77 +77 @@
 #endif
 
+const char* RenderText::renderName() const
+{
+    return "RenderText";
+}
+
+bool RenderText::isTextFragment() const
+{
+    return false;
+}
+
+bool RenderText::isWordBreak() const
+{
+    return false;
+}
+
 void RenderText::setStyle(RenderStyle* newStyle)
 {

trunk/WebCore/rendering/RenderText.h

@@ -38 +38 @@
 #endif
 
-    virtual const char* renderName() const { return "RenderText"; }
+    virtual const char* renderName() const;
 
-    virtual bool isTextFragment() const { return false; }
+    virtual bool isTextFragment() const;
+    virtual bool isWordBreak() const;
 
     virtual PassRefPtr<StringImpl> originalText() const;

trunk/WebCore/rendering/RenderWordBreak.cpp

@@ -33 +33 @@
 
 RenderWordBreak::RenderWordBreak(HTMLElement* element)
-    : RenderInline(element)
+    : RenderText(element, StringImpl::empty())
 {
 }
@@ -47 +47 @@
 }
 
-bool RenderWordBreak::canHaveChildren() const
-{
-    return false;
 }
-
-}

trunk/WebCore/rendering/RenderWordBreak.h

@@ -28 +28 @@
 #define RenderWordBreak_h
 
-#include "RenderInline.h"
+#include "RenderText.h"
 
 namespace WebCore {
@@ -34 +34 @@
 class HTMLElement;
 
-class RenderWordBreak : public RenderInline {
+class RenderWordBreak : public RenderText {
 public:
     RenderWordBreak(HTMLElement*);
@@ -40 +40 @@
     virtual const char* renderName() const;
     virtual bool isWordBreak() const;
-    virtual bool canHaveChildren() const;
 };
 

trunk/WebCore/rendering/bidi.cpp

@@ -1507 +1507 @@
             }
 
-            if (static_cast<RenderFlow*>(o)->isWordBreak()) {
-                w += tmpW;
-                tmpW = 0;
-                lBreak.obj = o;
-                lBreak.pos = 0;
-            }
             tmpW += o->marginLeft() + o->borderLeft() + o->paddingLeft() +
                     o->marginRight() + o->borderRight() + o->paddingRight();
@@ -1548 +1542 @@
         } else if (o->isText()) {
             RenderText* t = static_cast<RenderText*>(o);
+
             int strlen = t->textLength();
             int len = strlen - pos;
@@ -1569 +1564 @@
             bool midWordBreak = false;
             bool breakAll = o->style()->wordBreak() == BreakAllWordBreak && autoWrap;
+
+            if (t->isWordBreak()) {
+                w += tmpW;
+                tmpW = 0;
+                lBreak.obj = o;
+                lBreak.pos = 0;
+                ASSERT(!len);
+            }
 
             while (len) {
@@ -1800 +1803 @@
                 atStart = false;
             }
-            
+
             // IMPORTANT: pos is > length here!
             if (!ignoringSpaces)
@@ -1819 +1822 @@
                     checkForBreak = false;
                     RenderText* nextText = static_cast<RenderText*>(next);
-                    if (nextText->textLength() != 0) {
+                    if (nextText->textLength()) {
                         UChar c = nextText->characters()[0];
                         if (c == ' ' || c == '\t' || (c == '\n' && !shouldPreserveNewline(next)))
@@ -1826 +1829 @@
                             // keep adding to |tmpW|.  Just update and continue.
                             checkForBreak = true;
-                    }
+                    } else if (nextText->isWordBreak())
+                        checkForBreak = true;
                     bool willFitOnLine = (w + tmpW <= width);
                     bool canPlaceOnLine = willFitOnLine || !autoWrapWasEverTrueOnLine;