diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2011-04-07 17:21:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-07 17:21:50 -0700 |
| commit | b6ac908669555fedfaf5dc648367d4ad459fc53e (patch) | |
| tree | 628ed659175822ad263de786c813827a05f13b57 /WebCore/platform/graphics/android/BaseLayerAndroid.cpp | |
| parent | 63f5370e1736a4e699dd9ccd643525772d67ffef (diff) | |
| parent | be61abb47b98988ca94bd839a1e17c3267365dc9 (diff) | |
| download | external_webkit-b6ac908669555fedfaf5dc648367d4ad459fc53e.zip external_webkit-b6ac908669555fedfaf5dc648367d4ad459fc53e.tar.gz external_webkit-b6ac908669555fedfaf5dc648367d4ad459fc53e.tar.bz2 | |
Merge "Fix for bug:4183801" into honeycomb-mr1
Diffstat (limited to 'WebCore/platform/graphics/android/BaseLayerAndroid.cpp')
| -rw-r--r-- | WebCore/platform/graphics/android/BaseLayerAndroid.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp index 1786d64..c59a5a5 100644 --- a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp @@ -260,7 +260,8 @@ bool BaseLayerAndroid::drawBasePictureInGL(SkRect& viewport, float scale, double bool BaseLayerAndroid::drawGL(LayerAndroid* compositedRoot, IntRect& viewRect, SkRect& visibleRect, - float scale, SkColor color) + IntRect& webViewRect, int titleBarHeight, + IntRect& screenClip, float scale, SkColor color) { bool needsRedraw = false; #if USE(ACCELERATED_COMPOSITING) @@ -287,6 +288,9 @@ bool BaseLayerAndroid::drawGL(LayerAndroid* compositedRoot, glUniform1i(shader->textureSampler(), 0); shader->setViewRect(viewRect); shader->setViewport(visibleRect); + shader->setWebViewRect(webViewRect); + shader->setTitleBarHeight(titleBarHeight); + shader->setScreenClip(screenClip); shader->resetBlending(); double currentTime = WTF::currentTime(); @@ -355,11 +359,6 @@ bool BaseLayerAndroid::drawGL(LayerAndroid* compositedRoot, else if (!animsRunning) m_glWebViewState->resetLayersDirtyArea(); - if (animsRunning) { - m_glWebViewState->resetLayersDirtyArea(); - m_glWebViewState->resetFrameworkInval(); - } - } else { TilesManager::instance()->cleanupLayersTextures(0); } |