diff options
| author | Nicolas Roard <nicolas@android.com> | 2011-01-10 14:38:07 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-10 14:38:07 -0800 |
| commit | 50e1e6d933249dbc406460b14783d4e7d65fdb9e (patch) | |
| tree | e35e64d3dc51d2288dd03e334a6a564151ba699a /WebCore/platform | |
| parent | 477f2da81667d4c0ba02df53a357efede4d8dd1a (diff) | |
| parent | 07b4a57368060475e0276ca4df5f908a91056d40 (diff) | |
| download | external_webkit-50e1e6d933249dbc406460b14783d4e7d65fdb9e.zip external_webkit-50e1e6d933249dbc406460b14783d4e7d65fdb9e.tar.gz external_webkit-50e1e6d933249dbc406460b14783d4e7d65fdb9e.tar.bz2 | |
Merge "Change the transition from cross-fading to simple fading of only one of the TiledPage." into honeycomb
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/android/BaseLayerAndroid.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp index 5a26868..42735fa 100644 --- a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp @@ -189,11 +189,12 @@ bool BaseLayerAndroid::drawBasePictureInGL(SkRect& viewport, float scale) if (m_glWebViewState->scaleRequestState() == GLWebViewState::kReceivedNewScale) { TiledPage* nextTiledPage = m_glWebViewState->backPage(); double transitionTime = m_glWebViewState->transitionTime(currentTime); - transparency = m_glWebViewState->transparency(currentTime); float newTilesTransparency = 1; if (scale < m_glWebViewState->currentScale()) - newTilesTransparency = 1 - transparency; + newTilesTransparency = 1 - m_glWebViewState->transparency(currentTime); + else + transparency = m_glWebViewState->transparency(currentTime); nextTiledPage->draw(newTilesTransparency, viewport, viewportTileBounds); |