diff options
| author | Chris Craik <ccraik@google.com> | 2011-12-07 17:08:39 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-07 17:08:39 -0800 |
| commit | a97d0a05820d9b82f7c51c5581f1dd92b48a37d6 (patch) | |
| tree | b9195a63be137581e2e00f205b6243e9cd25f41d | |
| parent | 33378600160405611fcfcf3edcc8763cbe1f945b (diff) | |
| parent | 84117244fe33b7de6e83c691f4f4bc7f0db0f32b (diff) | |
| download | external_webkit-a97d0a05820d9b82f7c51c5581f1dd92b48a37d6.zip external_webkit-a97d0a05820d9b82f7c51c5581f1dd92b48a37d6.tar.gz external_webkit-a97d0a05820d9b82f7c51c5581f1dd92b48a37d6.tar.bz2 | |
am 84117244: Merge "fix viewport lagging a drawGL call behind" into ics-mr1
* commit '84117244fe33b7de6e83c691f4f4bc7f0db0f32b':
fix viewport lagging a drawGL call behind
| -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); |