diff options
| author | Russell Brenner <russellbrenner@google.com> | 2011-03-18 16:53:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-18 16:53:58 -0700 |
| commit | 462195e725e3764bb2bb429d08987a65d84a445f (patch) | |
| tree | b89f4d0d611161145d118482185e8ee61ca774e4 /WebKit/android | |
| parent | 2609c87ecdaa27dce888df348f6d9e2e6e9af612 (diff) | |
| parent | b1444e524d3f5e888d1ae3300b2658321fc56349 (diff) | |
| download | external_webkit-462195e725e3764bb2bb429d08987a65d84a445f.zip external_webkit-462195e725e3764bb2bb429d08987a65d84a445f.tar.gz external_webkit-462195e725e3764bb2bb429d08987a65d84a445f.tar.bz2 | |
am b1444e52: Fix for FBO offset when drawing with alpha
* commit 'b1444e524d3f5e888d1ae3300b2658321fc56349':
Fix for FBO offset when drawing with alpha
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index ea311ae..3a156de 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -1490,9 +1490,14 @@ class GLDrawFunctor : Functor { WebCore::IntRect inval; int titlebarHeight = webViewRect.height() - viewRect.height(); - bool retVal = (*wvInstance.*funcPtr)(viewRect, &inval, scale, extras); + + uirenderer::DrawGlInfo* info = reinterpret_cast<uirenderer::DrawGlInfo*>(data); + WebCore::IntRect localViewRect = viewRect; + if (info->isLayer) + localViewRect.move(-1 * localViewRect.x(), -1 * localViewRect.y()); + + bool retVal = (*wvInstance.*funcPtr)(localViewRect, &inval, scale, extras); if (retVal) { - uirenderer::DrawGlInfo* info = reinterpret_cast<uirenderer::DrawGlInfo*>(data); IntRect finalInval; if (inval.isEmpty()) { finalInval = webViewRect; |