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

[Adele]

adele       05/08/31 18:01:53

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/xml Tag: Safari-2-0-branch dom_nodeimpl.cpp
  Log:
          Merged fix from TOT to Safari-2-0-branch
  
      2005-08-31  Vicki Murley  <vicki at apple.com>
  
          Reviewed by hyatt.
  
  	- fixed <rdar://problem/4233844> in some cases, HTML href named anchors don't scroll to the right place
  
  	Test cases added:
          * manual-tests/scrollToAnchorWithNewline.html: Added.
  
          * khtml/xml/dom_nodeimpl.cpp:
          (DOM::ContainerNodeImpl::getUpperLeftCorner): skip text nodes that do not have associated text boxes
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.17  +16 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.16
  retrieving revision 1.1.2.17
  diff -u -r1.1.2.16 -r1.1.2.17
  --- ChangeLog	31 Aug 2005 00:49:22 -0000	1.1.2.16
  +++ ChangeLog	1 Sep 2005 01:01:50 -0000	1.1.2.17
  @@ -1,3 +1,19 @@
  +2005-08-31  Adele Peterson  <adele at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
  +
  +    2005-08-31  Vicki Murley  <vicki at apple.com>
  +
  +        Reviewed by hyatt.
  +
  +	- fixed <rdar://problem/4233844> in some cases, HTML href named anchors don't scroll to the right place
  +        
  +	Test cases added: 
  +        * manual-tests/scrollToAnchorWithNewline.html: Added.
  +
  +        * khtml/xml/dom_nodeimpl.cpp:
  +        (DOM::ContainerNodeImpl::getUpperLeftCorner): skip text nodes that do not have associated text boxes
  +
   2005-08-30  Adele Peterson  <adele at apple.com>
   
           Merged fix from TOT to Safari-2-0-branch
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.140.8.7 +1 -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.6
  retrieving revision 1.140.8.7
  diff -u -r1.140.8.6 -r1.140.8.7
  --- dom_nodeimpl.cpp	28 Aug 2005 05:01:22 -0000	1.140.8.6
  +++ dom_nodeimpl.cpp	1 Sep 2005 01:01:51 -0000	1.140.8.7
  @@ -2146,7 +2146,7 @@
               }
               o = next;
           }
  -        if((o->isText() && !o->isBR()) || o->isReplaced()) {
  +        if((o->isText() && !o->isBR() && static_cast<RenderText*>(o)->firstTextBox()) || o->isReplaced()) {
               o->container()->absolutePosition( xPos, yPos );
               if (o->isText())
                   xPos += static_cast<RenderText *>(o)->minXPos();