summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/platform/graphics/android/BaseLayerAndroid.cpp')
-rw-r--r--WebCore/platform/graphics/android/BaseLayerAndroid.cpp11
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);
}