From 8804f0848d7d3165c86cbb529e3b51cffdb4b56b Mon Sep 17 00:00:00 2001 From: Nicolas Roard Date: Tue, 19 Apr 2011 19:27:23 -0700 Subject: Fix for clipped layers bug:4303702 Change-Id: I31f8df1e24206ef6389f814d421a3fb84b1dc00f --- WebCore/platform/graphics/android/ShaderProgram.cpp | 6 ++++++ 1 file changed, 6 insertions(+) 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 -- cgit v1.1