Attachment 114063 Details for Bug 71814 – Patch

[patch] Patch

bug-71814.diff (text/plain), 2.62 KB, created by Andreas Kling on 2011-11-08 07:42:49 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Kling

Created: 2011-11-08 07:42:49 PST

Size: 2.62 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index b94e925..98dbaf5 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,5 +1,20 @@
> 2011-11-08  Andreas Kling  <kling@webkit.org>
> 
>+        CSSImageValue: Devirtualize cachedImage(CachedResourceLoader*).
>+        <http://webkit.org/b/71814>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Defer to CSSCursorImageValue (the only CSSImageValue subclass)
>+        when appropriate in CSSImageValue::cachedImage(CachedResourceLoader*).
>+
>+        * css/CSSCursorImageValue.h:
>+        * css/CSSImageValue.cpp:
>+        (WebCore::CSSImageValue::cachedImage):
>+        * css/CSSImageValue.h:
>+
>+2011-11-08  Andreas Kling  <kling@webkit.org>
>+
>         CSSValue: Devirtualize cssText().
>         <http://webkit.org/b/71813>
> 
>diff --git a/Source/WebCore/css/CSSCursorImageValue.h b/Source/WebCore/css/CSSCursorImageValue.h
>index 2a95c3ab..3c03413 100644
>--- a/Source/WebCore/css/CSSCursorImageValue.h
>+++ b/Source/WebCore/css/CSSCursorImageValue.h
>@@ -42,7 +42,7 @@ public:
>     IntPoint hotSpot() const { return m_hotSpot; }
> 
>     bool updateIfSVGCursorIsUsed(Element*);
>-    virtual StyleCachedImage* cachedImage(CachedResourceLoader*);
>+    StyleCachedImage* cachedImage(CachedResourceLoader*);
> 
> #if ENABLE(SVG)
>     void removeReferencedElement(SVGElement*);
>diff --git a/Source/WebCore/css/CSSImageValue.cpp b/Source/WebCore/css/CSSImageValue.cpp
>index 73f53c1..22e90b2 100644
>--- a/Source/WebCore/css/CSSImageValue.cpp
>+++ b/Source/WebCore/css/CSSImageValue.cpp
>@@ -21,6 +21,7 @@
> #include "config.h"
> #include "CSSImageValue.h"
> 
>+#include "CSSCursorImageValue.h"
> #include "CSSValueKeywords.h"
> #include "Document.h"
> #include "MemoryCache.h"
>@@ -66,6 +67,8 @@ StyleImage* CSSImageValue::cachedOrPendingImage()
> 
> StyleCachedImage* CSSImageValue::cachedImage(CachedResourceLoader* loader)
> {
>+    if (isCursorImageValue())
>+        return static_cast<CSSCursorImageValue*>(this)->cachedImage(loader);
>     return cachedImage(loader, getStringValue());
> }
> 
>diff --git a/Source/WebCore/css/CSSImageValue.h b/Source/WebCore/css/CSSImageValue.h
>index 1b65e63..ffe0076 100644
>--- a/Source/WebCore/css/CSSImageValue.h
>+++ b/Source/WebCore/css/CSSImageValue.h
>@@ -37,7 +37,7 @@ public:
>     static PassRefPtr<CSSImageValue> create(const String& url) { return adoptRef(new CSSImageValue(url)); }
>     virtual ~CSSImageValue();
> 
>-    virtual StyleCachedImage* cachedImage(CachedResourceLoader*);
>+    StyleCachedImage* cachedImage(CachedResourceLoader*);
>     // Returns a StyleCachedImage if the image is cached already, otherwise a StylePendingImage.
>     StyleImage* cachedOrPendingImage();
>

Flags:

koivisto: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 71814: 114063