[webkit-changes] cvs commit: WebCore/khtml/misc shared.h

[Adele]

adele       05/08/23 19:50:47

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/misc Tag: Safari-2-0-branch shared.h
  Log:
          Merged another version of reset which is used in our xmlhttprequest leak fix.
  
          * khtml/misc/shared.h:
          (khtml::SharedPtr::reset):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.5   +7 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- ChangeLog	24 Aug 2005 00:49:04 -0000	1.1.2.4
  +++ ChangeLog	24 Aug 2005 02:50:46 -0000	1.1.2.5
  @@ -1,5 +1,12 @@
   2005-08-23  Adele Peterson  <adele at apple.com>
   
  +        Merged another version of reset which is used in our xmlhttprequest leak fix.
  +
  +        * khtml/misc/shared.h:
  +        (khtml::SharedPtr::reset):
  +
  +2005-08-23  Adele Peterson  <adele at apple.com>
  +
           Merged fix from TOT to Safari-2-0-branch
   
       2005-08-22  David Harrison  <harrison at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.10.1  +1 -0      WebCore/khtml/misc/shared.h
  
  Index: shared.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/misc/shared.h,v
  retrieving revision 1.5
  retrieving revision 1.5.10.1
  diff -u -r1.5 -r1.5.10.1
  --- shared.h	7 Sep 2004 00:25:36 -0000	1.5
  +++ shared.h	24 Aug 2005 02:50:46 -0000	1.5.10.1
  @@ -72,6 +72,7 @@
       bool notNull() const { return m_ptr != 0; }
   
       void reset() { if (m_ptr) m_ptr->deref(); m_ptr = 0; }
  +    void reset(T *o) { if (o) o->ref(); if (m_ptr) m_ptr->deref(); m_ptr = o; }
       
       T * get() const { return m_ptr; }
       T &operator*() const { return *m_ptr; }