diff options
| author | Chris Craik <ccraik@google.com> | 2011-10-17 11:30:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-17 11:30:37 -0700 |
| commit | 54a414c7496fb9fc820a161e5199f0a22d806b95 (patch) | |
| tree | c8b7d16f3b761c7db45055fecccc7580a41a7c1b /Source | |
| parent | 82bf82b7b5fb3c8c2bef17e763a85f55348b8811 (diff) | |
| parent | 92738f1e982e39a6098acf39fcb5927502ec6b4c (diff) | |
| download | external_webkit-54a414c7496fb9fc820a161e5199f0a22d806b95.zip external_webkit-54a414c7496fb9fc820a161e5199f0a22d806b95.tar.gz external_webkit-54a414c7496fb9fc820a161e5199f0a22d806b95.tar.bz2 | |
am 92738f1e: Merge "Fix layer initialization" into ics-mr0
* commit '92738f1e982e39a6098acf39fcb5927502ec6b4c':
Fix layer initialization
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/PaintedSurface.cpp | 16 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/android/PaintedSurface.h | 14 |
2 files changed, 17 insertions, 13 deletions
diff --git a/Source/WebCore/platform/graphics/android/PaintedSurface.cpp b/Source/WebCore/platform/graphics/android/PaintedSurface.cpp index 1eb51c7..d48c116 100644 --- a/Source/WebCore/platform/graphics/android/PaintedSurface.cpp +++ b/Source/WebCore/platform/graphics/android/PaintedSurface.cpp @@ -53,6 +53,22 @@ namespace WebCore { +PaintedSurface::PaintedSurface(LayerAndroid* layer) + : m_layer(layer) + , m_tiledTexture(0) + , m_scale(0) + , m_pictureUsed(0) +{ + TilesManager::instance()->addPaintedSurface(this); + SkSafeRef(m_layer); +#ifdef DEBUG_COUNT + ClassTracker::instance()->increment("PaintedSurface"); +#endif + m_tiledTexture = new TiledTexture(this); + if (layer && layer->picture()) + m_updateManager.updatePicture(layer->picture()); +} + PaintedSurface::~PaintedSurface() { XLOG("dtor of %x m_layer: %x", this, m_layer); diff --git a/Source/WebCore/platform/graphics/android/PaintedSurface.h b/Source/WebCore/platform/graphics/android/PaintedSurface.h index cda5960..5df76db 100644 --- a/Source/WebCore/platform/graphics/android/PaintedSurface.h +++ b/Source/WebCore/platform/graphics/android/PaintedSurface.h @@ -47,19 +47,7 @@ class UpdateManager; class PaintedSurface : public SkRefCnt { public: - PaintedSurface(LayerAndroid* layer) - : m_layer(layer) - , m_tiledTexture(0) - , m_scale(0) - , m_pictureUsed(0) - { - TilesManager::instance()->addPaintedSurface(this); - SkSafeRef(m_layer); -#ifdef DEBUG_COUNT - ClassTracker::instance()->increment("PaintedSurface"); -#endif - m_tiledTexture = new TiledTexture(this); - } + PaintedSurface(LayerAndroid* layer); virtual ~PaintedSurface(); // PaintedSurface methods |