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

[Timothy]

thatcher    05/09/16 11:12:52

  Modified:    .        Tag: Safari-Den-branch ChangeLog
               khtml/xml Tag: Safari-Den-branch dom_nodeimpl.cpp
  Log:
          Merged fix from TOT to Safari-Den-branch
  
      2005-09-14 Vicki Murley  <vicki at apple.com>
  
          Reviewed by Dave Hyatt.
  
          - fixed <rdar://problem/4255274> REGRESSION: in some cases, link jumping to images is broken (4964)
  
          * khtml/xml/dom_nodeimpl.cpp:
          (DOM::ContainerNodeImpl::getUpperLeftCorner):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.23.2.2 +13 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.23.2.1
  retrieving revision 1.1.2.23.2.2
  diff -u -r1.1.2.23.2.1 -r1.1.2.23.2.2
  --- ChangeLog	16 Sep 2005 02:54:27 -0000	1.1.2.23.2.1
  +++ ChangeLog	16 Sep 2005 18:12:51 -0000	1.1.2.23.2.2
  @@ -1,3 +1,16 @@
  +2005-09-16  Timothy Hatcher  <thatcher at apple.com>
  +
  +        Merged fix from TOT to Safari-Den-branch
  +
  +    2005-09-14 Vicki Murley  <vicki at apple.com>
  +
  +        Reviewed by Dave Hyatt.
  + 
  +        - fixed <rdar://problem/4255274> REGRESSION: in some cases, link jumping to images is broken (4964)
  +
  +        * khtml/xml/dom_nodeimpl.cpp:
  +        (DOM::ContainerNodeImpl::getUpperLeftCorner): 
  +
   2005-09-14  Maciej Stachowiak  <mjs at apple.com>
   
           Reviewed by Geoff.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.140.8.8.2.1 +3 -1      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.8.8
  retrieving revision 1.140.8.8.2.1
  diff -u -r1.140.8.8 -r1.140.8.8.2.1
  --- dom_nodeimpl.cpp	9 Sep 2005 17:49:26 -0000	1.140.8.8
  +++ dom_nodeimpl.cpp	16 Sep 2005 18:12:52 -0000	1.140.8.8.2.1
  @@ -2138,6 +2138,8 @@
           else if(o->nextSibling())
               o = o->nextSibling();
           else {
  +            // FIXME: If the element we're scrolling to doesn't have a child or next sibling and none of the nodes on 
  +            // the parent chain have siblings, then this loop returns false prematurely - 4256060
               RenderObject *next = 0;
               while(!next) {
                   o = o->parent();
  @@ -2146,7 +2148,7 @@
               }
               o = next;
           }
  -        if (o->parent()->element() == this && !static_cast<RenderText*>(o)->firstTextBox() ) {
  +        if (o->parent()->element() == this && o->isText() && !o->isBR() && !static_cast<RenderText*>(o)->firstTextBox()) {
               // do nothing - skip child node of the named anchor if it doesn't have a text box rdar://problems/4233844&4246096
           }
           else if((o->isText() && !o->isBR()) || o->isReplaced()) {