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

[Adele]

adele       05/08/13 10:13:19

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/rendering Tag: Safari-2-0-branch bidi.cpp
  Log:
          Rolled out fix since it doesn't work right on the branch
          <rdar://problem/4202641> Line breaks do not happen inside whitespace:pre; word-wrap: break-word
  
          * khtml/rendering/bidi.cpp:
          (khtml::RenderBlock::findNextLineBreak):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.114 +8 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.113
  retrieving revision 1.4104.2.114
  diff -u -r1.4104.2.113 -r1.4104.2.114
  --- ChangeLog	12 Aug 2005 18:56:30 -0000	1.4104.2.113
  +++ ChangeLog	13 Aug 2005 17:13:11 -0000	1.4104.2.114
  @@ -1,3 +1,11 @@
  +2005-08-13  Adele Peterson  <adele at apple.com>
  +
  +        Rolled out fix since it doesn't work right on the branch
  +        <rdar://problem/4202641> Line breaks do not happen inside whitespace:pre; word-wrap: break-word
  +
  +        * khtml/rendering/bidi.cpp:
  +        (khtml::RenderBlock::findNextLineBreak):
  +
   2005-08-12  Adele Peterson  <adele at apple.com>
   
           Added a few more missing changes for acid2.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.125.8.5 +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.4
  retrieving revision 1.125.8.5
  diff -u -r1.125.8.4 -r1.125.8.5
  --- bidi.cpp	12 Aug 2005 08:47:41 -0000	1.125.8.4
  +++ bidi.cpp	13 Aug 2005 17:13:18 -0000	1.125.8.5
  @@ -2094,7 +2094,7 @@
                   bool applyWordSpacing = false;
                   bool isNormal = o->style()->whiteSpace() == NORMAL;
                   bool breakNBSP = isNormal && o->style()->nbspMode() == SPACE;
  -                bool breakWords = w == 0 && o->style()->wordWrap() == BREAK_WORD && (isNormal || o->style()->whiteSpace() == PRE);
  +                bool breakWords = w == 0 && isNormal && o->style()->wordWrap() == BREAK_WORD;
   
                   currentCharacterIsWS = currentCharacterIsSpace || (breakNBSP && c.unicode() == nonBreakingSpace);
   
  @@ -2150,7 +2150,7 @@
                           }
                       }
           
  -                    if (o->style()->whiteSpace() == NORMAL || breakWords) {
  +                    if (o->style()->whiteSpace() == NORMAL) {
                           // 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;