Revert "Re-land deferred compositing updates with fixed assumptions"

Source/core/page/scrolling/ScrollingCoordinator.cpp

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 70 matching lines @@
     return graphicsLayer ? scrollingWebLayerForGraphicsLayer(graphicsLayer) : 0;
 }
 
 PassRefPtr<ScrollingCoordinator> ScrollingCoordinator::create(Page* page)
 {
     return adoptRef(new ScrollingCoordinator(page));
 }
 
 ScrollingCoordinator::ScrollingCoordinator(Page* page)
     : m_page(page)
-    , m_scrollGestureRegionIsDirty(false)
-    , m_touchEventTargetRectsAreDirty(false)
 {
 }
 
 ScrollingCoordinator::~ScrollingCoordinator()
 {
     ASSERT(!m_page);
     for (ScrollbarMap::iterator it = m_horizontalScrollbars.begin(); it != m_horizontalScrollbars.end(); ++it)
         GraphicsLayer::unregisterContentsLayer(it->value->layer());
     for (ScrollbarMap::iterator it = m_verticalScrollbars.begin(); it != m_verticalScrollbars.end(); ++it)
         GraphicsLayer::unregisterContentsLayer(it->value->layer());
@@ skipping 11 matching lines @@
 {
     if (WebLayer* scrollLayer = scrollingWebLayerForScrollableArea(m_page->mainFrame()->view())) {
         Vector<IntRect> rects = region.rects();
         WebVector<WebRect> webRects(rects.size());
         for (size_t i = 0; i < rects.size(); ++i)
             webRects[i] = rects[i];
         scrollLayer->setNonFastScrollableRegion(webRects);
     }
 }
 
-void ScrollingCoordinator::notifyLayoutUpdated()
+void ScrollingCoordinator::frameViewLayoutUpdated(FrameView* frameView)
 {
-    // These computations need to happen after compositing is updated.
-    m_scrollGestureRegionIsDirty = true;
-    m_touchEventTargetRectsAreDirty = true;
-}
+    TRACE_EVENT0("input", "ScrollingCoordinator::frameViewLayoutUpdated");
 
-void ScrollingCoordinator::updateAfterCompositingChange()
-{
-    TRACE_EVENT0("input", "ScrollingCoordinator::updateAfterCompositingChange");
+    // Compute the region of the page where we can't handle scroll gestures and mousewheel events
+    // on the impl thread. This currently includes:
+    // 1. All scrollable areas, such as subframes, overflow divs and list boxes, whose composited
+    // scrolling are not enabled. We need to do this even if the frame view whose layout was updated
+    // is not the main frame.
+    // 2. Resize control areas, e.g. the small rect at the right bottom of div/textarea/iframe when
+    // CSS property "resize" is enabled.
+    // 3. Plugin areas.
+    Region shouldHandleScrollGestureOnMainThreadRegion = computeShouldHandleScrollGestureOnMainThreadRegion(m_page->mainFrame(), IntPoint());
+    setShouldHandleScrollGestureOnMainThreadRegion(shouldHandleScrollGestureOnMainThreadRegion);
 
-    if (m_scrollGestureRegionIsDirty) {
-        // Compute the region of the page where we can't handle scroll gestures and mousewheel events
-        // on the impl thread. This currently includes:
-        // 1. All scrollable areas, such as subframes, overflow divs and list boxes, whose composited
-        // scrolling are not enabled. We need to do this even if the frame view whose layout was updated
-        // is not the main frame.
-        // 2. Resize control areas, e.g. the small rect at the right bottom of div/textarea/iframe when
-        // CSS property "resize" is enabled.
-        // 3. Plugin areas.
-        Region shouldHandleScrollGestureOnMainThreadRegion = computeShouldHandleScrollGestureOnMainThreadRegion(m_page->mainFrame(), IntPoint());
-        setShouldHandleScrollGestureOnMainThreadRegion(shouldHandleScrollGestureOnMainThreadRegion);
-        m_scrollGestureRegionIsDirty = false;
+    if (touchHitTestingEnabled()) {
+        LayerHitTestRects touchEventTargetRects;
+        computeTouchEventTargetRects(touchEventTargetRects);
+        setTouchEventTargetRects(touchEventTargetRects);
     }
 
-    if (m_touchEventTargetRectsAreDirty) {
-        updateTouchEventTargetRectsIfNeeded();
-        m_touchEventTargetRectsAreDirty = false;
-    }
-
-    const FrameTree& tree = m_page->mainFrame()->tree();
-    for (const Frame* child = tree.firstChild(); child; child = child->tree().nextSibling()) {
-        if (WebLayer* scrollLayer = scrollingWebLayerForScrollableArea(child->view()))
-            scrollLayer->setBounds(child->view()->contentsSize());
-    }
+    if (WebLayer* scrollLayer = scrollingWebLayerForScrollableArea(frameView))
+        scrollLayer->setBounds(frameView->contentsSize());
 }
 
 void ScrollingCoordinator::setLayerIsContainerForFixedPositionLayers(GraphicsLayer* layer, bool enable)
 {
     if (WebLayer* scrollableLayer = scrollingWebLayerForGraphicsLayer(layer))
         scrollableLayer->setIsContainerForFixedPositionLayers(enable);
 }
 
 static void clearPositionConstraintExceptForLayer(GraphicsLayer* layer, GraphicsLayer* except)
 {
@@ skipping 305 matching lines @@
     // Now walk the layer projecting rects while maintaining a RenderGeometryMap
     MapCoordinatesFlags flags = UseTransforms;
     if (touchHandlerInChildFrame)
         flags |= TraverseDocumentBoundaries;
     RenderGeometryMap geometryMap(flags);
     LayerFrameMap layerChildFrameMap;
     makeLayerChildFrameMap(mainFrame, &layerChildFrameMap);
     convertLayerRectsToEnclosingCompositedLayerRecursive(mainFrame->contentRenderer()->layer(), layerRects, compositorRects, geometryMap, layersWithRects, layerChildFrameMap);
 }
 
-void ScrollingCoordinator::updateTouchEventTargetRectsIfNeeded()
-{
-    TRACE_EVENT0("input", "ScrollingCoordinator::updateTouchEventTargetRectsIfNeeded");
-
-    if (!touchHitTestingEnabled())
-        return;
-
-    LayerHitTestRects touchEventTargetRects;
-    computeTouchEventTargetRects(touchEventTargetRects);
-    setTouchEventTargetRects(touchEventTargetRects);
-}
-
 // Note that in principle this could be called more often than computeTouchEventTargetRects, for
 // example during a non-composited scroll (although that's not yet implemented - crbug.com/261307).
 void ScrollingCoordinator::setTouchEventTargetRects(const LayerHitTestRects& layerRects)
 {
     TRACE_EVENT0("input", "ScrollingCoordinator::setTouchEventTargetRects");
 
     LayerHitTestRects compositorRects;
     convertLayerRectsToEnclosingCompositedLayer(m_page->mainFrame(), layerRects, compositorRects);
 
     HashSet<const RenderLayer*> oldLayersWithTouchRects;
@@ skipping 28 matching lines @@
 
 void ScrollingCoordinator::touchEventTargetRectsDidChange(const Document*)
 {
     if (!touchHitTestingEnabled())
         return;
 
     // Wait until after layout to update.
     if (m_page->mainFrame()->view()->needsLayout())
         return;
 
-    // FIXME: scheduleAnimation() is just a method of forcing the compositor to realize that it
-    // needs to commit here. We should expose a cleaner API for this.
-    RenderView* renderView = m_page->mainFrame()->contentRenderer();
-    if (renderView && renderView->compositor() && renderView->compositor()->inCompositingMode())
-        m_page->mainFrame()->view()->scheduleAnimation();
+    TRACE_EVENT0("input", "ScrollingCoordinator::touchEventTargetRectsDidChange");
 
-    m_touchEventTargetRectsAreDirty = true;
+    LayerHitTestRects touchEventTargetRects;
+    computeTouchEventTargetRects(touchEventTargetRects);
+    setTouchEventTargetRects(touchEventTargetRects);
 }
 
 void ScrollingCoordinator::updateScrollParentForGraphicsLayer(GraphicsLayer* child, RenderLayer* parent)
 {
     WebLayer* scrollParentWebLayer = 0;
     if (parent && parent->compositedLayerMapping())
         scrollParentWebLayer = scrollingWebLayerForGraphicsLayer(parent->compositedLayerMapping()->parentForSublayers());
 
     child->setScrollParent(scrollParentWebLayer);
 }
@@ skipping 239 matching lines @@
 }
 
 void ScrollingCoordinator::frameViewRootLayerDidChange(FrameView* frameView)
 {
     ASSERT(isMainThread());
     ASSERT(m_page);
 
     if (!coordinatesScrollingForFrameView(frameView))
         return;
 
-    notifyLayoutUpdated();
+    frameViewLayoutUpdated(frameView);
     recomputeWheelEventHandlerCountForFrameView(frameView);
     updateShouldUpdateScrollLayerPositionOnMainThread();
 }
 
 #if OS(MACOSX)
 void ScrollingCoordinator::handleWheelEventPhase(PlatformWheelEventPhase phase)
 {
     ASSERT(isMainThread());
 
     if (!m_page)
@@ skipping 66 matching lines @@
         stringBuilder.resize(stringBuilder.length() - 2);
     return stringBuilder.toString();
 }
 
 String ScrollingCoordinator::mainThreadScrollingReasonsAsText() const
 {
     return mainThreadScrollingReasonsAsText(mainThreadScrollingReasons());
 }
 
 } // namespace WebCore