[webkit-changes] cvs commit: WebCore/khtml/xsl xsl_stylesheetimpl.cpp xsl_stylesheetimpl.h

[Eric]

eseidel     05/12/16 13:43:49

  Modified:    .        ChangeLog
               khtml/xsl xsl_stylesheetimpl.cpp xsl_stylesheetimpl.h
  Log:
  Bug #: 6110
  Submitted by: eseidel
  Reviewed by: darin
          No test cases needed (no functionality changes).
  
          * khtml/xsl/xsl_stylesheetimpl.cpp:
          (DOM::XSLImportRuleImpl::XSLImportRuleImpl):
          (DOM::XSLImportRuleImpl::~XSLImportRuleImpl):
          (DOM::XSLImportRuleImpl::setStyleSheet):
          * khtml/xsl/xsl_stylesheetimpl.h:
          (DOM::XSLImportRuleImpl::styleSheet):
  
  Revision  Changes    Path
  1.553     +13 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.552
  retrieving revision 1.553
  diff -u -r1.552 -r1.553
  --- ChangeLog	16 Dec 2005 21:30:29 -0000	1.552
  +++ ChangeLog	16 Dec 2005 21:43:41 -0000	1.553
  @@ -1,3 +1,16 @@
  +2005-12-16  Eric Seidel  <eseidel at apple.com>
  +
  +        Reviewed by darin.
  +
  +        No test cases needed (no functionality changes).
  +
  +        * khtml/xsl/xsl_stylesheetimpl.cpp:
  +        (DOM::XSLImportRuleImpl::XSLImportRuleImpl):
  +        (DOM::XSLImportRuleImpl::~XSLImportRuleImpl):
  +        (DOM::XSLImportRuleImpl::setStyleSheet):
  +        * khtml/xsl/xsl_stylesheetimpl.h:
  +        (DOM::XSLImportRuleImpl::styleSheet):
  +
   2005-12-16  Adele Peterson  <adele at apple.com>
   
           Reviewed by Maciej.
  
  
  
  1.7       +3 -8      WebCore/khtml/xsl/xsl_stylesheetimpl.cpp
  
  Index: xsl_stylesheetimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xsl/xsl_stylesheetimpl.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- xsl_stylesheetimpl.cpp	12 Dec 2005 17:01:40 -0000	1.6
  +++ xsl_stylesheetimpl.cpp	16 Dec 2005 21:43:48 -0000	1.7
  @@ -230,17 +230,14 @@
   : StyleBaseImpl(parent)
   {
       m_strHref = href;
  -    m_styleSheet = 0;
       m_cachedSheet = 0;
       m_loading = false;
   }
   
   XSLImportRuleImpl::~XSLImportRuleImpl()
   {
  -    if (m_styleSheet) {
  +    if (m_styleSheet)
           m_styleSheet->setParent(0);
  -        m_styleSheet->deref();
  -    }
       
       if (m_cachedSheet)
           m_cachedSheet->deref(this);
  @@ -248,12 +245,10 @@
   
   void XSLImportRuleImpl::setStyleSheet(const DOMString& url, const DOMString& sheet)
   {
  -    if (m_styleSheet) {
  +    if (m_styleSheet)
           m_styleSheet->setParent(0);
  -        m_styleSheet->deref();
  -    }
  +    
       m_styleSheet = new XSLStyleSheetImpl(this, url);
  -    m_styleSheet->ref();
       
       XSLStyleSheetImpl* parent = parentStyleSheet();
       if (parent)
  
  
  
  1.3       +2 -2      WebCore/khtml/xsl/xsl_stylesheetimpl.h
  
  Index: xsl_stylesheetimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xsl/xsl_stylesheetimpl.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xsl_stylesheetimpl.h	19 Aug 2004 22:50:30 -0000	1.2
  +++ xsl_stylesheetimpl.h	16 Dec 2005 21:43:48 -0000	1.3
  @@ -86,7 +86,7 @@
       virtual ~XSLImportRuleImpl();
       
       DOM::DOMString href() const { return m_strHref; }
  -    XSLStyleSheetImpl* styleSheet() const { return m_styleSheet; }
  +    XSLStyleSheetImpl* styleSheet() const { return m_styleSheet.get(); }
       
       virtual bool isImportRule() { return true; }
       XSLStyleSheetImpl* parentStyleSheet() const;
  @@ -99,7 +99,7 @@
       
   protected:
       DOMString m_strHref;
  -    XSLStyleSheetImpl* m_styleSheet;
  +    RefPtr<XSLStyleSheetImpl> m_styleSheet;
       khtml::CachedXSLStyleSheet* m_cachedSheet;
       bool m_loading;
   };