diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2012-02-15 13:32:00 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-15 13:32:00 -0800 |
| commit | 3410ffc0890f04ba9ca38573ab37c309b4aff5bd (patch) | |
| tree | 19f5541e722dcc22da7783ec85ea61e1c4ca178b | |
| parent | 628a06bda2490e4c405ce3263381412423f4c735 (diff) | |
| parent | df48010675c62ef2efba8580681fabcfe3a22e43 (diff) | |
| download | external_webkit-3410ffc0890f04ba9ca38573ab37c309b4aff5bd.zip external_webkit-3410ffc0890f04ba9ca38573ab37c309b4aff5bd.tar.gz external_webkit-3410ffc0890f04ba9ca38573ab37c309b4aff5bd.tar.bz2 | |
Merge "Fix for high latency when creating a new layer"
| -rw-r--r-- | Source/WebCore/platform/graphics/android/TiledTexture.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/TiledTexture.cpp b/Source/WebCore/platform/graphics/android/TiledTexture.cpp index 3696b4a..1e8b946 100644 --- a/Source/WebCore/platform/graphics/android/TiledTexture.cpp +++ b/Source/WebCore/platform/graphics/android/TiledTexture.cpp @@ -366,6 +366,11 @@ void DualTiledTexture::prepare(GLWebViewState* state, float scale, bool repaint, if (!m_zooming) m_preZoomPrepareArea = prepareArea; + if (m_scale == -1) { + m_scale = scale; + m_futureScale = scale; + } + if (m_futureScale != scale) { m_futureScale = scale; m_zoomUpdateTime = WTF::currentTime() + DualTiledTexture::s_zoomUpdateDelay; |