Changeset 99415 in webkit

Timestamp:

Nov 7, 2011, 6:10:56 AM (15 years ago)

Author:

andreas.kling@nokia.com

Message:

CSSImageValue: Remove inheritance from CachedImageClient.
<​http://webkit.org/b/71675>

Reviewed by Antti Koivisto.

CSSImageValue doesn't actually use any of the CachedImageClient
functionality, and holds a reference to the resource via the
CachedResourceHandle in StyleCachedImage.

So we can safely remove the multiple inheritance and simplify
the class.

• css/CSSImageValue.cpp:

(WebCore::CSSImageValue::~CSSImageValue):
(WebCore::CSSImageValue::cachedImage):
(WebCore::CSSImageValue::clearCachedImage):

• css/CSSImageValue.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSImageValue.cpp (modified) (3 diffs)
• css/CSSImageValue.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-07  Andreas Kling  <kling@webkit.org>
+
+        CSSImageValue: Remove inheritance from CachedImageClient.
+        <http://webkit.org/b/71675>
+
+        Reviewed by Antti Koivisto.
+
+        CSSImageValue doesn't actually use any of the CachedImageClient
+        functionality, and holds a reference to the resource via the
+        CachedResourceHandle in StyleCachedImage.
+
+        So we can safely remove the multiple inheritance and simplify
+        the class.
+
+        * css/CSSImageValue.cpp:
+        (WebCore::CSSImageValue::~CSSImageValue):
+        (WebCore::CSSImageValue::cachedImage):
+        (WebCore::CSSImageValue::clearCachedImage):
+        * css/CSSImageValue.h:
+
 2011-11-07  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/css/CSSImageValue.cpp

@@ -46 +46 @@
 CSSImageValue::~CSSImageValue()
 {
-    if (m_image && m_image->isCachedImage())
-        static_cast<StyleCachedImage*>(m_image.get())->cachedImage()->removeClient(this);
 }
 
@@ -74 +72 @@
 
         ResourceRequest request(loader->document()->completeURL(url));
-        if (CachedImage* cachedImage = loader->requestImage(request)) {
-            cachedImage->addClient(this);
+        if (CachedImage* cachedImage = loader->requestImage(request))
             m_image = StyleCachedImage::create(cachedImage);
-        }
     }
 
@@ -92 +88 @@
 void CSSImageValue::clearCachedImage()
 {
-    if (m_image && m_image->isCachedImage())
-        static_cast<StyleCachedImage*>(m_image.get())->cachedImage()->removeClient(this);
     m_image = 0;
     m_accessedImage = false;

trunk/Source/WebCore/css/CSSImageValue.h

@@ -23 +23 @@
 
 #include "CSSPrimitiveValue.h"
-#include "CachedImage.h"
 #include <wtf/RefPtr.h>
 
@@ -32 +31 @@
 class StyleImage;
 
-class CSSImageValue : public CSSPrimitiveValue, private CachedImageClient {
+class CSSImageValue : public CSSPrimitiveValue {
     WTF_MAKE_FAST_ALLOCATED;
 public: