diff options
author | Nicolas Roard <nicolasroard@google.com> | 2011-11-23 14:23:24 -0800 |
---|---|---|
committer | Nicolas Roard <nicolasroard@google.com> | 2011-11-30 18:33:21 -0800 |
commit | 54e75f0875a8376c1119b019431921bc58295b79 (patch) | |
tree | c0863d915fdfc7651c93e679f10638c0164e6505 /Source/WebCore/platform/graphics/android/LayerAndroid.h | |
parent | ed03bc998bd1c1a64a99ee631f3bc31466590bf1 (diff) | |
download | external_webkit-54e75f0875a8376c1119b019431921bc58295b79.zip external_webkit-54e75f0875a8376c1119b019431921bc58295b79.tar.gz external_webkit-54e75f0875a8376c1119b019431921bc58295b79.tar.bz2 |
Fix image layer codepath
- asynchronous loading
- support for tiled content using TiledTexture
- fix repaint/duplication bugs
- share same textures as layers
- disambiguate between images by computing a CRC code
- added better debugging in TilesManager/ClassTracker to track
memory usage
bug:5661120 bug:5572134 bug:5521718
Change-Id: Id422fb991d6233bbe4dc6e5c3c7409468b7dca98
Diffstat (limited to 'Source/WebCore/platform/graphics/android/LayerAndroid.h')
-rw-r--r-- | Source/WebCore/platform/graphics/android/LayerAndroid.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/WebCore/platform/graphics/android/LayerAndroid.h b/Source/WebCore/platform/graphics/android/LayerAndroid.h index 8b82b27..cc96fae 100644 --- a/Source/WebCore/platform/graphics/android/LayerAndroid.h +++ b/Source/WebCore/platform/graphics/android/LayerAndroid.h @@ -260,7 +260,7 @@ public: /** This sets a content image -- calling it means we will use the image directly when drawing the layer instead of using the content painted by WebKit. - Images are handled in TilesManager, as they can be shared + Images are handled in ImagesManager, as they can be shared between layers. */ void setContentsImage(SkBitmapRef* img); @@ -298,8 +298,6 @@ public: bool updateWithTree(LayerAndroid*); virtual bool updateWithLayer(LayerAndroid*); - SkBitmapRef* imageRef() { return m_imageRef; } - ImageTexture* imageTexture() { return m_imageTexture; } int type() { return m_type; } bool hasText() { return m_hasText; } @@ -387,8 +385,7 @@ private: int m_uniqueId; PaintedSurface* m_texture; - SkBitmapRef* m_imageRef; - ImageTexture* m_imageTexture; + unsigned m_imageCRC; unsigned int m_pictureUsed; |