[webkit-changes] cvs commit: WebCore/layout-tests/fast/text/international bidi-L2-run-reordering-expected.txt bidi-L2-run-reordering.html

[Darin]

darin       05/06/22 10:39:53

  Modified:    .        ChangeLog
               khtml/rendering bidi.cpp
  Added:       layout-tests/fast/text/international
                        bidi-L2-run-reordering-expected.txt
                        bidi-L2-run-reordering.html
  Log:
          Changes by Mitz Pettel.
          Reviewed by me.
  
          - fixed <http://bugzilla.opendarwin.org/show_bug.cgi?id=3633>
            Layout order of bidi level runs is incorrect
  
          Test cases added:
          * layout-tests/fast/text/international/bidi-L2-run-reordering-expected.txt: Added.
          * layout-tests/fast/text/international/bidi-L2-run-reordering.html: Added.
  
          * khtml/rendering/bidi.cpp: (khtml::RenderBlock::bidiReorderLine): Fixed mistake
          where we'd advance too far after reversing a run.
  
  Revision  Changes    Path
  1.4301    +15 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4300
  retrieving revision 1.4301
  diff -u -r1.4300 -r1.4301
  --- ChangeLog	22 Jun 2005 17:29:24 -0000	1.4300
  +++ ChangeLog	22 Jun 2005 17:39:48 -0000	1.4301
  @@ -1,5 +1,20 @@
   2005-06-22  Darin Adler  <darin at apple.com>
   
  +        Changes by Mitz Pettel.
  +        Reviewed by me.
  +
  +        - fixed <http://bugzilla.opendarwin.org/show_bug.cgi?id=3633>
  +          Layout order of bidi level runs is incorrect
  +
  +        Test cases added:
  +        * layout-tests/fast/text/international/bidi-L2-run-reordering-expected.txt: Added.
  +        * layout-tests/fast/text/international/bidi-L2-run-reordering.html: Added.
  +
  +        * khtml/rendering/bidi.cpp: (khtml::RenderBlock::bidiReorderLine): Fixed mistake
  +        where we'd advance too far after reversing a run.
  +
  +2005-06-22  Darin Adler  <darin at apple.com>
  +
           - added test case for JavaScriptCore fix
   
           * layout-tests/fast/js/string-replace-2-expected.txt: Added.
  
  
  
  1.128     +0 -2      WebCore/khtml/rendering/bidi.cpp
  
  Index: bidi.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/bidi.cpp,v
  retrieving revision 1.127
  retrieving revision 1.128
  diff -u -r1.127 -r1.128
  --- bidi.cpp	27 May 2005 01:17:32 -0000	1.127
  +++ bidi.cpp	22 Jun 2005 17:39:53 -0000	1.128
  @@ -1288,8 +1288,6 @@
                   }
                   int end = i-1;
                   reverseRuns(start, end);
  -                i++;
  -                if(i >= count) break;
               }
               levelHigh--;
           }
  
  
  
  1.1                  WebCore/layout-tests/fast/text/international/bidi-L2-run-reordering-expected.txt
  
  Index: bidi-L2-run-reordering-expected.txt
  ===================================================================
  layer at (0,0) size 800x600
    RenderCanvas at (0,0) size 800x600
  layer at (0,0) size 800x102
    RenderBlock {HTML} at (0,0) size 800x102
      RenderBody {BODY} at (8,16) size 784x70
        RenderBlock {P} at (0,0) size 784x36
          RenderText {TEXT} at (0,0) size 778x36
            text run at (0,0) width 778: "The three boxes should be the same. The order in each box should be: Roman letters, Hebrew letters, digits, Hebrew letters,"
            text run at (0,18) width 91: "Roman letters."
        RenderBlock {P} at (0,52) size 784x18
          RenderInline {SPAN} at (0,0) size 134x20 [border: (1px solid #008000)]
            RenderText {TEXT} at (1,0) size 132x18
              text run at (1,0) width 26: "abc "
              text run at (27,0) width 28: " \x{5D3}\x{5D4}\x{5D5}"
              text run at (55,0) width 24: "123"
              text run at (79,0) width 30: "\x{5D0}\x{5D1}\x{5D2} "
              text run at (109,0) width 24: " def"
          RenderText {TEXT} at (134,0) size 4x18
            text run at (134,0) width 4: " "
          RenderInline {SPAN} at (0,0) size 134x20 [border: (1px solid #008000)]
            RenderText {TEXT} at (139,0) size 132x18
              text run at (139,0) width 26: "abc "
              text run at (165,0) width 28: " \x{5D3}\x{5D4}\x{5D5}"
              text run at (193,0) width 24: "123"
              text run at (217,0) width 30: "\x{5D0}\x{5D1}\x{5D2} "
              text run at (247,0) width 24: " def"
          RenderText {TEXT} at (272,0) size 4x18
            text run at (272,0) width 4: " "
          RenderInline {SPAN} at (0,0) size 134x20 [border: (1px solid #008000)]
            RenderText {TEXT} at (277,0) size 132x18
              text run at (277,0) width 26: "abc "
              text run at (303,0) width 28: " \x{5D3}\x{5D4}\x{5D5}"
              text run at (331,0) width 24: "123"
              text run at (355,0) width 30: "\x{5D0}\x{5D1}\x{5D2} "
              text run at (385,0) width 24: " def"
          RenderText {TEXT} at (0,0) size 0x0
          RenderText {TEXT} at (0,0) size 0x0
  
  
  
  1.1                  WebCore/layout-tests/fast/text/international/bidi-L2-run-reordering.html
  
  Index: bidi-L2-run-reordering.html
  ===================================================================
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
  "http://www.w3.org/TR/html4/loose.dtd">
  <html>
  <head>
  <title>L2 run reordering bug</title>
  </head>
  <body>
  <p>
  The three boxes should be the same. The order in each
  box should be: Roman letters, Hebrew letters, digits, Hebrew letters, Roman
  letters.
  </p>
  <p>
  <span style="border:green 1px solid;">abc &#x05d0;&#x05d1;&#x05d2; 123 &#x05d3;&#x05d4;&#x05d5; def</span>
  <span style="border:green 1px solid;">abc &#x05d0;&#x05d1;&#x05d2; 123 &#x05d3;&#x05d4;&#x05d5; def</span>
  <span style="border:green 1px solid;">abc &#x05d0;&#x05d1;&#x05d2; 123 &#x05d3;&#x05d4;&#x05d5; def</span>
  </body>
  </html>