Remove usesCompositedScrolling

sky/engine/core/rendering/RenderLayerScrollableArea.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 277 matching lines @@
     }
 
     // The caret rect needs to be invalidated after scrolling
     frame->selection().setCaretRectNeedsUpdate();
 
     FloatQuad quadForFakeMouseMoveEvent = FloatQuad(layer()->renderer()->previousPaintInvalidationRect());
 
     quadForFakeMouseMoveEvent = paintInvalidationContainer->localToAbsoluteQuad(quadForFakeMouseMoveEvent);
     frame->eventHandler().dispatchFakeMouseMoveEventSoonInQuad(quadForFakeMouseMoveEvent);
 
-    bool requiresPaintInvalidation = true;
-
-    if (box().view()->compositor()->inCompositingMode()) {
-        // Hits in virtual/gpu/fast/canvas/canvas-scroll-path-into-view.html.
-        DisableCompositingQueryAsserts disabler;
-        bool onlyScrolledCompositedLayers = scrollsOverflow()
-            && !layer()->hasVisibleNonLayerContent()
-            && !layer()->hasNonCompositedChild()
-            && !layer()->hasBlockSelectionGapBounds()
-            && box().style()->backgroundLayers().attachment() != LocalBackgroundAttachment;
-
-        if (usesCompositedScrolling() || onlyScrolledCompositedLayers)
-            requiresPaintInvalidation = false;
-    }
-
-    // Just schedule a full paint invalidation of our object.
-    if (requiresPaintInvalidation) {
-        // For querying RenderLayer::compositingState()
-        // This code appears correct, since scrolling outside of layout happens during activities that do not dirty compositing state.
-        DisableCompositingQueryAsserts disabler;
-        if (box().frameView()->isInPerformLayout())
-            box().setShouldDoFullPaintInvalidation(true);
-        else
-            box().invalidatePaintUsingContainer(paintInvalidationContainer, layer()->renderer()->previousPaintInvalidationRect(), InvalidationScroll);
-    }
+    // For querying RenderLayer::compositingState()
+    // This code appears correct, since scrolling outside of layout happens during activities that do not dirty compositing state.
+    DisableCompositingQueryAsserts disabler;
+    if (box().frameView()->isInPerformLayout())
+        box().setShouldDoFullPaintInvalidation(true);
+    else
+        box().invalidatePaintUsingContainer(paintInvalidationContainer, layer()->renderer()->previousPaintInvalidationRect(), InvalidationScroll);
 
     // Schedule the scroll DOM event.
     if (box().node())
         box().node()->document().enqueueScrollEventForNode(box().node());
 }
 
 IntPoint RenderLayerScrollableArea::scrollPosition() const
 {
     return IntPoint(m_scrollOffset);
 }
@@ skipping 48 matching lines @@
     return box().frame() ? box().frame()->eventHandler().lastKnownMousePosition() : IntPoint();
 }
 
 IntRect RenderLayerScrollableArea::scrollableAreaBoundingBox() const
 {
     return box().absoluteBoundingBoxRect();
 }
 
 bool RenderLayerScrollableArea::userInputScrollable(ScrollbarOrientation orientation) const
 {
-    if (box().isIntristicallyScrollable(orientation))
-        return true;
-
     EOverflow overflowStyle = (orientation == HorizontalScrollbar) ?
         box().style()->overflowX() : box().style()->overflowY();
     return (overflowStyle == OSCROLL || overflowStyle == OAUTO || overflowStyle == OOVERLAY);
 }
 
 bool RenderLayerScrollableArea::shouldPlaceVerticalScrollbarOnLeft() const
 {
     return box().style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft();
 }
 
@@ skipping 212 matching lines @@
     }
 
     if (needsVerticalScrollbar && oldStyle && oldStyle->overflowY() == OSCROLL && overflowY != OSCROLL) {
         ASSERT(hasVerticalScrollbar());
         m_vBar->setEnabled(true);
     }
 }
 
 bool RenderLayerScrollableArea::updateAfterCompositingChange()
 {
-    layer()->updateScrollingStateAfterCompositingChange();
     const bool layersChanged = m_topmostScrollChild != m_nextTopmostScrollChild;
     m_topmostScrollChild = m_nextTopmostScrollChild;
     m_nextTopmostScrollChild = nullptr;
     return layersChanged;
 }
 
 void RenderLayerScrollableArea::updateAfterOverflowRecalc()
 {
     computeScrollDimensions();
     if (Scrollbar* horizontalScrollbar = this->horizontalScrollbar()) {
@@ skipping 266 matching lines @@
     if (m_scrollsOverflow)
         frameView->addScrollableArea(this);
     else
         frameView->removeScrollableArea(this);
 }
 
 void RenderLayerScrollableArea::updateCompositingLayersAfterScroll()
 {
     RenderLayerCompositor* compositor = box().view()->compositor();
     if (compositor->inCompositingMode()) {
-        if (usesCompositedScrolling()) {
-            DisableCompositingQueryAsserts disabler;
-            ASSERT(layer()->hasCompositedLayerMapping());
-            layer()->compositedLayerMapping()->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateSubtree);
-            compositor->setNeedsCompositingUpdate(CompositingUpdateAfterGeometryChange);
-        } else {
-            layer()->setNeedsCompositingInputsUpdate();
-        }
+        layer()->setNeedsCompositingInputsUpdate();
     }
 }
 
-bool RenderLayerScrollableArea::usesCompositedScrolling() const
-{
-    // Scroll form controls on the main thread so they exhibit correct touch scroll event bubbling
-    if (box().isIntristicallyScrollable(VerticalScrollbar) || box().isIntristicallyScrollable(HorizontalScrollbar))
-        return false;
-
-    // See https://codereview.chromium.org/176633003/ for the tests that fail without this disabler.
-    DisableCompositingQueryAsserts disabler;
-    return layer()->hasCompositedLayerMapping() && layer()->compositedLayerMapping()->scrollingLayer();
-}
-
 static bool layerNeedsCompositedScrolling(const RenderLayer* layer)
 {
     return layer->scrollsOverflow()
         && layer->compositor()->preferCompositingToLCDTextEnabled()
         && !layer->hasDescendantWithClipPath()
         && !layer->hasAncestorWithClipPath();
 }
 
 void RenderLayerScrollableArea::updateNeedsCompositedScrolling()
 {
     const bool needsCompositedScrolling = layerNeedsCompositedScrolling(layer());
     if (static_cast<bool>(m_needsCompositedScrolling) != needsCompositedScrolling) {
         m_needsCompositedScrolling = needsCompositedScrolling;
         layer()->didUpdateNeedsCompositedScrolling();
     }
 }
 
 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild)
 {
     // We only want to track the topmost scroll child for scrollable areas with
     // overlay scrollbars.
     if (!hasOverlayScrollbars())
         return;
     m_nextTopmostScrollChild = scrollChild;
 }
 
 } // namespace blink