Chromium Code Reviews| Index: Source/core/rendering/RenderImageResource.h |
| diff --git a/Source/core/rendering/RenderImageResource.h b/Source/core/rendering/RenderImageResource.h |
| index cae42e2eb036c0c9162581390877db518ccc3bda..259f2e983f5f173e9fc83bdc7521422c2ea85847 100644 |
| --- a/Source/core/rendering/RenderImageResource.h |
| +++ b/Source/core/rendering/RenderImageResource.h |
| @@ -29,8 +29,6 @@ |
| #include "core/fetch/ImageResource.h" |
| #include "core/fetch/ResourcePtr.h" |
| #include "core/rendering/style/StyleImage.h" |
| -#include "platform/geometry/LayoutSize.h" |
| -#include "platform/graphics/Image.h" |
| namespace WebCore { |
| @@ -55,7 +53,7 @@ public: |
| void resetAnimation(); |
| - virtual PassRefPtr<Image> image(int /* width */ = 0, int /* height */ = 0) const { return m_cachedImage ? m_cachedImage->imageForRenderer(m_renderer) : nullImage(); } |
| + virtual PassRefPtr<Image> image(int /* width */ = 0, int /* height */ = 0) const { return m_cachedImage ? m_cachedImage->imageForRenderer(m_renderer) : Image::nullImage(); } |
|
eseidel
2013/12/30 17:14:40
We should fix this constructor to take an IntSize
|
| virtual bool errorOccurred() const { return m_cachedImage && m_cachedImage->errorOccurred(); } |
| virtual void setContainerSizeForRenderer(const IntSize&); |
| @@ -74,7 +72,6 @@ protected: |
| ResourcePtr<ImageResource> m_cachedImage; |
| private: |
| - static Image* nullImage(); |
| LayoutSize getImageSize(float multiplier, ImageResource::SizeType) const; |
| }; |