diff options
| author | Chris Craik <ccraik@google.com> | 2011-10-14 15:39:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-14 15:39:45 -0700 |
| commit | 92738f1e982e39a6098acf39fcb5927502ec6b4c (patch) | |
| tree | afbf41ecaeb512b96053140bdb5dbf5d177e5a5b /Source | |
| parent | 7eb15a6b569f79bfddb934615640fd6275218377 (diff) | |
| parent | 21e578ad4c9bee5b63696a3af8bb3c3c8d4e817b (diff) | |
| download | external_webkit-92738f1e982e39a6098acf39fcb5927502ec6b4c.zip external_webkit-92738f1e982e39a6098acf39fcb5927502ec6b4c.tar.gz external_webkit-92738f1e982e39a6098acf39fcb5927502ec6b4c.tar.bz2 | |
Merge "Fix layer initialization" into ics-mr0
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 |