summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2011-09-09 11:56:55 -0700
committerChris Craik <ccraik@google.com>2011-09-11 22:08:06 -0700
commit870be3d940e9e567cf40c446b52fe6fc691378fa (patch)
treed8f7f0b71aef6f3eb5e78e07d381a87e83a7df3c /Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
parentc622298990df11240ed11cd66c8bc7671a8ec59a (diff)
downloadexternal_webkit-870be3d940e9e567cf40c446b52fe6fc691378fa.zip
external_webkit-870be3d940e9e567cf40c446b52fe6fc691378fa.tar.gz
external_webkit-870be3d940e9e567cf40c446b52fe6fc691378fa.tar.bz2
Fudge layer translation to always line up with view pixels
bug:3367478 Change-Id: I37632de8503b0f3eba0a183a156d71ea48bdba98
Diffstat (limited to 'Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp')
-rw-r--r--Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
index 54290cc..1fa69f8 100644
--- a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
@@ -266,13 +266,11 @@ bool BaseLayerAndroid::drawGL(double currentTime, LayerAndroid* compositedRoot,
compositedRoot->updateFixedLayersPositions(visibleRect);
FloatRect clip(0, 0, viewRect.width(), viewRect.height());
- compositedRoot->updateGLPositions(ident, clip, 1);
+ compositedRoot->updateGLPositionsAndScale(
+ ident, clip, 1, m_glWebViewState->zoomManager()->layersScale());
SkMatrix matrix;
matrix.setTranslate(viewRect.x(), viewRect.y());
- // get the scale factor from the zoom manager
- compositedRoot->setScale(m_glWebViewState->zoomManager()->layersScale());
-
#ifdef DEBUG
compositedRoot->showLayer(0);
XLOG("We have %d layers, %d textured",