diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/rendering/RenderImageResourceStyleImage.h | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/rendering/RenderImageResourceStyleImage.h')
| -rw-r--r-- | Source/WebCore/rendering/RenderImageResourceStyleImage.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/rendering/RenderImageResourceStyleImage.h b/Source/WebCore/rendering/RenderImageResourceStyleImage.h index d91aaa8..278a82c 100644 --- a/Source/WebCore/rendering/RenderImageResourceStyleImage.h +++ b/Source/WebCore/rendering/RenderImageResourceStyleImage.h @@ -46,7 +46,7 @@ public: virtual void shutdown(); virtual bool hasImage() const { return true; } - virtual Image* image(int width = 0, int height = 0) { return m_styleImage->image(m_renderer, IntSize(width, height)); } + virtual PassRefPtr<Image> image(int width = 0, int height = 0) const { return m_styleImage->image(m_renderer, IntSize(width, height)); } virtual bool errorOccurred() const { return m_styleImage->errorOccurred(); } virtual void setImageContainerSize(const IntSize& size) const { m_styleImage->setImageContainerSize(size); } |