[webkit-changes] cvs commit: WebCore/khtml/xml dom_nodeimpl.cpp

[Timothy]

thatcher    05/11/18 16:19:45

  Modified:    .        Tag: Safari-1-3-branch ChangeLog
               khtml/rendering Tag: Safari-1-3-branch render_layer.cpp
               khtml/xml Tag: Safari-1-3-branch dom_nodeimpl.cpp
  Log:
          Merged fix from TOT to Safari-1-3-branch
  
      2005-11-16  Adele Peterson  <adele at apple.com>
  
          Reviewed by Dave Harrson.
  
          - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=5759
          <rdar://problem/4346132> REGRESSION (10.4.3-10.4.4): horizontal link scrolling broken at aplacecalledcommon.co.uk (5759)
  
          * khtml/rendering/render_layer.cpp: (khtml::RenderLayer::getRectToExpose): If the rect is larger than the visible rect, and we're trying to align to the closest edge, align to the left edge.
          * khtml/xml/dom_nodeimpl.cpp: (DOM::ContainerNodeImpl::getRect): If width or height is negative, we were setting both to zero.
          Now we only set the negative value to zero without affecting the other value.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.335.2.32 +15 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.335.2.31
  retrieving revision 1.335.2.32
  diff -u -r1.335.2.31 -r1.335.2.32
  --- ChangeLog	19 Nov 2005 00:12:33 -0000	1.335.2.31
  +++ ChangeLog	19 Nov 2005 00:19:41 -0000	1.335.2.32
  @@ -2,6 +2,21 @@
   
           Merged fix from TOT to Safari-1-3-branch
   
  +    2005-11-16  Adele Peterson  <adele at apple.com>
  +
  +        Reviewed by Dave Harrson.
  +
  +        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=5759
  +        <rdar://problem/4346132> REGRESSION (10.4.3-10.4.4): horizontal link scrolling broken at aplacecalledcommon.co.uk (5759)
  +
  +        * khtml/rendering/render_layer.cpp: (khtml::RenderLayer::getRectToExpose): If the rect is larger than the visible rect, and we're trying to align to the closest edge, align to the left edge.
  +        * khtml/xml/dom_nodeimpl.cpp: (DOM::ContainerNodeImpl::getRect): If width or height is negative, we were setting both to zero.
  +        Now we only set the negative value to zero without affecting the other value.
  +
  +2005-11-18  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-1-3-branch
  +
       2005-11-18  Beth Dakin  <bdakin at apple.com>
   
           Reviewed by Darin.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.94.4.4  +4 -4      WebCore/khtml/rendering/render_layer.cpp
  
  Index: render_layer.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_layer.cpp,v
  retrieving revision 1.94.4.3
  retrieving revision 1.94.4.4
  diff -u -r1.94.4.3 -r1.94.4.4
  --- render_layer.cpp	18 Nov 2005 22:46:36 -0000	1.94.4.3
  +++ render_layer.cpp	19 Nov 2005 00:19:44 -0000	1.94.4.4
  @@ -624,8 +624,8 @@
           
       if (scrollX == noScroll) 
           x = visibleRect.x();
  -    // If we're trying to align to the closest edge, and the exposeRect is further right than the visibleRect, then alignRight.
  -    else if ((scrollX == alignRight) || ((scrollX == alignToClosestEdge) && exposeRect.right() > visibleRect.right()))
  +    // If we're trying to align to the closest edge, and the exposeRect is further right than the visibleRect, and not bigger than the visible area, then alignRight.
  +    else if ((scrollX == alignRight) || ((scrollX == alignToClosestEdge) && exposeRect.right() > visibleRect.right() && w < visibleRect.width()))
           x = exposeRect.right() - visibleRect.width();
       else if (scrollX == alignCenter)
           x -= (visibleRect.width() - w) / 2;
  @@ -652,8 +652,8 @@
           
       if (scrollY == noScroll) 
           y = visibleRect.y();
  -    // If we're trying to align to the closest edge, and the exposeRect is further down than the visibleRect, then alignBottom.
  -    else if ((scrollY == alignBottom) || ((scrollY == alignToClosestEdge) && exposeRect.bottom() > visibleRect.bottom()))
  +    // If we're trying to align to the closest edge, and the exposeRect is further down than the visibleRect, and not bigger than the visible area, then alignBottom.
  +    else if ((scrollY == alignBottom) || ((scrollY == alignToClosestEdge) && exposeRect.bottom() > visibleRect.bottom() && h < visibleRect.height()))
           y = exposeRect.bottom() - visibleRect.height();
       else if (scrollY == alignCenter)
           y -= (visibleRect.height() - h) / 2;
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.140.6.6 +5 -3      WebCore/khtml/xml/dom_nodeimpl.cpp
  
  Index: dom_nodeimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_nodeimpl.cpp,v
  retrieving revision 1.140.6.5
  retrieving revision 1.140.6.6
  diff -u -r1.140.6.5 -r1.140.6.6
  --- dom_nodeimpl.cpp	18 Nov 2005 23:39:01 -0000	1.140.6.5
  +++ dom_nodeimpl.cpp	19 Nov 2005 00:19:44 -0000	1.140.6.6
  @@ -2258,9 +2258,11 @@
           if (yPos==0)
               yPos = yEnd;
       }
  -    if ( xEnd <= xPos || yEnd <= yPos )
  -        return QRect( QPoint( xPos, yPos ), QSize() );
  -
  +    if (xEnd < xPos)
  +        xEnd = xPos;
  +    if (yEnd < yPos)
  +        yEnd = yPos;
  +        
       return QRect(xPos, yPos, xEnd - xPos, yEnd - yPos);
   }