Attachment 113853 Details for Bug 71675 – Proposed patch

[patch] Proposed patch

bug-71675.diff (text/plain), 3.01 KB, created by Andreas Kling on 2011-11-07 05:59:04 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Kling

Created: 2011-11-07 05:59:04 PST

Size: 3.01 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 767bec0..5d2e2fe 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,5 +1,25 @@
> 2011-11-07  Andreas Kling  <kling@webkit.org>
> 
>+        CSSImageValue: Remove inheritance from CachedImageClient.
>+        <http://webkit.org/b/71675>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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>
>+
>         CSSPrimitiveValue: Remove unused virtual function parseString().
>         <http://webkit.org/b/71671>
> 
>diff --git a/Source/WebCore/css/CSSImageValue.cpp b/Source/WebCore/css/CSSImageValue.cpp
>index 0836b62..2ce486e 100644
>--- a/Source/WebCore/css/CSSImageValue.cpp
>+++ b/Source/WebCore/css/CSSImageValue.cpp
>@@ -45,8 +45,6 @@ CSSImageValue::CSSImageValue()
> 
> CSSImageValue::~CSSImageValue()
> {
>-    if (m_image && m_image->isCachedImage())
>-        static_cast<StyleCachedImage*>(m_image.get())->cachedImage()->removeClient(this);
> }
> 
> StyleImage* CSSImageValue::cachedOrPendingImage()
>@@ -73,10 +71,8 @@ StyleCachedImage* CSSImageValue::cachedImage(CachedResourceLoader* loader, const
>         m_accessedImage = true;
> 
>         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);
>-        }
>     }
> 
>     return (m_image && m_image->isCachedImage()) ? static_cast<StyleCachedImage*>(m_image.get()) : 0;
>@@ -91,8 +87,6 @@ String CSSImageValue::cachedImageURL()
> 
> void CSSImageValue::clearCachedImage()
> {
>-    if (m_image && m_image->isCachedImage())
>-        static_cast<StyleCachedImage*>(m_image.get())->cachedImage()->removeClient(this);
>     m_image = 0;
>     m_accessedImage = false;
> }
>diff --git a/Source/WebCore/css/CSSImageValue.h b/Source/WebCore/css/CSSImageValue.h
>index 7091eab..347ed39 100644
>--- a/Source/WebCore/css/CSSImageValue.h
>+++ b/Source/WebCore/css/CSSImageValue.h
>@@ -22,7 +22,6 @@
> #define CSSImageValue_h
> 
> #include "CSSPrimitiveValue.h"
>-#include "CachedImage.h"
> #include <wtf/RefPtr.h>
> 
> namespace WebCore {
>@@ -31,7 +30,7 @@ class CachedResourceLoader;
> class StyleCachedImage;
> class StyleImage;
> 
>-class CSSImageValue : public CSSPrimitiveValue, private CachedImageClient {
>+class CSSImageValue : public CSSPrimitiveValue {
>     WTF_MAKE_FAST_ALLOCATED;
> public:
>     static PassRefPtr<CSSImageValue> create() { return adoptRef(new CSSImageValue); }

Actions: View | Formatted Diff | Diff

Attachments on bug 71675: 113853