diff options
author | Chris Craik <ccraik@google.com> | 2012-04-10 16:41:51 -0700 |
---|---|---|
committer | Chris Craik <ccraik@google.com> | 2012-04-10 16:44:42 -0700 |
commit | ceac2217dad840ce8d690923219b51787083bb44 (patch) | |
tree | b35543ee8a4ee883fb41e3f285219ed24ad20b79 /Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp | |
parent | 98e8504d9f510b8cbaca1b0144efea3a4d1a8eec (diff) | |
download | external_webkit-ceac2217dad840ce8d690923219b51787083bb44.zip external_webkit-ceac2217dad840ce8d690923219b51787083bb44.tar.gz external_webkit-ceac2217dad840ce8d690923219b51787083bb44.tar.bz2 |
Treat image texture TileGrids as non-base surfaces
Was ignoring transform calculation
bug:6317028
Change-Id: I9d5d491ef9eb853535e18a8ad10ab387d77e2d80
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp')
-rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp b/Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp index b2ead6a..9890331 100644 --- a/Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp @@ -174,8 +174,8 @@ bool ImageTexture::prepareGL(GLWebViewState* state) return false; if (!m_texture && m_picture) { - bool isLayerTile = true; - m_texture = new TileGrid(isLayerTile); + bool isBaseSurface = false; + m_texture = new TileGrid(isBaseSurface); SkRegion region; region.setRect(0, 0, m_image->width(), m_image->height()); m_texture->markAsDirty(region); @@ -198,8 +198,6 @@ const TransformationMatrix* ImageTexture::transform() if (!m_layer) return 0; - FloatPoint p(0, 0); - p = m_layer->drawTransform()->mapPoint(p); IntRect layerArea = m_layer->unclippedArea(); float scaleW = static_cast<float>(layerArea.width()) / static_cast<float>(m_image->width()); float scaleH = static_cast<float>(layerArea.height()) / static_cast<float>(m_image->height()); |