commit 2c814c476bea5aa72ee280d44a929fcf3c12da10
author hyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Apr 12 04:09:22 2008 +0000
committer hyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Apr 12 04:09:22 2008 +0000
tree 2e6f78bb0ed90eb1c0ea77759d2a6ebfca3ea0d5
parent bd04d32b68363aa74d07795fb8b1409f67bfd8c8

WebCore:

2008-04-11  David Hyatt  <hyatt@apple.com>

        Rename CachedResource's ref/deref methods to addClient/removeClient.  This matches the new
        StyleImage class and is a more accurate description of what those methods really do.

        Reviewed by olliej

        * WebCore.base.exp:
        * css/CSSCursorImageValue.cpp:
        (WebCore::CSSCursorImageValue::updateIfSVGCursorIsUsed):
        * css/CSSFontFaceSource.cpp:
        (WebCore::CSSFontFaceSource::CSSFontFaceSource):
        (WebCore::CSSFontFaceSource::~CSSFontFaceSource):
        * css/CSSImageValue.cpp:
        (WebCore::CSSImageValue::~CSSImageValue):
        (WebCore::CSSImageValue::image):
        * css/CSSImportRule.cpp:
        (WebCore::CSSImportRule::~CSSImportRule):
        (WebCore::CSSImportRule::insertedIntoParent):
        * dom/ProcessingInstruction.cpp:
        (WebCore::ProcessingInstruction::~ProcessingInstruction):
        (WebCore::ProcessingInstruction::checkStyleSheet):
        (WebCore::ProcessingInstruction::parseStyleSheet):
        * dom/XMLTokenizer.cpp:
        (WebCore::XMLTokenizer::~XMLTokenizer):
        (WebCore::XMLTokenizer::endElementNs):
        (WebCore::XMLTokenizer::notifyFinished):
        * html/CanvasPattern.cpp:
        (WebCore::CanvasPattern::CanvasPattern):
        (WebCore::CanvasPattern::~CanvasPattern):
        * html/HTMLImageLoader.cpp:
        (WebCore::HTMLImageLoader::~HTMLImageLoader):
        (WebCore::HTMLImageLoader::setImage):
        (WebCore::HTMLImageLoader::updateFromElement):
        * html/HTMLLinkElement.cpp:
        (WebCore::HTMLLinkElement::~HTMLLinkElement):
        (WebCore::HTMLLinkElement::process):
        * html/HTMLScriptElement.cpp:
        (WebCore::HTMLScriptElement::~HTMLScriptElement):
        (WebCore::HTMLScriptElement::parseMappedAttribute):
        (WebCore::HTMLScriptElement::insertedIntoDocument):
        (WebCore::HTMLScriptElement::removedFromDocument):
        (WebCore::HTMLScriptElement::notifyFinished):
        * html/HTMLTokenizer.cpp:
        (WebCore::HTMLTokenizer::reset):
        (WebCore::HTMLTokenizer::scriptHandler):
        (WebCore::HTMLTokenizer::notifyFinished):
        * loader/CachedCSSStyleSheet.cpp:
        (WebCore::CachedCSSStyleSheet::addClient):
        * loader/CachedCSSStyleSheet.h:
        * loader/CachedFont.cpp:
        (WebCore::CachedFont::addClient):
        * loader/CachedFont.h:
        * loader/CachedImage.cpp:
        (WebCore::CachedImage::addClient):
        * loader/CachedImage.h:
        * loader/CachedResource.cpp:
        (WebCore::CachedResource::addClient):
        (WebCore::CachedResource::removeClient):
        * loader/CachedResource.h:
        * loader/CachedScript.cpp:
        (WebCore::CachedScript::addClient):
        * loader/CachedScript.h:
        * loader/CachedXBLDocument.h:
        * loader/CachedXSLStyleSheet.cpp:
        (WebCore::CachedXSLStyleSheet::addClient):
        * loader/CachedXSLStyleSheet.h:
        * loader/mac/UserStyleSheetLoader.cpp:
        (UserStyleSheetLoader::UserStyleSheetLoader):
        (UserStyleSheetLoader::~UserStyleSheetLoader):
        * platform/mac/ClipboardMac.mm:
        (WebCore::ClipboardMac::setDragImage):
        * rendering/RenderImage.cpp:
        (WebCore::RenderImage::~RenderImage):
        (WebCore::RenderImage::setCachedImage):
        * rendering/RenderListMarker.cpp:
        (WebCore::RenderListMarker::~RenderListMarker):
        (WebCore::RenderListMarker::setStyle):
        * rendering/RenderObject.cpp:
        (WebCore::RenderObject::updateBackgroundImages):
        (WebCore::RenderObject::arenaDelete):
        * rendering/RenderStyle.cpp:
        (WebCore::StyleCachedImage::addClient):
        (WebCore::StyleCachedImage::removeClient):
        * svg/SVGImageLoader.cpp:
        (WebCore::SVGImageLoader::updateFromElement):
        * xml/XSLImportRule.cpp:
        (WebCore::XSLImportRule::~XSLImportRule):
        (WebCore::XSLImportRule::loadSheet):

WebKit/mac:

2008-04-11  David Hyatt  <hyatt@apple.com>

        Rename CachedResource ref/deref methods to addClient/removeClient.

        Reviewed by olliej

        * WebView/WebHTMLView.mm:
        (-[WebHTMLViewPrivate dealloc]):
        (-[WebHTMLViewPrivate finalize]):
        (-[WebHTMLViewPrivate clear]):
        (-[WebHTMLView setPromisedDragTIFFDataSource:WebCore::]):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@31834 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/rendering/RenderImage.cpp

diff --git a/WebCore/rendering/RenderImage.cpp b/WebCore/rendering/RenderImage.cpp
index d440e71d..6960eac 100644
--- a/WebCore/rendering/RenderImage.cpp
+++ b/WebCore/rendering/RenderImage.cpp
@@ -54,7 +54,7 @@
 RenderImage::~RenderImage()
 {
     if (m_cachedImage)
-        m_cachedImage->deref(this);
+        m_cachedImage->removeClient(this);
 }
 
 void RenderImage::setCachedImage(CachedImage* newImage)
@@ -62,10 +62,10 @@
     if (m_isAnonymousImage || m_cachedImage == newImage)
         return;
     if (m_cachedImage)
-        m_cachedImage->deref(this);
+        m_cachedImage->removeClient(this);
     m_cachedImage = newImage;
     if (m_cachedImage) {
-        m_cachedImage->ref(this);
+        m_cachedImage->addClient(this);
         if (m_cachedImage->errorOccurred())
             imageChanged(m_cachedImage);
     }