diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-12 22:30:03 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-02-12 22:30:03 -0800 |
| commit | 016661c890caf59f18cee0113582a099aec0c1fc (patch) | |
| tree | b4523db77c903ede2903e7d5b773f584de037fe8 /Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp | |
| parent | 970019d07554a94ff4ddda8a592624005fe0c4c4 (diff) | |
| parent | e02247f4c53e1df4cac3a7b265ffb4307cca3650 (diff) | |
| download | external_webkit-016661c890caf59f18cee0113582a099aec0c1fc.zip external_webkit-016661c890caf59f18cee0113582a099aec0c1fc.tar.gz external_webkit-016661c890caf59f18cee0113582a099aec0c1fc.tar.bz2 | |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/external/webkit into 1.1
Android 4.2.2 release 1
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp')
| -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 9914176..f3ff0cf 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(); |