diff options
| -rw-r--r-- | WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 8 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/GraphicsLayerAndroid.h | 5 | ||||
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 33 | ||||
| -rw-r--r-- | WebKit/android/jni/WebViewCore.h | 3 |
4 files changed, 1 insertions, 48 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; diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index 2a90f36..8dc58d2 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -1632,9 +1632,6 @@ void WebViewCore::moveMouse(WebCore::Frame* frame, int x, int y) x, y, m_scrollOffsetX, m_scrollOffsetY); if (!frame || CacheBuilder::validNode(m_mainFrame, frame, NULL) == false) frame = m_mainFrame; -#if USE(ACCELERATED_COMPOSITING) && ENABLE(COMPOSITED_FIXED_ELEMENTS) - markPositionedObjectsForLayout(); -#endif // mouse event expects the position in the window coordinate m_mousePos = WebCore::IntPoint(x - m_scrollOffsetX, y - m_scrollOffsetY); // validNode will still return true if the node is null, as long as we have @@ -1982,9 +1979,6 @@ void WebViewCore::listBoxRequest(WebCoreReply* reply, const uint16_t** labels, s bool WebViewCore::key(const PlatformKeyboardEvent& event) { -#if USE(ACCELERATED_COMPOSITING) && ENABLE(COMPOSITED_FIXED_ELEMENTS) - markPositionedObjectsForLayout(); -#endif WebCore::EventHandler* eventHandler = m_mainFrame->eventHandler(); WebCore::Node* focusNode = currentFocus(); if (focusNode) @@ -1996,9 +1990,6 @@ bool WebViewCore::key(const PlatformKeyboardEvent& event) // For when the user clicks the trackball void WebViewCore::click(WebCore::Frame* frame, WebCore::Node* node) { -#if USE(ACCELERATED_COMPOSITING) && ENABLE(COMPOSITED_FIXED_ELEMENTS) - markPositionedObjectsForLayout(); -#endif if (!node) { WebCore::IntPoint pt = m_mousePos; pt.move(m_scrollOffsetX, m_scrollOffsetY); @@ -2021,7 +2012,6 @@ void WebViewCore::click(WebCore::Frame* frame, WebCore::Node* node) { } #if USE(ACCELERATED_COMPOSITING) - GraphicsLayerAndroid* WebViewCore::graphicsRootLayer() const { RenderView* contentRenderer = m_mainFrame->contentRenderer(); @@ -2030,24 +2020,7 @@ GraphicsLayerAndroid* WebViewCore::graphicsRootLayer() const return static_cast<GraphicsLayerAndroid*>( contentRenderer->compositor()->rootPlatformLayer()); } - -#if ENABLE(COMPOSITED_FIXED_ELEMENTS) - -// If we have composited fixed elements, we need to mark -// fixed elements' as needing a relayout, as they could have -// visually moved on the UI side, without that movement being -// reflected in webkit. -void WebViewCore::markPositionedObjectsForLayout() -{ - GraphicsLayerAndroid* graphicsLayer = graphicsRootLayer(); - if (graphicsLayer && graphicsLayer->hasFixedLayers() && - m_mainFrame->contentRenderer()) - m_mainFrame->contentRenderer()->markPositionedObjectsForLayout(); -} - -#endif // ENABLE(COMPOSITED_FIXED_ELEMENTS) - -#endif // USE(ACCELERATED_COMPOSITING) +#endif bool WebViewCore::handleTouchEvent(int action, int x, int y, int metaState) { @@ -2059,10 +2032,6 @@ bool WebViewCore::handleTouchEvent(int action, int x, int y, int metaState) rootLayer->pauseDisplay(true); #endif -#if USE(ACCELERATED_COMPOSITING) && ENABLE(COMPOSITED_FIXED_ELEMENTS) - markPositionedObjectsForLayout(); -#endif - #if ENABLE(TOUCH_EVENTS) // Android WebCore::TouchEventType type = WebCore::TouchStart; WebCore::PlatformTouchPoint::State touchState = WebCore::PlatformTouchPoint::TouchPressed; diff --git a/WebKit/android/jni/WebViewCore.h b/WebKit/android/jni/WebViewCore.h index 336ddca..8c885e6 100644 --- a/WebKit/android/jni/WebViewCore.h +++ b/WebKit/android/jni/WebViewCore.h @@ -139,9 +139,6 @@ namespace android { GraphicsLayerAndroid* graphicsRootLayer() const; void immediateRepaint(); void setUIRootLayer(const LayerAndroid* layer); -#if ENABLE(COMPOSITED_FIXED_ELEMENTS) - void markPositionedObjectsForLayout(); -#endif #endif /** Invalidate the view/screen, NOT the content/DOM, but expressed in |