diff options
author | Chris Craik <ccraik@google.com> | 2012-04-05 14:22:36 -0700 |
---|---|---|
committer | Chris Craik <ccraik@google.com> | 2012-04-05 14:54:00 -0700 |
commit | 7b4a179bde698a856bed54a680438a9db3ff0566 (patch) | |
tree | 312a96159e798d027b540073bdfa682b123b4025 /Source | |
parent | d01f8866730e5ebe8609f82f95cf281432460607 (diff) | |
download | external_webkit-7b4a179bde698a856bed54a680438a9db3ff0566.zip external_webkit-7b4a179bde698a856bed54a680438a9db3ff0566.tar.gz external_webkit-7b4a179bde698a856bed54a680438a9db3ff0566.tar.bz2 |
minor cleanup
Change-Id: Ib873df1bb3e7a76a5a34acc89e4deff217e698e0
Diffstat (limited to 'Source')
6 files changed, 7 insertions, 25 deletions
diff --git a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp index d62f88b..be9f458 100644 --- a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp @@ -296,11 +296,10 @@ void GraphicsLayerAndroid::setPosition(const FloatPoint& point) GraphicsLayer::setPosition(point); -#ifdef LAYER_DEBUG_2 ALOGV("(%x) setPosition(%.2f,%.2f) pos(%.2f, %.2f) anchor(%.2f,%.2f) size(%.2f, %.2f)", this, point.x(), point.y(), m_position.x(), m_position.y(), m_anchorPoint.x(), m_anchorPoint.y(), m_size.width(), m_size.height()); -#endif + m_contentLayer->setPosition(point.x(), point.y()); askForSync(); } diff --git a/Source/WebCore/platform/graphics/android/TextureOwner.h b/Source/WebCore/platform/graphics/android/TextureOwner.h index 58ddca2..b12d8b7 100644 --- a/Source/WebCore/platform/graphics/android/TextureOwner.h +++ b/Source/WebCore/platform/graphics/android/TextureOwner.h @@ -38,7 +38,6 @@ class TextureOwner { public: virtual ~TextureOwner() { } virtual bool removeTexture(TileTexture* texture) = 0; - virtual bool samePageAs(Layer* root) { return false; } virtual bool isRepaintPending() = 0; virtual unsigned long long drawCount() = 0; }; diff --git a/Source/WebCore/platform/graphics/android/Tile.cpp b/Source/WebCore/platform/graphics/android/Tile.cpp index 1612337..0898ca2 100644 --- a/Source/WebCore/platform/graphics/android/Tile.cpp +++ b/Source/WebCore/platform/graphics/android/Tile.cpp @@ -56,7 +56,6 @@ Tile::Tile(bool isLayerTile) , m_dirty(true) , m_repaintPending(false) , m_fullRepaint(true) - , m_isTexturePainted(false) , m_isLayerTile(isLayerTile) , m_drawCount(0) , m_state(Unpainted) @@ -123,8 +122,8 @@ void Tile::reserveTexture() bool Tile::removeTexture(TileTexture* texture) { - ALOGV("%p removeTexture %p, back %p front %p... page %p", - this, texture, m_backTexture, m_frontTexture, m_page); + ALOGV("%p removeTexture %p, back %p front %p", + this, texture, m_backTexture, m_frontTexture); // We update atomically, so paintBitmap() can see the correct value android::AutoMutex lock(m_atomicSync); if (m_frontTexture == texture) { @@ -181,8 +180,8 @@ void Tile::markAsDirty(const SkRegion& dirtyArea) } else if (m_state != Unpainted) { // TODO: fix it so that they can paint while deferring the markAsDirty // call (or block updates) - ALOGV("Warning: tried to mark tile %p at %d, %d islayertile %d as dirty, state %d, page %p", - this, m_x, m_y, isLayerTile(), m_state, m_page); + ALOGV("Warning: tried to mark tile %p at %d, %d islayertile %d as dirty, state %d", + this, m_x, m_y, isLayerTile(), m_state); // prefetch tiles can be marked dirty while in the process of painting, // due to not using an update lock. force them to fail validate step. @@ -219,14 +218,6 @@ bool Tile::drawGL(float opacity, const SkRect& rect, float scale, if (!m_frontTexture) return false; - // Early return if set to un-usable in purpose! - m_atomicSync.lock(); - bool isTexturePainted = m_isTexturePainted; - m_atomicSync.unlock(); - - if (!isTexturePainted) - return false; - m_frontTexture->drawGL(isLayerTile(), rect, opacity, transform); return true; } @@ -400,8 +391,6 @@ void Tile::paintBitmap(TilePainter* painter) m_atomicSync.lock(); if (texture == m_backTexture) { - m_isTexturePainted = true; - // set the fullrepaint flags m_fullRepaint = false; diff --git a/Source/WebCore/platform/graphics/android/Tile.h b/Source/WebCore/platform/graphics/android/Tile.h index 022966b..9cce2e7 100644 --- a/Source/WebCore/platform/graphics/android/Tile.h +++ b/Source/WebCore/platform/graphics/android/Tile.h @@ -160,9 +160,6 @@ private: SkRegion m_dirtyArea; bool m_fullRepaint; - // flag used to know if we have a texture that was painted at least once - bool m_isTexturePainted; - // This mutex serves two purposes. (1) It ensures that certain operations // happen atomically and (2) it makes sure those operations are synchronized // across all threads and cores. diff --git a/Source/WebCore/platform/graphics/android/TileTexture.h b/Source/WebCore/platform/graphics/android/TileTexture.h index e35f8df..f1d5f8c 100644 --- a/Source/WebCore/platform/graphics/android/TileTexture.h +++ b/Source/WebCore/platform/graphics/android/TileTexture.h @@ -84,7 +84,6 @@ public: private: TextureInfo m_ownTextureInfo; SkSize m_size; - SkBitmap::Config m_config; // Tile owning the texture, only modified by UI thread TextureOwner* m_owner; diff --git a/Source/WebCore/platform/graphics/android/TilesManager.cpp b/Source/WebCore/platform/graphics/android/TilesManager.cpp index 109dc88..e8b8cd1 100644 --- a/Source/WebCore/platform/graphics/android/TilesManager.cpp +++ b/Source/WebCore/platform/graphics/android/TilesManager.cpp @@ -239,9 +239,8 @@ void TilesManager::printTextures() x = o->x(); y = o->y(); } - ALOGV("[%d] texture %x owner: %x (%d, %d) page: %x scale: %.2f", - i, texture, - o, x, y, o ? o->page() : 0, o ? o->scale() : 0); + ALOGV("[%d] texture %x owner: %x (%d, %d) scale: %.2f", + i, texture, o, x, y, o ? o->scale() : 0); } ALOGV("------"); #endif // DEBUG |