diff options
| author | Chris Craik <ccraik@google.com> | 2011-10-18 17:49:58 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2011-10-19 11:21:27 -0700 |
| commit | 1fa411c75dc305a99ec524101550a7f297402362 (patch) | |
| tree | 0b9fe121555388089353ad4026b8e6d0df514173 /Source/WebCore/platform/graphics/android/GLWebViewState.h | |
| parent | 8cc0fa17a42ae1dec75fe8ab00d5baa75e46499e (diff) | |
| download | external_webkit-1fa411c75dc305a99ec524101550a7f297402362.zip external_webkit-1fa411c75dc305a99ec524101550a7f297402362.tar.gz external_webkit-1fa411c75dc305a99ec524101550a7f297402362.tar.bz2 | |
fix layer updates dropping invals
bug:5473272
Layer inval regions were being dropped, since calling setBaseLayer multiple
times in between drawGL() calls wouldn't call swapLayersTextures() on a layer
tree, and the invals in it were lost.
Change-Id: I36ebd419151613161a9a4fee858b9e97e83e61fd
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.h b/Source/WebCore/platform/graphics/android/GLWebViewState.h index 23d7de2..2f7e16d 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.h +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.h @@ -219,7 +219,6 @@ public: void resetFrameworkInval(); void addDirtyArea(const IntRect& rect); void resetLayersDirtyArea(); - LayerAndroid* previouslyUsedRoot() { return m_previouslyUsedRoot; } bool goingDown() { return m_goingDown; } bool goingLeft() { return m_goingLeft; } @@ -242,9 +241,9 @@ private: SkIRect m_futureViewportTileBounds; SkIRect m_preZoomBounds; android::Mutex m_baseLayerLock; - BaseLayerAndroid* m_baseLayer; + BaseLayerAndroid* m_paintingBaseLayer; BaseLayerAndroid* m_currentBaseLayer; - LayerAndroid* m_previouslyUsedRoot; + LayerAndroid* m_currentBaseLayerRoot; unsigned int m_currentPictureCounter; bool m_usePageA; |