Changeset 158090 in webkit

Timestamp:

Oct 26, 2013 11:59:27 AM (10 years ago)

Author:

akling@apple.com

Message:

CTTE: RenderImageResourceStyleImage always has a StyleImage.
<​https://webkit.org/b/123390>

Codify the fact that RenderImageResourceStyleImage always wraps an
existing StyleImage object.

Reviewed by Antti Koivisto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderElement.cpp (modified) (1 diff)
• rendering/RenderImageResourceStyleImage.cpp (modified) (2 diffs)
• rendering/RenderImageResourceStyleImage.h (modified) (2 diffs)
• rendering/style/ContentData.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-26  Andreas Kling  <akling@apple.com>
+
+        CTTE: RenderImageResourceStyleImage always has a StyleImage.
+        <https://webkit.org/b/123390>
+
+        Codify the fact that RenderImageResourceStyleImage always wraps an
+        existing StyleImage object.
+
+        Reviewed by Antti Koivisto.
+
 2013-10-26  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -131 +131 @@
         image->setStyleInternal(style);
         if (const StyleImage* styleImage = static_cast<const ImageContentData*>(contentData)->image()) {
-            image->setImageResource(RenderImageResourceStyleImage::create(const_cast<StyleImage*>(styleImage)));
+            image->setImageResource(RenderImageResourceStyleImage::create(const_cast<StyleImage&>(*styleImage)));
             image->setIsGeneratedContent();
         } else

trunk/Source/WebCore/rendering/RenderImageResourceStyleImage.cpp

@@ -35 +35 @@
 namespace WebCore {
 
-RenderImageResourceStyleImage::RenderImageResourceStyleImage(StyleImage* styleImage)
+RenderImageResourceStyleImage::RenderImageResourceStyleImage(StyleImage& styleImage)
     : m_styleImage(styleImage)
 {
-    ASSERT(m_styleImage);
 }
 
@@ -50 +49 @@
 
     if (m_styleImage->isCachedImage())
-        m_cachedImage = static_cast<StyleCachedImage*>(m_styleImage.get())->cachedImage();
+        m_cachedImage = m_styleImage.get().cachedImage();
 
     m_styleImage->addClient(m_renderer);

trunk/Source/WebCore/rendering/RenderImageResourceStyleImage.h

@@ -39 +39 @@
     virtual ~RenderImageResourceStyleImage();
 
-    static PassOwnPtr<RenderImageResource> create(StyleImage* styleImage)
+    static PassOwnPtr<RenderImageResource> create(StyleImage& styleImage)
     {
         return adoptPtr(new RenderImageResourceStyleImage(styleImage));
@@ -62 +62 @@
     virtual WrappedImagePtr imagePtr() const OVERRIDE { return m_styleImage->data(); }
 
-    explicit RenderImageResourceStyleImage(StyleImage*);
-    RefPtr<StyleImage> m_styleImage;
+    explicit RenderImageResourceStyleImage(StyleImage&);
+    Ref<StyleImage> m_styleImage;
 };
 

trunk/Source/WebCore/rendering/style/ContentData.cpp

@@ -53 +53 @@
     image->setPseudoStyle(&pseudoStyle);
     if (m_image)
-        image->setImageResource(RenderImageResourceStyleImage::create(m_image.get()));
+        image->setImageResource(RenderImageResourceStyleImage::create(*m_image));
     else
         image->setImageResource(RenderImageResource::create());