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

[Adele]

adele       05/08/27 22:01:23

  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-27  David Harrison  <harrison at apple.com>
  
          Reviewed by Adele and John.
  
          - fixes <rdar://problem/4214259> (REGRESSION: DENVER )Safari app will crash when pressing Command + a to select all (Word XML format)
  
          Problem is that NodeImpl::maxDeepOffset() was using the wrong test for being able to call the
          TextImpl length() function, so it was being called on a ProcessingInstruction node.
  
          Test cases added:
          * manual-tests/wordXML-selectall.xml: Added.
  
          * khtml/xml/dom_nodeimpl.cpp:
          (NodeImpl::maxDeepOffset): use isTextNode() instead of offsetInCharacters().
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.13  +19 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.12
  retrieving revision 1.1.2.13
  diff -u -r1.1.2.12 -r1.1.2.13
  --- ChangeLog	27 Aug 2005 17:41:46 -0000	1.1.2.12
  +++ ChangeLog	28 Aug 2005 05:01:21 -0000	1.1.2.13
  @@ -1,5 +1,24 @@
   2005-08-27  Adele Peterson  <adele at apple.com>
   
  +        Merged fix from TOT to Safari-2-0-branch
  +
  +    2005-08-27  David Harrison  <harrison at apple.com>
  +
  +        Reviewed by Adele and John.
  +
  +        - fixes <rdar://problem/4214259> (REGRESSION: DENVER )Safari app will crash when pressing Command + a to select all (Word XML format)
  +
  +        Problem is that NodeImpl::maxDeepOffset() was using the wrong test for being able to call the
  +        TextImpl length() function, so it was being called on a ProcessingInstruction node.
  + 
  +        Test cases added:
  +        * manual-tests/wordXML-selectall.xml: Added.
  +
  +        * khtml/xml/dom_nodeimpl.cpp:
  +        (NodeImpl::maxDeepOffset): use isTextNode() instead of offsetInCharacters(). 
  +
  +2005-08-27  Adele Peterson  <adele at apple.com>
  +
           Fixing merge error.
   
           * khtml/editing/markup.cpp:
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.140.8.6 +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.5
  retrieving revision 1.140.8.6
  diff -u -r1.140.8.5 -r1.140.8.6
  --- dom_nodeimpl.cpp	26 Jul 2005 22:45:32 -0000	1.140.8.5
  +++ dom_nodeimpl.cpp	28 Aug 2005 05:01:22 -0000	1.140.8.6
  @@ -1404,7 +1404,7 @@
   // method for editing madness, which allows BR,1 as a position, though that is incorrect
   long NodeImpl::maxDeepOffset() const
   {
  -    if (offsetInCharacters(nodeType()))
  +    if (isTextNode())
           return static_cast<const TextImpl*>(this)->length();
           
       if (id() == ID_BR || (renderer() && renderer()->isReplaced()))