summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2011-11-17 07:48:30 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-17 07:48:30 -0800
commita46b07e21bfb048a70a3aa8173adf7ad67c3caf8 (patch)
tree3686aa1578ee999f5e9bed36f9eb6f0d2b0d7371 /Source
parent06150b212d47bb8d3dfb0415931f27cf7d56d269 (diff)
parent8e484c2c48a30e5af7553f32312cd4d765fb3417 (diff)
downloadexternal_webkit-a46b07e21bfb048a70a3aa8173adf7ad67c3caf8.zip
external_webkit-a46b07e21bfb048a70a3aa8173adf7ad67c3caf8.tar.gz
external_webkit-a46b07e21bfb048a70a3aa8173adf7ad67c3caf8.tar.bz2
am 8e484c2c: Fix clipping issue causing the layers to disappear when IME is up
* commit '8e484c2c48a30e5af7553f32312cd4d765fb3417': Fix clipping issue causing the layers to disappear when IME is up
Diffstat (limited to 'Source')
-rw-r--r--Source/WebCore/platform/graphics/android/ShaderProgram.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/ShaderProgram.cpp b/Source/WebCore/platform/graphics/android/ShaderProgram.cpp
index 30b5c86..cc9c810 100644
--- a/Source/WebCore/platform/graphics/android/ShaderProgram.cpp
+++ b/Source/WebCore/platform/graphics/android/ShaderProgram.cpp
@@ -409,7 +409,8 @@ void ShaderProgram::setViewRect(const IntRect& viewRect)
translate.scale3d(1, -1, 1);
m_documentToInvScreenMatrix = scale * translate * m_projectionMatrix;
- m_documentViewport = m_documentToScreenMatrix.inverse().mapRect(viewRect);
+ IntRect rect(0, 0, m_webViewRect.width(), m_webViewRect.height());
+ m_documentViewport = m_documentToScreenMatrix.inverse().mapRect(rect);
}
// This function transform a clip rect extracted from the current layer