Merge WebKit at r66666 : Initial merge by git.

Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f

1 files changed, 19 insertions, 7 deletions

diff --git a/WebCore/css/CSSImageValue.cpp b/WebCore/css/CSSImageValue.cpp
index 96a8dec..dc2d700 100644
--- a/WebCore/css/CSSImageValue.cpp
+++ b/WebCore/css/CSSImageValue.cpp
@@ -26,6 +26,7 @@
 #include "CachedImage.h"
 #include "DocLoader.h"
 #include "StyleCachedImage.h"
+#include "StylePendingImage.h"
 
 namespace WebCore {
 
@@ -43,8 +44,19 @@ CSSImageValue::CSSImageValue()
 
 CSSImageValue::~CSSImageValue()
 {
-    if (m_image)
-        m_image->cachedImage()->removeClient(this);
+    if (m_image && m_image->isCachedImage())
+        static_cast<StyleCachedImage*>(m_image.get())->cachedImage()->removeClient(this);
+}
+
+StyleImage* CSSImageValue::cachedOrPendingImage()
+{
+    if (getIdent() == CSSValueNone)
+        return 0;
+
+    if (!m_image)
+        m_image = StylePendingImage::create(this);
+
+    return m_image.get();
 }
 
 StyleCachedImage* CSSImageValue::cachedImage(DocLoader* loader)
@@ -71,20 +83,20 @@ StyleCachedImage* CSSImageValue::cachedImage(DocLoader* loader, const String& ur
         }
     }
     
-    return m_image.get();
+    return m_image->isCachedImage() ? static_cast<StyleCachedImage*>(m_image.get()) : 0;
 }
 
 String CSSImageValue::cachedImageURL()
 {
-    if (!m_image)
+    if (!m_image || !m_image->isCachedImage())
         return String();
-    return m_image->cachedImage()->url();
+    return static_cast<StyleCachedImage*>(m_image.get())->cachedImage()->url();
 }
 
 void CSSImageValue::clearCachedImage()
 {
-    if (m_image)
-        m_image->cachedImage()->removeClient(this);
+    if (m_image && m_image->isCachedImage())
+        static_cast<StyleCachedImage*>(m_image.get())->cachedImage()->removeClient(this);
     m_image = 0;
     m_accessedImage = false;
 }