diff options
author | Nicolas Roard <nicolas@android.com> | 2010-04-06 23:48:12 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-06 23:48:12 -0700 |
commit | ac92352d2974ec89a50a87947f4a4a7eb65e915c (patch) | |
tree | d0389ecf62e2cb72d07ce46fb69b861ed93241d2 /WebCore/platform | |
parent | d9f0b38514b40a8b41b90e7febe94e9afbec3711 (diff) | |
parent | a83db6c919c47d6745d688e2012f23ad5a384d6d (diff) | |
download | external_webkit-ac92352d2974ec89a50a87947f4a4a7eb65e915c.zip external_webkit-ac92352d2974ec89a50a87947f4a4a7eb65e915c.tar.gz external_webkit-ac92352d2974ec89a50a87947f4a4a7eb65e915c.tar.bz2 |
am a83db6c9: am 5c13f89a: Merge "Revert "Mark positioned elements as needing a relayout when checking for hit test."" into froyo
Diffstat (limited to 'WebCore/platform')
-rw-r--r-- | WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 8 | ||||
-rw-r--r-- | WebCore/platform/graphics/android/GraphicsLayerAndroid.h | 5 |
2 files changed, 0 insertions, 13 deletions
diff --git a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp index 3571a49..fa4a180 100644 --- a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp @@ -115,7 +115,6 @@ GraphicsLayerAndroid::GraphicsLayerAndroid(GraphicsLayerClient* client) : m_needsNotifyClient(false), m_haveContents(false), m_haveImage(false), - m_hasFixedLayers(false), m_translateX(0), m_translateY(0), m_currentTranslateX(0), @@ -254,13 +253,6 @@ void GraphicsLayerAndroid::updateFixedPosition() offsetFromRenderer().width(), offsetFromRenderer().height(), w, h); - - GraphicsLayerAndroid* rootGraphicsLayer = this; - - while (rootGraphicsLayer->parent()) - rootGraphicsLayer = static_cast<GraphicsLayerAndroid*>(rootGraphicsLayer->parent()); - - rootGraphicsLayer->setHasFixedLayers(true); } } diff --git a/WebCore/platform/graphics/android/GraphicsLayerAndroid.h b/WebCore/platform/graphics/android/GraphicsLayerAndroid.h index d0347a7..25f70b4 100644 --- a/WebCore/platform/graphics/android/GraphicsLayerAndroid.h +++ b/WebCore/platform/graphics/android/GraphicsLayerAndroid.h @@ -121,9 +121,6 @@ public: void sendImmediateRepaint(); LayerAndroid* contentLayer() { return m_contentLayer; } - bool hasFixedLayers() const { return m_hasFixedLayers; } - void setHasFixedLayers(bool val) { m_hasFixedLayers = val; } - static int instancesCount(); private: @@ -142,8 +139,6 @@ private: bool m_haveContents; bool m_haveImage; - bool m_hasFixedLayers; - float m_translateX; float m_translateY; float m_currentTranslateX; |