[webkit-changes] cvs commit: WebCore/khtml/html html_miscimpl.cpp

[Adele]

adele       05/08/17 11:06:41

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/html Tag: Safari-2-0-branch html_miscimpl.cpp
  Log:
          Fixed merge error from last checkin.
  
          * khtml/html/html_miscimpl.cpp:
          (HTMLBaseFontElementImpl::~HTMLBaseFontElementImpl):
          (HTMLCollectionImpl::~HTMLCollectionImpl):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.120 +8 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.119
  retrieving revision 1.4104.2.120
  diff -u -r1.4104.2.119 -r1.4104.2.120
  --- ChangeLog	17 Aug 2005 00:45:14 -0000	1.4104.2.119
  +++ ChangeLog	17 Aug 2005 18:06:30 -0000	1.4104.2.120
  @@ -1,3 +1,11 @@
  +2005-08-17  Adele Peterson  <adele at apple.com>
  +
  +        Fixed merge error from last checkin.
  +
  +        * khtml/html/html_miscimpl.cpp:
  +        (HTMLBaseFontElementImpl::~HTMLBaseFontElementImpl):
  +        (HTMLCollectionImpl::~HTMLCollectionImpl):
  +
   2005-08-16  Adele Peterson  <adele at apple.com>
   
           Merged fix from TOT to Safari-2-0-branch
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.24.8.2  +2 -2      WebCore/khtml/html/html_miscimpl.cpp
  
  Index: html_miscimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_miscimpl.cpp,v
  retrieving revision 1.24.8.1
  retrieving revision 1.24.8.2
  diff -u -r1.24.8.1 -r1.24.8.2
  --- html_miscimpl.cpp	17 Aug 2005 00:45:34 -0000	1.24.8.1
  +++ html_miscimpl.cpp	17 Aug 2005 18:06:41 -0000	1.24.8.2
  @@ -41,8 +41,6 @@
   
   HTMLBaseFontElementImpl::~HTMLBaseFontElementImpl()
   {
  -    if (m_ownsInfo)
  -        delete info;
   }
   
   NodeImpl::Id HTMLBaseFontElementImpl::id() const
  @@ -64,6 +62,8 @@
   
   HTMLCollectionImpl::~HTMLCollectionImpl()
   {
  +    if (m_ownsInfo)
  +        delete info;
       base->deref();
   }