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

diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
index ef9dd10..273c478 100644 (file)
--- 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);