summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2011-12-07 16:03:07 -0800
committerChris Craik <ccraik@google.com>2011-12-07 16:03:07 -0800
commitd7baaca9b1ca9fba32347d6eb8c02ae7a2195120 (patch)
treefd5243dc3db5ad37282f975c19ff503f2c39103c /Source/WebCore/platform/graphics/android/GLWebViewState.cpp
parent1d71a5f4405639dece648eda291ab6a2aecbb968 (diff)
downloadexternal_webkit-d7baaca9b1ca9fba32347d6eb8c02ae7a2195120.zip
external_webkit-d7baaca9b1ca9fba32347d6eb8c02ae7a2195120.tar.gz
external_webkit-d7baaca9b1ca9fba32347d6eb8c02ae7a2195120.tar.bz2
fix viewport lagging a drawGL call behind
bug:5724482 bug:5660963 we were calling setViewport and setViewRect out of order, so we were clipping with the last frame's (or last webview's, if >1 were visible) projection matrix Change-Id: Ifcbfa0021cb33e3400ac9eaf64fc2235ee8afe50
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.cpp')
-rw-r--r--Source/WebCore/platform/graphics/android/GLWebViewState.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
index ef9dd10..273c478 100644
--- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
+++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
@@ -343,8 +343,8 @@ double GLWebViewState::setupDrawing(IntRect& viewRect, SkRect& visibleRect,
XLOG("Reinit shader");
shader->init();
}
- shader->setViewRect(viewRect);
shader->setViewport(visibleRect, scale);
+ shader->setViewRect(viewRect);
shader->setWebViewRect(webViewRect);
shader->setTitleBarHeight(titleBarHeight);
shader->setScreenClip(screenClip);