diff options
| author | Chris Craik <ccraik@google.com> | 2012-08-20 14:28:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-20 14:28:41 -0700 |
| commit | 3dca44542840785fe67ba613c7fb0ded50e09bb4 (patch) | |
| tree | a38a84a4e42f02e8a6d549c4b274af6327155400 | |
| parent | a3546a894a73b5cdaa068456c6a60d35646e9af0 (diff) | |
| parent | 27928248689bbdd6c1e12107345427d2ecbd9257 (diff) | |
| download | external_webkit-3dca44542840785fe67ba613c7fb0ded50e09bb4.zip external_webkit-3dca44542840785fe67ba613c7fb0ded50e09bb4.tar.gz external_webkit-3dca44542840785fe67ba613c7fb0ded50e09bb4.tar.bz2 | |
Merge "Exit fast tile swap mode immediately upon SurfaceCollection swap" into jb-mr1-dev
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp index 1270498..9914176 100644 --- a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp @@ -258,6 +258,7 @@ int SurfaceCollectionManager::drawGL(double currentTime, IntRect& viewRect, if (!TilesManager::instance()->useDoubleBuffering() || m_paintingCollection->isReady()) { ALOGV("have painting collection %p ready, swapping!", m_paintingCollection); didCollectionSwap = true; + m_fastSwapMode = false; TilesManager::instance()->incContentUpdates(); if (collectionsSwappedPtr) *collectionsSwappedPtr = true; |