[webkit-changes] cvs commit: WebCore/khtml/rendering render_form.cpp
Timothy
thatcher at opensource.apple.com
Thu Nov 10 20:32:27 PST 2005
thatcher 05/11/10 20:32:27
Modified: . Tag: Safari-1-3-branch ChangeLog
khtml/rendering Tag: Safari-1-3-branch render_form.cpp
Log:
Merged fix from TOT to Safari-1-3-branch
2005-11-10 Adele Peterson <adele at apple.com>
Reviewed by Maciej.
- fixed <rdar://problem/4327363> GAP: tabs not treated as whitespace in option element
* khtml/rendering/render_form.cpp: (RenderSelect::updateFromElement): call simplifyWhiteSpace() on the itemText or label to collapse whitespace.
Revision Changes Path
No revision
No revision
1.335.2.11 +12 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.335.2.10
retrieving revision 1.335.2.11
diff -u -r1.335.2.10 -r1.335.2.11
--- ChangeLog 11 Nov 2005 01:51:12 -0000 1.335.2.10
+++ ChangeLog 11 Nov 2005 04:32:24 -0000 1.335.2.11
@@ -2,6 +2,18 @@
Merged fix from TOT to Safari-1-3-branch
+ 2005-11-10 Adele Peterson <adele at apple.com>
+
+ Reviewed by Maciej.
+
+ - fixed <rdar://problem/4327363> GAP: tabs not treated as whitespace in option element
+
+ * khtml/rendering/render_form.cpp: (RenderSelect::updateFromElement): call simplifyWhiteSpace() on the itemText or label to collapse whitespace.
+
+2005-11-10 Timothy Hatcher <timothy at apple.com>
+
+ Merged fix from TOT to Safari-1-3-branch
+
2005-09-21 Vicki Murley <vicki at apple.com>
Changes by Romain Brestac, reviewed by Darin.
No revision
No revision
1.102.6.4 +4 -0 WebCore/khtml/rendering/render_form.cpp
Index: render_form.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_form.cpp,v
retrieving revision 1.102.6.3
retrieving revision 1.102.6.4
diff -u -r1.102.6.3 -r1.102.6.4
--- render_form.cpp 11 Nov 2005 01:17:12 -0000 1.102.6.3
+++ render_form.cpp 11 Nov 2005 04:32:26 -0000 1.102.6.4
@@ -1132,6 +1132,8 @@
// In WinIE, an optgroup can't start or end with whitespace (other than the indent
// we give it). We match this behavior.
label = label.stripWhiteSpace();
+ // We want to collapse our whitespace too. This will match other browsers.
+ label = label.simplifyWhiteSpace();
#if APPLE_CHANGES
if (m_useListBox)
@@ -1155,6 +1157,8 @@
// In WinIE, leading and trailing whitespace is ignored in options. We match this behavior.
itemText = itemText.stripWhiteSpace();
+ // We want to collapse our whitespace too. This will match other browsers.
+ itemText = itemText.simplifyWhiteSpace();
if (listItems[listIndex]->parentNode()->id() == ID_OPTGROUP)
itemText.prepend(" ");
More information about the webkit-changes
mailing list