Changeset 23737 in webkit

Timestamp:

Jun 22, 2007 12:00:51 AM (17 years ago)

Author:

bdash

Message:

2007-06-21 Mark Rowe <​mrowe@apple.com>

Reviewed by Darin.

Fix for <rdar://problem/5266928> REGRESSION: crash/assert failure beneath RenderFrameSet::layOutAxis when loading

• platform/StringImpl.cpp: (WebCore::StringImpl::toLengthArray): Simplify whitespace before checking for an empty string. This avoids returning a length of zero when the string is collapsed to empty by whitespace simplification.

2007-06-21 Mark Rowe <​mrowe@apple.com>

Reviewed by Darin.

Test for <rdar://problem/5266928> REGRESSION: crash/assert failure beneath RenderFrameSet::layOutAxis when loading

• fast/frames/frame-set-whitespace-attributes-expected.txt: Added.
• fast/frames/frame-set-whitespace-attributes.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/frames/frame-set-whitespace-attributes-expected.txt (added)
• LayoutTests/fast/frames/frame-set-whitespace-attributes.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/StringImpl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-06-21  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Darin.
+
+        Test for <rdar://problem/5266928> REGRESSION: crash/assert failure beneath RenderFrameSet::layOutAxis when loading
+
+        * fast/frames/frame-set-whitespace-attributes-expected.txt: Added.
+        * fast/frames/frame-set-whitespace-attributes.html: Added.
+
 2007-06-21  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-06-21  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Darin.
+
+        Fix for <rdar://problem/5266928> REGRESSION: crash/assert failure beneath RenderFrameSet::layOutAxis when loading
+
+        * platform/StringImpl.cpp:
+        (WebCore::StringImpl::toLengthArray): Simplify whitespace before checking for an empty string.  This avoids returning
+        a length of zero when the string is collapsed to empty by whitespace simplification.
+
 2007-06-21  Dave Hyatt  <hyatt@apple.com>
 

trunk/WebCore/platform/StringImpl.cpp

@@ -354 +354 @@
 Length* StringImpl::toLengthArray(int& len) const
 {
-    if (!length()) {
+    DeprecatedString str(reinterpret_cast<const DeprecatedChar*>(m_data), m_length);
+    str = str.simplifyWhiteSpace();
+    if (!str.length()) {
         len = 1;
         return 0;
     }
-    DeprecatedString str(reinterpret_cast<const DeprecatedChar*>(m_data), m_length);
-    str = str.simplifyWhiteSpace();
 
     len = str.contains(',') + 1;