diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2011-04-20 10:24:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-20 10:24:41 -0700 |
| commit | 68525b6c8b955f100f248a771d578476395a9ca3 (patch) | |
| tree | c1b1f9d98d7f290ab740d84edeb899a7c6b97e7c | |
| parent | bc668d345f52dd85024415849dc446b311c27f67 (diff) | |
| parent | 8b8e0317b9dc035ae96cba7eb3a10dfba3c0c172 (diff) | |
| download | external_webkit-68525b6c8b955f100f248a771d578476395a9ca3.zip external_webkit-68525b6c8b955f100f248a771d578476395a9ca3.tar.gz external_webkit-68525b6c8b955f100f248a771d578476395a9ca3.tar.bz2 | |
am 8b8e0317: am e448c08e: am 8804f084: Fix for clipped layers
* commit '8b8e0317b9dc035ae96cba7eb3a10dfba3c0c172':
Fix for clipped layers
| -rw-r--r-- | WebCore/platform/graphics/android/ShaderProgram.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/ShaderProgram.cpp b/WebCore/platform/graphics/android/ShaderProgram.cpp index efa53ae..74328a1 100644 --- a/WebCore/platform/graphics/android/ShaderProgram.cpp +++ b/WebCore/platform/graphics/android/ShaderProgram.cpp @@ -259,17 +259,23 @@ void ShaderProgram::setViewRect(const IntRect& viewRect) // content coordinates in screen coordinates. TransformationMatrix translate; translate.translate(1.0, 1.0); + + TransformationMatrix screenTranslate; + screenTranslate.translate(-viewRect.x(), -viewRect.y()); + TransformationMatrix scale; scale.scale3d(m_viewRect.width() * 0.5f, m_viewRect.height() * 0.5f, 1); m_documentToScreenMatrix = m_projectionMatrix; m_documentToScreenMatrix.multiply(translate); m_documentToScreenMatrix.multiply(scale); + m_documentToScreenMatrix.multiply(screenTranslate); m_documentToInvScreenMatrix = m_projectionMatrix; translate.scale3d(1, -1, 1); m_documentToInvScreenMatrix.multiply(translate); m_documentToInvScreenMatrix.multiply(scale); + m_documentToScreenMatrix.multiply(screenTranslate); } // This function transform a clip rect extracted from the current layer |