summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android/LayerAndroid.cpp
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-01-12 16:31:51 -0800
committerTeng-Hui Zhu <ztenghui@google.com>2011-01-12 16:38:56 -0800
commit0bbbf381b95006dd104daccf32b0f7e9b85d2414 (patch)
treef74da1864bffda68272c09309a0cebb631f08bf2 /WebCore/platform/graphics/android/LayerAndroid.cpp
parent1f1f3dc8ac5408699c1d58cb43bef13ad1a60f0c (diff)
downloadexternal_webkit-0bbbf381b95006dd104daccf32b0f7e9b85d2414.zip
external_webkit-0bbbf381b95006dd104daccf32b0f7e9b85d2414.tar.gz
external_webkit-0bbbf381b95006dd104daccf32b0f7e9b85d2414.tar.bz2
The fixed element layer should not inherit the parent matrix
The fixed element layer should start from an identity matrix. And apply local transformation. Change-Id: I9243f8c496bdbd5ee66e18b23715f9935e5574b6 b:3344290
Diffstat (limited to 'WebCore/platform/graphics/android/LayerAndroid.cpp')
-rw-r--r--WebCore/platform/graphics/android/LayerAndroid.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp
index 098ef53..853662f 100644
--- a/WebCore/platform/graphics/android/LayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/LayerAndroid.cpp
@@ -482,7 +482,9 @@ void LayerAndroid::updateGLPositions(const TransformationMatrix& parentMatrix,
float centerOffsetY = (0.5f - anchorPoint.y()) * layerSize.height();
float originX = anchorPoint.x() * layerSize.width();
float originY = anchorPoint.y() * layerSize.height();
- TransformationMatrix localMatrix = parentMatrix;
+ TransformationMatrix localMatrix;
+ if (!m_isFixed)
+ localMatrix = parentMatrix;
localMatrix.translate3d(originX + position.x(),
originY + position.y(),
anchorPointZ());