diff options
| author | Chris Craik <ccraik@google.com> | 2011-12-07 17:11:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-07 17:11:03 -0800 |
| commit | 838d6f9b23f400bf120d078278f6348c260cbbc1 (patch) | |
| tree | 10be204b4e9e5407517dd668690ce7a09008684d /Source/WebCore/platform/graphics/android/GLWebViewState.cpp | |
| parent | 5857949e50a7f0ace43ba5d349fc4aacf0dd1847 (diff) | |
| parent | 84117244fe33b7de6e83c691f4f4bc7f0db0f32b (diff) | |
| download | external_webkit-838d6f9b23f400bf120d078278f6348c260cbbc1.zip external_webkit-838d6f9b23f400bf120d078278f6348c260cbbc1.tar.gz external_webkit-838d6f9b23f400bf120d078278f6348c260cbbc1.tar.bz2 | |
am 84117244: Merge "fix viewport lagging a drawGL call behind" into ics-mr1
* commit '84117244fe33b7de6e83c691f4f4bc7f0db0f32b':
fix viewport lagging a drawGL call behind
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.cpp')
| -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 0aa876f..cf49b9e 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -350,8 +350,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); |