diff options
| author | Steve Block <steveblock@google.com> | 2011-05-19 11:11:13 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-25 15:27:18 +0100 |
| commit | f68e15471b3701aa588af98e9a0308b202381151 (patch) | |
| tree | f9bcd31e811c5c32811242e26efbfd6c3c2bd5d9 /Source/WebCore/platform/graphics/android/LayerAndroid.cpp | |
| parent | fa3930915cc4aeb95cd6d07f8ad0ae48e83f735a (diff) | |
| download | external_webkit-f68e15471b3701aa588af98e9a0308b202381151.zip external_webkit-f68e15471b3701aa588af98e9a0308b202381151.tar.gz external_webkit-f68e15471b3701aa588af98e9a0308b202381151.tar.bz2 | |
Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed
See http://trac.webkit.org/changeset/76537
Change-Id: I543c68101d4ee83d190f643e54e4f3fec1fdf238
Diffstat (limited to 'Source/WebCore/platform/graphics/android/LayerAndroid.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/LayerAndroid.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/LayerAndroid.cpp b/Source/WebCore/platform/graphics/android/LayerAndroid.cpp index 95ccedc..115a044 100644 --- a/Source/WebCore/platform/graphics/android/LayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/LayerAndroid.cpp @@ -600,7 +600,7 @@ void LayerAndroid::updateGLPositions(const TransformationMatrix& parentMatrix, localMatrix.translate3d(originX + position.x(), originY + position.y(), anchorPointZ()); - localMatrix.multLeft(m_transform); + localMatrix.multiply(m_transform); localMatrix.translate3d(-originX, -originY, -anchorPointZ()); @@ -648,7 +648,7 @@ void LayerAndroid::updateGLPositions(const TransformationMatrix& parentMatrix, if (!m_childrenTransform.isIdentity()) { localMatrix.translate(getSize().width() * 0.5f, getSize().height() * 0.5f); - localMatrix.multLeft(m_childrenTransform); + localMatrix.multiply(m_childrenTransform); localMatrix.translate(-getSize().width() * 0.5f, -getSize().height() * 0.5f); } for (int i = 0; i < count; i++) |