diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-01-12 16:56:10 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-12 16:56:10 -0800 |
| commit | 3c1f14ff4e1f4842f74cb5e2b4df00c0d5354cbc (patch) | |
| tree | dfba5144cca839386d2de0b8fbb4e663b46a0f7b | |
| parent | 06a3ec2bf5db7778b908df12f39d831bfc152be0 (diff) | |
| parent | 0bbbf381b95006dd104daccf32b0f7e9b85d2414 (diff) | |
| download | external_webkit-3c1f14ff4e1f4842f74cb5e2b4df00c0d5354cbc.zip external_webkit-3c1f14ff4e1f4842f74cb5e2b4df00c0d5354cbc.tar.gz external_webkit-3c1f14ff4e1f4842f74cb5e2b4df00c0d5354cbc.tar.bz2 | |
Merge "The fixed element layer should not inherit the parent matrix" into honeycomb
| -rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.cpp | 4 |
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()); |