diff options
| author | Chris Craik <ccraik@google.com> | 2011-12-07 17:06:37 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-07 17:06:37 -0800 |
| commit | 84117244fe33b7de6e83c691f4f4bc7f0db0f32b (patch) | |
| tree | b9195a63be137581e2e00f205b6243e9cd25f41d | |
| parent | f288ebbc0f8b160082a78668df554a4ae7192e11 (diff) | |
| parent | d7baaca9b1ca9fba32347d6eb8c02ae7a2195120 (diff) | |
| download | external_webkit-84117244fe33b7de6e83c691f4f4bc7f0db0f32b.zip external_webkit-84117244fe33b7de6e83c691f4f4bc7f0db0f32b.tar.gz external_webkit-84117244fe33b7de6e83c691f4f4bc7f0db0f32b.tar.bz2 | |
Merge "fix viewport lagging a drawGL call behind" into ics-mr1
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 2 |
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); |