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

[Justin]

justing     05/08/29 14:10:39

  Modified:    .        ChangeLog
               khtml/editing markup.cpp
  Log:
          Reviewed by john
  
          Fixes <rdar://problem/4236218>
          many leaks of StyleBaseImpl within -[WebCoreBridge markupStringFromRange:nodes:] within -[WebHTMLView copy:]
  
          Test cases added: none, doesn't affect layout
  
          * khtml/editing/markup.cpp:
          (khtml::createMarkup):
          deref defaultStyle on the early return
  
  Revision  Changes    Path
  1.35      +13 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- ChangeLog	29 Aug 2005 18:00:42 -0000	1.34
  +++ ChangeLog	29 Aug 2005 21:10:38 -0000	1.35
  @@ -1,3 +1,16 @@
  +2005-08-29  Justin Garcia  <justin.garcia at apple.com>
  +
  +        Reviewed by john
  +
  +        Fixes <rdar://problem/4236218> 
  +        many leaks of StyleBaseImpl within -[WebCoreBridge markupStringFromRange:nodes:] within -[WebHTMLView copy:]
  +
  +        Test cases added: none, doesn't affect layout
  +
  +        * khtml/editing/markup.cpp:
  +        (khtml::createMarkup):
  +        deref defaultStyle on the early return
  +
   2005-08-29  Darin Adler  <darin at apple.com>
   
           Reviewed by John Sullivan.
  
  
  
  1.33      +3 -1      WebCore/khtml/editing/markup.cpp
  
  Index: markup.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/markup.cpp,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- markup.cpp	26 Aug 2005 22:39:33 -0000	1.32
  +++ markup.cpp	29 Aug 2005 21:10:38 -0000	1.33
  @@ -350,8 +350,10 @@
       VisiblePosition visibleStart(range->startPosition(), VP_DEFAULT_AFFINITY);
       VisiblePosition visibleEnd(range->endPosition(), VP_DEFAULT_AFFINITY);
       if (!inSameBlock(visibleStart, visibleStart.next())) {
  -        if (visibleStart == visibleEnd.previous())
  +        if (visibleStart == visibleEnd.previous()) {
  +            defaultStyle->deref();
               return interchangeNewlineString;
  +        }
           markups.append(interchangeNewlineString);
           startNode = startNode->traverseNextNode();
       }