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

Fri Aug 12 11:56:42 PDT 2005

adele       05/08/12 11:56:42

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml    Tag: Safari-2-0-branch khtmlview.cpp
               khtml/rendering Tag: Safari-2-0-branch render_box.cpp
  Log:
          Added a few more missing changes for acid2.
  
          * khtml/khtmlview.cpp:
          (KHTMLView::layout):
          * khtml/rendering/render_box.cpp:
          (RenderBox::setStyle):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.113 +9 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.112
  retrieving revision 1.4104.2.113
  diff -u -r1.4104.2.112 -r1.4104.2.113
  --- ChangeLog	12 Aug 2005 18:25:02 -0000	1.4104.2.112
  +++ ChangeLog	12 Aug 2005 18:56:30 -0000	1.4104.2.113
  @@ -1,5 +1,14 @@
   2005-08-12  Adele Peterson  <adele at apple.com>
   
  +        Added a few more missing changes for acid2.
  +
  +        * khtml/khtmlview.cpp:
  +        (KHTMLView::layout):
  +        * khtml/rendering/render_box.cpp:
  +        (RenderBox::setStyle):
  +
  +2005-08-12  Adele Peterson  <adele at apple.com>
  +
           Added missing nil check from acid2 merge.
   
           * khtml/khtmlview.cpp: (KHTMLView::layout):
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.128.8.5 +1 -1      WebCore/khtml/khtmlview.cpp
  
  Index: khtmlview.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/khtmlview.cpp,v
  retrieving revision 1.128.8.4
  retrieving revision 1.128.8.5
  diff -u -r1.128.8.4 -r1.128.8.5
  --- khtmlview.cpp	12 Aug 2005 18:25:09 -0000	1.128.8.4
  +++ khtmlview.cpp	12 Aug 2005 18:56:40 -0000	1.128.8.5
  @@ -618,7 +618,7 @@
               }
           }
       }
  -    else
  +    else if (rootRenderer)
           applyOverflowToViewport(rootRenderer, hMode, vMode); // XML/XHTML UAs use the root element.
   
   #ifdef INSTRUMENT_LAYOUT_SCHEDULING
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.149.6.2 +1 -2      WebCore/khtml/rendering/render_box.cpp
  
  Index: render_box.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_box.cpp,v
  retrieving revision 1.149.6.1
  retrieving revision 1.149.6.2
  diff -u -r1.149.6.1 -r1.149.6.2
  --- render_box.cpp	9 Aug 2005 23:52:16 -0000	1.149.6.1
  +++ render_box.cpp	12 Aug 2005 18:56:41 -0000	1.149.6.2
  @@ -99,8 +99,7 @@
       // FIXME: Note that we restrict overflow to blocks for now.  One day table bodies and cells 
       // will need to support overflow.
       // We also handle <body> and <html>, whose overflow applies to the viewport.
  -    if (_style->overflow() != OVISIBLE && isBlockFlow() && !isTableCell() && !isRoot() &&
  -        (!isBody() || !document()->isHTMLDocument() || !(parent() && parent()->style()->overflow() == OVISIBLE)))
  +    if (_style->overflow() != OVISIBLE && isBlockFlow() && !isTableCell() && !isRoot() && (!isBody() || !document()->isHTMLDocument()))
           setHasOverflowClip();
   
       if (requiresLayer()) {