Remove some includes of CachedImage.h
https://bugs.webkit.org/show_bug.cgi?id=114411
Reviewed by Dan Bernstein.
* css/CSSCrossfadeValue.h: Initializing CachedResourceHandle with 0 requires a
definition of a class it holds, but default construction does not.
* rendering/RenderImageResource.cpp:
* rendering/RenderImageResource.h:
Moved definitions of virtual functions to a .cpp file. There is no win from having
them inline, and now we don't need CachedImage.h in the header.
* bindings/js/JSNodeCustom.cpp:
* dom/Clipboard.cpp:
(WebCore::Clipboard::Clipboard):
* platform/mac/ClipboardMac.h:
* rendering/InlineFlowBox.cpp:
* rendering/RenderBox.cpp:
* rendering/RenderListItem.cpp:
* rendering/RenderListMarker.cpp:
* rendering/RenderTableCol.cpp:
* rendering/RenderTableRow.cpp:
* rendering/RenderTableSection.cpp:
* svg/graphics/SVGImageCache.cpp:
Removed unnecessary includes.
* platform/mac/PasteboardMac.mm:
* rendering/RenderSnapshottedPlugIn.cpp:
Added ones where they are now necessary.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@148175 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/rendering/RenderImageResource.cpp b/Source/WebCore/rendering/RenderImageResource.cpp
index 91b3aac..a0b46d3 100644
--- a/Source/WebCore/rendering/RenderImageResource.cpp
+++ b/Source/WebCore/rendering/RenderImageResource.cpp
@@ -37,7 +37,6 @@
RenderImageResource::RenderImageResource()
: m_renderer(0)
- , m_cachedImage(0)
{
}
@@ -90,6 +89,16 @@
m_renderer->repaint();
}
+PassRefPtr<Image> RenderImageResource::image(int, int) const
+{
+ return m_cachedImage ? m_cachedImage->imageForRenderer(m_renderer) : nullImage();
+}
+
+bool RenderImageResource::errorOccurred() const
+{
+ return m_cachedImage && m_cachedImage->errorOccurred();
+}
+
void RenderImageResource::setContainerSizeForRenderer(const IntSize& imageContainerSize)
{
ASSERT(m_renderer);
@@ -102,4 +111,24 @@
return Image::nullImage();
}
+bool RenderImageResource::usesImageContainerSize() const
+{
+ return m_cachedImage ? m_cachedImage->usesImageContainerSize() : false;
+}
+
+bool RenderImageResource::imageHasRelativeWidth() const
+{
+ return m_cachedImage ? m_cachedImage->imageHasRelativeWidth() : false;
+}
+
+bool RenderImageResource::imageHasRelativeHeight() const
+{
+ return m_cachedImage ? m_cachedImage->imageHasRelativeHeight() : false;
+}
+
+LayoutSize RenderImageResource::imageSize(float multiplier) const
+{
+ return m_cachedImage ? m_cachedImage->imageSizeForRenderer(m_renderer, multiplier) : LayoutSize();
+}
+
} // namespace WebCore
