[webkit-changes] cvs commit: WebCore/khtml/editing delete_selection_command.cpp

[David]

harrison    05/11/14 11:53:48

  Modified:    .        ChangeLog
               khtml/editing delete_selection_command.cpp
  Log:
          Reviewed by Darin.
  
          <rdar://problem/4337532> Paragraph concatenation fails
  
          Updated editing/deleting tests to correctly check this behavior.
  
          * khtml/editing/delete_selection_command.cpp:
          (khtml::DeleteSelectionCommand::initializePositionData):
          Remove erroneous check for isStartOfParagraph(visibleEnd) when deciding whether to clear m_mergeBlocksAfterDelete.
  
  Revision  Changes    Path
  1.366     +12 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.365
  retrieving revision 1.366
  diff -u -r1.365 -r1.366
  --- ChangeLog	14 Nov 2005 09:51:21 -0000	1.365
  +++ ChangeLog	14 Nov 2005 19:53:45 -0000	1.366
  @@ -1,3 +1,15 @@
  +2005-11-11  David Harrison  <harrison at apple.com>
  +
  +        Reviewed by Darin.
  +
  +        <rdar://problem/4337532> Paragraph concatenation fails
  +
  +        Updated editing/deleting tests to correctly check this behavior.
  +
  +        * khtml/editing/delete_selection_command.cpp:
  +        (khtml::DeleteSelectionCommand::initializePositionData):
  +        Remove erroneous check for isStartOfParagraph(visibleEnd) when deciding whether to clear m_mergeBlocksAfterDelete.
  +
   2005-11-14  Anders Carlsson  <andersca at mac.com>
   
           * ChangeLog: Add bug numbers for recent fixes.
  
  
  
  1.22      +1 -1      WebCore/khtml/editing/delete_selection_command.cpp
  
  Index: delete_selection_command.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/delete_selection_command.cpp,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- delete_selection_command.cpp	7 Nov 2005 19:59:22 -0000	1.21
  +++ delete_selection_command.cpp	14 Nov 2005 19:53:48 -0000	1.22
  @@ -220,7 +220,7 @@
       // This is one of the tests that determines if block merging of content needs to be done.
       //
       VisiblePosition visibleEnd(end, m_selectionToDelete.endAffinity());
  -    if (isStartOfParagraph(visibleEnd) || isEndOfParagraph(visibleEnd)) {
  +    if (isEndOfParagraph(visibleEnd)) {
           Position previousLineStart = previousLinePosition(visibleEnd, 0).deepEquivalent();
           if (previousLineStart.isNull() || RangeImpl::compareBoundaryPoints(previousLineStart, m_downstreamStart) >= 0)
               m_mergeBlocksAfterDelete = false;