[webkit-changes] cvs commit: WebCore/khtml/rendering render_form.cpp

[Timothy]

thatcher    05/11/10 20:29:46

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/rendering Tag: Safari-2-0-branch render_form.cpp
  Log:
          Merged fix from TOT to Safari-2-0-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.1.2.50  +12 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.49
  retrieving revision 1.1.2.50
  diff -u -r1.1.2.49 -r1.1.2.50
  --- ChangeLog	11 Nov 2005 01:45:51 -0000	1.1.2.49
  +++ ChangeLog	11 Nov 2005 04:29:40 -0000	1.1.2.50
  @@ -2,6 +2,18 @@
   
           Merged fix from TOT to Safari-2-0-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-2-0-branch
  +
       2005-09-21  Vicki Murley  <vicki at apple.com>
      
           Changes by Romain Brestac, reviewed by Darin.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.102.8.5 +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.8.4
  retrieving revision 1.102.8.5
  diff -u -r1.102.8.4 -r1.102.8.5
  --- render_form.cpp	11 Nov 2005 01:18:55 -0000	1.102.8.4
  +++ render_form.cpp	11 Nov 2005 04:29:46 -0000	1.102.8.5
  @@ -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("    ");