diff --git a/engine/core/page/scrolling/ScrollingCoordinator.cpp b/engine/core/page/scrolling/ScrollingCoordinator.cpp index 868e78a0ba1..e7d2af55ad1 100644 --- a/engine/core/page/scrolling/ScrollingCoordinator.cpp +++ b/engine/core/page/scrolling/ScrollingCoordinator.cpp @@ -154,12 +154,6 @@ void ScrollingCoordinator::updateAfterCompositingChangeIfNeeded() } } -void ScrollingCoordinator::setLayerIsContainerForFixedPositionLayers(GraphicsLayer* layer, bool enable) -{ - if (WebLayer* scrollableLayer = toWebLayer(layer)) - scrollableLayer->setIsContainerForFixedPositionLayers(enable); -} - void ScrollingCoordinator::willDestroyScrollableArea(ScrollableArea* scrollableArea) { removeWebScrollbarLayer(scrollableArea, HorizontalScrollbar); diff --git a/engine/core/page/scrolling/ScrollingCoordinator.h b/engine/core/page/scrolling/ScrollingCoordinator.h index 94c405e88c8..7ebcebcd58a 100644 --- a/engine/core/page/scrolling/ScrollingCoordinator.h +++ b/engine/core/page/scrolling/ScrollingCoordinator.h @@ -96,7 +96,6 @@ public: // Returns true if the coordinator handled this change. bool scrollableAreaScrollLayerDidChange(ScrollableArea*); void scrollableAreaScrollbarLayerDidChange(ScrollableArea*, ScrollbarOrientation); - void setLayerIsContainerForFixedPositionLayers(GraphicsLayer*, bool); void touchEventTargetRectsDidChange(); void willDestroyRenderLayer(RenderLayer*); diff --git a/engine/core/rendering/compositing/CompositedLayerMapping.cpp b/engine/core/rendering/compositing/CompositedLayerMapping.cpp index 9c7af6701cc..6f369d6367e 100644 --- a/engine/core/rendering/compositing/CompositedLayerMapping.cpp +++ b/engine/core/rendering/compositing/CompositedLayerMapping.cpp @@ -652,7 +652,6 @@ void CompositedLayerMapping::updateGraphicsLayerGeometry(const RenderLayer* comp updateShouldFlattenTransform(); updateChildrenTransform(); updateScrollParent(compositor()->preferCompositingToLCDTextEnabled() ? m_owningLayer.scrollParent() : 0); - registerScrollingLayers(); updateCompositingReasons(); } @@ -919,23 +918,6 @@ void CompositedLayerMapping::updateBackgroundLayerGeometry(const FloatSize& rela m_backgroundLayer->setOffsetFromRenderer(m_graphicsLayer->offsetFromRenderer()); } -void CompositedLayerMapping::registerScrollingLayers() -{ - // FIXME(sky): Remove this whole function. I think this doesn't do anything now that we don't support position:fixed. - - // Register fixed position layers and their containers with the scrolling coordinator. - ScrollingCoordinator* scrollingCoordinator = scrollingCoordinatorFromLayer(m_owningLayer); - if (!scrollingCoordinator) - return; - - // Page scale is applied as a transform on the root render view layer. Because the scroll - // layer is further up in the hierarchy, we need to avoid marking the root render view - // layer as a container. - bool isContainer = m_owningLayer.hasTransform() && !m_owningLayer.isRootLayer(); - // FIXME: we should make certain that childForSuperLayers will never be the m_squashingContainmentLayer here - scrollingCoordinator->setLayerIsContainerForFixedPositionLayers(childForSuperlayers(), isContainer); -} - void CompositedLayerMapping::updateInternalHierarchy() { // m_foregroundLayer has to be inserted in the correct order with child layers, diff --git a/engine/core/rendering/compositing/CompositedLayerMapping.h b/engine/core/rendering/compositing/CompositedLayerMapping.h index f6ef9b4242b..19caf78fbd4 100644 --- a/engine/core/rendering/compositing/CompositedLayerMapping.h +++ b/engine/core/rendering/compositing/CompositedLayerMapping.h @@ -253,7 +253,6 @@ private: void updateDrawsContent(); void updateChildrenTransform(); void updateCompositedBounds(); - void registerScrollingLayers(); // Also sets subpixelAccumulation on the layer. void computeBoundsOfOwningLayer(const RenderLayer* compositedAncestor, IntRect& localCompositingBounds, IntRect& compositingBoundsRelativeToCompositedAncestor, LayoutPoint& offsetFromCompositedAncestor, IntPoint& snappedOffsetFromCompositedAncestor); diff --git a/engine/core/rendering/compositing/RenderLayerCompositor.cpp b/engine/core/rendering/compositing/RenderLayerCompositor.cpp index a6b8a9db68f..a8701d65c4a 100644 --- a/engine/core/rendering/compositing/RenderLayerCompositor.cpp +++ b/engine/core/rendering/compositing/RenderLayerCompositor.cpp @@ -791,8 +791,6 @@ void RenderLayerCompositor::ensureRootLayer() m_containerLayer->setMasksToBounds(containerMasksToBounds); m_scrollLayer = GraphicsLayer::create(graphicsLayerFactory(), this); - if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator()) - scrollingCoordinator->setLayerIsContainerForFixedPositionLayers(m_scrollLayer.get(), true); // Hook them up m_overflowControlsHostLayer->addChild(m_containerLayer.get()); diff --git a/engine/public/platform/WebLayer.h b/engine/public/platform/WebLayer.h index 2426cc56f9d..1e8d3c6eb3f 100644 --- a/engine/public/platform/WebLayer.h +++ b/engine/public/platform/WebLayer.h @@ -186,9 +186,6 @@ public: virtual void setTouchEventHandlerRegion(const WebVector&) = 0; virtual WebVector touchEventHandlerRegion() const = 0; - virtual void setIsContainerForFixedPositionLayers(bool) = 0; - virtual bool isContainerForFixedPositionLayers() const = 0; - // The scroll client is notified when the scroll position of the WebLayer // changes. Only a single scroll client can be set for a WebLayer at a time. // The WebLayer does not take ownership of the scroll client, and it is the diff --git a/viewer/cc/web_layer_impl.cc b/viewer/cc/web_layer_impl.cc index 65c4b715735..2adfbcc55ac 100644 --- a/viewer/cc/web_layer_impl.cc +++ b/viewer/cc/web_layer_impl.cc @@ -379,14 +379,6 @@ WebVector WebLayerImpl::touchEventHandlerRegion() const { return result; } -void WebLayerImpl::setIsContainerForFixedPositionLayers(bool enable) { - layer_->SetIsContainerForFixedPositionLayers(enable); -} - -bool WebLayerImpl::isContainerForFixedPositionLayers() const { - return layer_->IsContainerForFixedPositionLayers(); -} - void WebLayerImpl::setScrollClient(blink::WebLayerScrollClient* scroll_client) { if (scroll_client) { layer_->set_did_scroll_callback( diff --git a/viewer/cc/web_layer_impl.h b/viewer/cc/web_layer_impl.h index f43f6697351..7ebfa53020e 100644 --- a/viewer/cc/web_layer_impl.h +++ b/viewer/cc/web_layer_impl.h @@ -123,8 +123,6 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient { virtual void setTouchEventHandlerRegion( const blink::WebVector& region); virtual blink::WebVector touchEventHandlerRegion() const; - virtual void setIsContainerForFixedPositionLayers(bool is_container); - virtual bool isContainerForFixedPositionLayers() const; virtual void setScrollClient(blink::WebLayerScrollClient* client); virtual bool isOrphan() const; virtual void setWebLayerClient(blink::WebLayerClient* client);