diff options
author | Nicolas Roard <nicolas@android.com> | 2010-02-24 18:09:11 +0000 |
---|---|---|
committer | Nicolas Roard <nicolas@android.com> | 2010-02-24 19:21:17 +0000 |
commit | 4175d59b46f96005f0c64978b1a94e3fe60f1e8e (patch) | |
tree | 9efdec20c3a8c4bfedbe8f0f470dc618f4d578cd /WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | |
parent | 08d3adc3529e10dc9843cdfee20b4937f38301bd (diff) | |
download | external_webkit-4175d59b46f96005f0c64978b1a94e3fe60f1e8e.zip external_webkit-4175d59b46f96005f0c64978b1a94e3fe60f1e8e.tar.gz external_webkit-4175d59b46f96005f0c64978b1a94e3fe60f1e8e.tar.bz2 |
Simplify the layer code:
* Rename setRootLayer to setUIRootLayer
* Fixed some logs in GraphicsLayerAndroid
* Added back the diagonal drawing debug code in LayerAndroid
* Simplified ChromeClientAndroid, removed compositingLayerSync()
Diffstat (limited to 'WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp')
-rw-r--r-- | WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp index ee7c888..be275a8 100644 --- a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp @@ -418,9 +418,9 @@ void GraphicsLayerAndroid::sendImmediateRepaint() && rootGraphicsLayer->m_frame->view()) { LayerAndroid* copyLayer = new LayerAndroid(*m_contentLayer); TLOG("(%x) sendImmediateRepaint, copy the layer, (%.2f,%.2f => %.2f,%.2f)", - this, m_contentLayer->size().width(), m_contentLayer->size().height(), - copyLayer->size().width(), copyLayer->size().height()); - PlatformBridge::setRootLayer(m_frame->view(), (int)copyLayer); + this, m_contentLayer->getSize().width(), m_contentLayer->getSize().height(), + copyLayer->getSize().width(), copyLayer->getSize().height()); + PlatformBridge::setUIRootLayer(m_frame->view(), copyLayer); PlatformBridge::immediateRepaint(m_frame->view()); } } @@ -457,10 +457,10 @@ bool GraphicsLayerAndroid::repaint(const FloatRect& rect) TLOG("(%x) repaint(%.2f,%.2f,%.2f,%.2f) on (%.2f,%.2f) contentlayer(%.2f,%.2f,%.2f,%.2f)paintGraphicsLayer called!", this, rect.x(), rect.y(), rect.width(), rect.height(), m_size.width(), m_size.height(), - m_contentLayer->position().fX, - m_contentLayer->position().fY, - m_contentLayer->size().width(), - m_contentLayer->size().height()); + m_contentLayer->getPosition().fX, + m_contentLayer->getPosition().fY, + m_contentLayer->getSize().width(), + m_contentLayer->getSize().height()); } return true; } |