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

[Timothy]

thatcher    05/12/01 16:41:44

  Modified:    .        Tag: Safari-1-3-branch ChangeLog
               khtml/xml Tag: Safari-1-3-branch dom_nodeimpl.cpp
  Log:
          Merged fix from TOT to Safari-1-3-branch
  
      2005-12-01  Adele Peterson  <adele at apple.com>
  
          Reviewed by Vicki and Dave Harrsion.
  
          - fixed <rdar://problem/4356771> Regression: Mail always scrolls to the bottom of a message when replying/forwarding
  
          Fixed a bug in getRect where the code would return a zero sized rect at the
          lower right corner if the origin was 0,0.  This was causing the scrolling code to
          attempt to scroll to the lower left corner of the editable html element in Mail.
  
          Added test:
          * editing/selection/focus_editable_html.html
  
          * khtml/xml/dom_nodeimpl.cpp:
          (DOM::ContainerNodeImpl::getRect):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.335.2.43 +20 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.335.2.42
  retrieving revision 1.335.2.43
  diff -u -r1.335.2.42 -r1.335.2.43
  --- ChangeLog	1 Dec 2005 23:57:34 -0000	1.335.2.42
  +++ ChangeLog	2 Dec 2005 00:41:37 -0000	1.335.2.43
  @@ -1,5 +1,25 @@
   2005-12-01  Timothy Hatcher  <timothy at apple.com>
   
  +        Merged fix from TOT to Safari-1-3-branch
  +
  +    2005-12-01  Adele Peterson  <adele at apple.com>
  +
  +        Reviewed by Vicki and Dave Harrsion.
  +
  +        - fixed <rdar://problem/4356771> Regression: Mail always scrolls to the bottom of a message when replying/forwarding
  +
  +        Fixed a bug in getRect where the code would return a zero sized rect at the
  +        lower right corner if the origin was 0,0.  This was causing the scrolling code to
  +        attempt to scroll to the lower left corner of the editable html element in Mail.
  +
  +        Added test:
  +        * editing/selection/focus_editable_html.html
  +
  +        * khtml/xml/dom_nodeimpl.cpp:
  +        (DOM::ContainerNodeImpl::getRect):
  +
  +2005-12-01  Timothy Hatcher  <timothy at apple.com>
  +
           Fix by Geoff
   
           - <rdar://problem/4352697> Glendale Regression: Some widgets don't get
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.140.6.10 +12 -16    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.9
  retrieving revision 1.140.6.10
  diff -u -r1.140.6.9 -r1.140.6.10
  --- dom_nodeimpl.cpp	1 Dec 2005 23:16:41 -0000	1.140.6.9
  +++ dom_nodeimpl.cpp	2 Dec 2005 00:41:43 -0000	1.140.6.10
  @@ -2227,27 +2227,23 @@
   
   QRect NodeBaseImpl::getRect() const
   {
  -    int xPos, yPos;
  -    if (!getUpperLeftCorner(xPos,yPos))
  +    int xPos = 0, yPos = 0, xEnd = 0, yEnd = 0;
  +    bool foundUpperLeft = getUpperLeftCorner(xPos,yPos);
  +    bool foundLowerRight = getLowerRightCorner(xEnd,yEnd);
  +    
  +    // If we've found one corner, but not the other,
  +    // then we should just return a point at the corner that we did find.
  +    if (foundUpperLeft != foundLowerRight)
       {
  -        xPos=0;
  -        yPos=0;
  -    }
  -    int xEnd, yEnd;
  -    if (!getLowerRightCorner(xEnd,yEnd))
  -    {
  -        if (xPos)
  +        if (foundUpperLeft) {
               xEnd = xPos;
  -        if (yPos)
               yEnd = yPos;
  -    }
  -    else
  -    {
  -        if (xPos==0)
  +        } else {
               xPos = xEnd;
  -        if (yPos==0)
               yPos = yEnd;
  -    }
  +        }
  +    } 
  +
       if (xEnd < xPos)
           xEnd = xPos;
       if (yEnd < yPos)