diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2011-04-07 17:27:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-07 17:27:55 -0700 |
| commit | d4d5a9234bd56541aaea8fba0d0b760a1f116084 (patch) | |
| tree | a37710940897be2eafe1af6294960ed6778f6f5f /WebCore/platform/graphics/android/BaseLayerAndroid.cpp | |
| parent | 25beedece7f56619527dc0bd3cb788b0bd2433a6 (diff) | |
| parent | f1a6509bb189c2240a8723c2a96d677d98d8b142 (diff) | |
| download | external_webkit-d4d5a9234bd56541aaea8fba0d0b760a1f116084.zip external_webkit-d4d5a9234bd56541aaea8fba0d0b760a1f116084.tar.gz external_webkit-d4d5a9234bd56541aaea8fba0d0b760a1f116084.tar.bz2 | |
am f1a6509b: am b6ac9086: Merge "Fix for bug:4183801" into honeycomb-mr1
* commit 'f1a6509bb189c2240a8723c2a96d677d98d8b142':
Fix for bug:4183801
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 cf8b6fa..c61a09a 100644 --- a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp @@ -264,7 +264,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) @@ -291,6 +292,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(); @@ -359,11 +363,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); } |