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

[Eric]

eseidel     05/11/29 17:58:46

  Modified:    .        ChangeLog
               khtml/rendering render_box.cpp
  Log:
  Bug #: 5800
  Submitted by: mitz
  Reviewed by: eseidel
          Test case: fast/css/absolute-poition-in-rtl-parent.html
          Fix for bug: http://bugzilla.opendarwin.org/show_bug.cgi?id=5800
  
          * khtml/rendering/render_box.cpp:
          (RenderBox::calcAbsoluteHorizontal):
  
  Revision  Changes    Path
  1.435     +10 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.434
  retrieving revision 1.435
  diff -u -r1.434 -r1.435
  --- ChangeLog	30 Nov 2005 00:57:55 -0000	1.434
  +++ ChangeLog	30 Nov 2005 01:58:40 -0000	1.435
  @@ -1,3 +1,13 @@
  +2005-11-29  Mitz Pettel  <opendarwin.org at mitzpettel.com>
  +
  +        Reviewed by darin.  Committed by eseidel.
  +
  +        Test case: fast/css/absolute-poition-in-rtl-parent.html
  +        Fix for bug: http://bugzilla.opendarwin.org/show_bug.cgi?id=5800
  +
  +        * khtml/rendering/render_box.cpp:
  +        (RenderBox::calcAbsoluteHorizontal):
  +
   2005-11-29  Beth Dakin  <bdakin at apple.com>
   
           Reviewed by Darin
  
  
  
  1.178     +4 -6      WebCore/khtml/rendering/render_box.cpp
  
  Index: render_box.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_box.cpp,v
  retrieving revision 1.177
  retrieving revision 1.178
  diff -u -r1.177 -r1.178
  --- render_box.cpp	15 Nov 2005 01:12:32 -0000	1.177
  +++ render_box.cpp	30 Nov 2005 01:58:45 -0000	1.178
  @@ -1383,22 +1383,20 @@
           for (; po && po != cb; po = po->parent())
               static_distance += po->xPos();
   
  -        if (l == AUTO || style()->left().isStatic())
  -            l = static_distance;
  +        l = static_distance;
       }
   
       else if ((parent()->style()->direction()==RTL && (l==AUTO && r==AUTO ))
               || style()->right().isStatic())
       {
           RenderObject* po = parent();
  -        static_distance = m_staticX - cb->borderLeft(); // Should already have been set through layout of the parent().
  +        static_distance = m_staticX + cw + cb->borderRight() - po->width(); // Should already have been set through layout of the parent().
           while (po && po!=containingBlock()) {
  -            static_distance+=po->xPos();
  +            static_distance -= po->xPos();
               po=po->parent();
           }
   
  -        if (r==AUTO || style()->right().isStatic())
  -            r = static_distance;
  +        r = static_distance;
       }
   
       calcAbsoluteHorizontalValues(Width, cb, cw, pab, static_distance, l, r, m_width, m_marginLeft, m_marginRight, m_x);