diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h b/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h index a5c1450..cc9064d 100644 --- a/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h +++ b/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h @@ -35,6 +35,7 @@ #if USE(ACCELERATED_COMPOSITING) #include "ContentLayerChromium.h" +#include "PlatformImage.h" #if PLATFORM(CG) #include <wtf/RetainPtr.h> @@ -50,13 +51,19 @@ public: static PassRefPtr<ImageLayerChromium> create(GraphicsLayerChromium* owner = 0); virtual void updateContentsIfDirty(); - virtual bool drawsContent() { return m_contents; } + virtual bool drawsContent() const { return m_contents; } void setContents(Image* image); +protected: + virtual const char* layerTypeAsString() const { return "ImageLayer"; } + private: + virtual void updateTextureIfNeeded(); + ImageLayerChromium(GraphicsLayerChromium* owner); + PlatformImage m_decodedImage; RefPtr<Image> m_contents; }; |