diff options
author | Chris Craik <ccraik@google.com> | 2012-03-02 14:53:26 -0800 |
---|---|---|
committer | Chris Craik <ccraik@google.com> | 2012-03-02 15:42:06 -0800 |
commit | e6a08abad427194f5eb95ba75b77211fa8498997 (patch) | |
tree | 4a9216322806398f961b5edc1f18ebb8181bd39a /Source/WebCore/platform/graphics/android/ImageTexture.h | |
parent | a5814187e4b55a2682707ab4d69cdb586c0a9210 (diff) | |
download | external_webkit-e6a08abad427194f5eb95ba75b77211fa8498997.zip external_webkit-e6a08abad427194f5eb95ba75b77211fa8498997.tar.gz external_webkit-e6a08abad427194f5eb95ba75b77211fa8498997.tar.bz2 |
Pass transform matrix in draw instead of through painter
bug:6105013
Since BaseTile's painter pointer may be stale, pass transform through draw
rename transparency->opacity where needed
added const for drawing path rects
Change-Id: Ie08cef63c656e95887a3230af18b5b6a4513c10d
Diffstat (limited to 'Source/WebCore/platform/graphics/android/ImageTexture.h')
-rw-r--r-- | Source/WebCore/platform/graphics/android/ImageTexture.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/ImageTexture.h b/Source/WebCore/platform/graphics/android/ImageTexture.h index 9c2c79c..f2f99dd 100644 --- a/Source/WebCore/platform/graphics/android/ImageTexture.h +++ b/Source/WebCore/platform/graphics/android/ImageTexture.h @@ -86,7 +86,6 @@ public: // methods used by TiledTexture virtual bool paint(BaseTile* tile, SkCanvas* canvas, unsigned int* pictureUsed); - virtual const TransformationMatrix* transform(); virtual float opacity(); int nbTextures(); @@ -94,6 +93,7 @@ public: virtual SurfaceType type() { return TilePainter::Image; } private: + const TransformationMatrix* transform(); SkBitmapRef* m_imageRef; SkBitmap* m_image; |