diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2011-04-19 19:27:23 -0700 |
|---|---|---|
| committer | Nicolas Roard <nicolasroard@google.com> | 2011-04-19 19:47:50 -0700 |
| commit | 8804f0848d7d3165c86cbb529e3b51cffdb4b56b (patch) | |
| tree | b7425aeed2d034ec9ddff8c492a016ab04413559 /WebCore/platform/graphics | |
| parent | 1deed5ff76dad5d0783c0e07639338f1d6b08a67 (diff) | |
| download | external_webkit-8804f0848d7d3165c86cbb529e3b51cffdb4b56b.zip external_webkit-8804f0848d7d3165c86cbb529e3b51cffdb4b56b.tar.gz external_webkit-8804f0848d7d3165c86cbb529e3b51cffdb4b56b.tar.bz2 | |
Fix for clipped layers
bug:4303702
Change-Id: I31f8df1e24206ef6389f814d421a3fb84b1dc00f
Diffstat (limited to 'WebCore/platform/graphics')
| -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 |