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

Adele adele at opensource.apple.com
Tue Aug 9 10:52:27 PDT 2005


adele       05/08/09 10:52:27

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/rendering Tag: Safari-2-0-branch bidi.cpp
  Log:
          Merged fix from TOT to Safari-2-0-branch
  
      2005-08-08  David Hyatt  <hyatt at apple.com>
  
  	Fix for radar bug #4202641, make sure line breaks happen inside
  	white-space:pre if word-wrap:break-word is set.
  
          Reviewed by darin
  
          Test cases added: fast/text/whitespace/pre-break-word.html
  
          * khtml/rendering/bidi.cpp:
          (khtml::RenderBlock::findNextLineBreak):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.101 +16 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.100
  retrieving revision 1.4104.2.101
  diff -u -r1.4104.2.100 -r1.4104.2.101
  --- ChangeLog	9 Aug 2005 17:48:47 -0000	1.4104.2.100
  +++ ChangeLog	9 Aug 2005 17:52:19 -0000	1.4104.2.101
  @@ -2,6 +2,22 @@
   
           Merged fix from TOT to Safari-2-0-branch
   
  +    2005-08-08  David Hyatt  <hyatt at apple.com>
  +
  +	Fix for radar bug #4202641, make sure line breaks happen inside
  +	white-space:pre if word-wrap:break-word is set.
  +	
  +        Reviewed by darin
  +
  +        Test cases added: fast/text/whitespace/pre-break-word.html
  +
  +        * khtml/rendering/bidi.cpp:
  +        (khtml::RenderBlock::findNextLineBreak):
  +
  +2005-08-09  Adele Peterson  <adele at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
  +
       2005-08-04  Justin Garcia  <justin.garcia at apple.com>
   
           Reviewed by kocienda
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.125.8.3 +2 -2      WebCore/khtml/rendering/bidi.cpp
  
  Index: bidi.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/bidi.cpp,v
  retrieving revision 1.125.8.2
  retrieving revision 1.125.8.3
  diff -u -r1.125.8.2 -r1.125.8.3
  --- bidi.cpp	5 Aug 2005 18:01:22 -0000	1.125.8.2
  +++ bidi.cpp	9 Aug 2005 17:52:26 -0000	1.125.8.3
  @@ -2079,7 +2079,7 @@
                   bool applyWordSpacing = false;
                   bool isNormal = o->style()->whiteSpace() == NORMAL;
                   bool breakNBSP = isNormal && o->style()->nbspMode() == SPACE;
  -                bool breakWords = w == 0 && isNormal && o->style()->wordWrap() == BREAK_WORD;
  +                bool breakWords = w == 0 && o->style()->wordWrap() == BREAK_WORD && (isNormal || o->style()->whiteSpace() == PRE);
   
                   currentCharacterIsWS = currentCharacterIsSpace || (breakNBSP && c.unicode() == nonBreakingSpace);
   
  @@ -2135,7 +2135,7 @@
                           }
                       }
           
  -                    if (o->style()->whiteSpace() == NORMAL) {
  +                    if (o->style()->whiteSpace() == NORMAL || breakWords) {
                           // In AFTER_WHITE_SPACE mode, consider the current character
                           // as candidate width for this line.
                           int charWidth = o->style()->khtmlLineBreak() == AFTER_WHITE_SPACE ? t->width(pos, 1, f, w+tmpW) : 0;
  
  
  



More information about the webkit-changes mailing list