diff options
| author | George Mount <mount@google.com> | 2012-05-07 07:29:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-07 07:29:14 -0700 |
| commit | 5331af464fa0f4a08cbfe84f1de2ebab0038f2c1 (patch) | |
| tree | 0a45d464a7566987dfa197cd3238a33114f81b21 /Source/WebCore/platform/graphics/android/rendering | |
| parent | e712b54e831d077c789984b8206f64d81dbceaa2 (diff) | |
| parent | 0e43fd01178d539d44a5dfade3bf15aa6efbe02a (diff) | |
| download | external_webkit-5331af464fa0f4a08cbfe84f1de2ebab0038f2c1.zip external_webkit-5331af464fa0f4a08cbfe84f1de2ebab0038f2c1.tar.gz external_webkit-5331af464fa0f4a08cbfe84f1de2ebab0038f2c1.tar.bz2 | |
Merge "Ensure updateGLPositionsAndScale is called from updateLayerPosition." into jb-dev
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp | 10 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.h | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp index 0bdbf38..ef91f04 100644 --- a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp @@ -33,7 +33,7 @@ #include "BaseLayerAndroid.h" #include "ClassTracker.h" #include "GLWebViewState.h" -#include "LayerAndroid.h" +#include "BaseLayerAndroid.h" #include "Surface.h" #include "ScrollableLayerAndroid.h" #include "TilesManager.h" @@ -44,7 +44,7 @@ namespace WebCore { // TILED PAINTING / SURFACES // //////////////////////////////////////////////////////////////////////////////// -SurfaceCollection::SurfaceCollection(LayerAndroid* layer) +SurfaceCollection::SurfaceCollection(BaseLayerAndroid* layer) : m_compositedRoot(layer) { // layer must be non-null. @@ -233,11 +233,7 @@ void SurfaceCollection::updateScrollableLayer(int layerId, int x, int y) void SurfaceCollection::updateLayerPositions(const SkRect& visibleContentRect) { - TransformationMatrix ident; - m_compositedRoot->updateLayerPositions(visibleContentRect); - FloatRect clip(0, 0, 1e10, 1e10); - m_compositedRoot->updateGLPositionsAndScale( - ident, clip, 1, m_compositedRoot->state()->scale()); + m_compositedRoot->updatePositionsRecursive(visibleContentRect); #ifdef DEBUG m_compositedRoot->showLayer(0); diff --git a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.h b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.h index 5cfd943..dc5fec4 100644 --- a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.h +++ b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.h @@ -37,14 +37,14 @@ class SkRegion; namespace WebCore { -class LayerAndroid; +class BaseLayerAndroid; class Surface; class TexturesResult; class SurfaceCollection : public SkRefCnt { // TODO: investigate webkit threadsafe ref counting public: - SurfaceCollection(LayerAndroid* compositedRoot); + SurfaceCollection(BaseLayerAndroid* compositedRoot); virtual ~SurfaceCollection(); // Tiled painting methods (executed on groups) @@ -68,7 +68,7 @@ public: private: void updateLayerPositions(const SkRect& visibleContentRect); - LayerAndroid* m_compositedRoot; + BaseLayerAndroid* m_compositedRoot; WTF::Vector<Surface*> m_surfaces; }; |