diff options
| author | Chris Craik <ccraik@google.com> | 2012-12-03 16:18:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-03 16:18:17 -0800 |
| commit | 09e90f537aaeec9a49c9d199826d290671709d59 (patch) | |
| tree | 503bb2ba752c0e8d7a866f953c3e1ef96c8e5596 | |
| parent | 76626e3b0e4da3b0b8dbad173e94717280dd7df0 (diff) | |
| parent | e02247f4c53e1df4cac3a7b265ffb4307cca3650 (diff) | |
| download | webkit-09e90f537aaeec9a49c9d199826d290671709d59.tar.gz | |
am e02247f4: Only signal collection swap on true swap
* commit 'e02247f4c53e1df4cac3a7b265ffb4307cca3650':
Only signal collection swap on true swap
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp index 991417653..f3ff0cffa 100644 --- a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp @@ -304,10 +304,6 @@ int SurfaceCollectionManager::drawGL(double currentTime, IntRect& viewRect, if (m_drawingCollection) { bool drawingReady = didCollectionSwap || m_drawingCollection->isReady(); - // call the page swap callback if registration happened without more collections enqueued - if (collectionsSwappedPtr && drawingReady && !m_paintingCollection) - *collectionsSwappedPtr = true; - if (didCollectionSwap || m_fastSwapMode || (drawingReady && !m_paintingCollection)) m_drawingCollection->swapTiles(); |