Revert removal of events

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 95 matching lines @@
 void ScrollingCoordinator::frameViewLayoutUpdated(FrameView* frameView)
 {
     ASSERT(m_page);
 
     // Compute the region of the page that we can't do fast scrolling for. This currently includes
     // 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.
     Region nonFastScrollableRegion = computeNonFastScrollableRegion(m_page->mainFrame(), IntPoint());
     setNonFastScrollableRegion(nonFastScrollableRegion);
+#if ENABLE(TOUCH_EVENT_TRACKING)
     Vector<IntRect> touchEventTargetRects;
     computeAbsoluteTouchEventTargetRects(m_page->mainFrame()->document(), touchEventTargetRects);
     setTouchEventTargetRects(touchEventTargetRects);
+#endif
     if (WebLayer* scrollLayer = scrollingWebLayerForScrollableArea(frameView))
         scrollLayer->setBounds(frameView->contentsSize());
 }
 
 void ScrollingCoordinator::setLayerIsContainerForFixedPositionLayers(GraphicsLayer* layer, bool enable)
 {
     if (WebLayer* scrollableLayer = scrollingWebLayerForGraphicsLayer(layer))
         scrollableLayer->setIsContainerForFixedPositionLayers(enable);
 }
 
@@ skipping 160 matching lines @@
     if (WebLayer* scrollLayer = scrollingWebLayerForScrollableArea(m_page->mainFrame()->view())) {
         WebVector<WebRect> webRects(absoluteHitTestRects.size());
         for (size_t i = 0; i < absoluteHitTestRects.size(); ++i)
             webRects[i] = absoluteHitTestRects[i];
         scrollLayer->setTouchEventHandlerRegion(webRects);
     }
 }
 
 void ScrollingCoordinator::touchEventTargetRectsDidChange(const Document*)
 {
+#if ENABLE(TOUCH_EVENT_TRACKING)
     // The rects are always evaluated and used in the main frame coordinates.
     FrameView* frameView = m_page->mainFrame()->view();
     Document* document = m_page->mainFrame()->document();
 
     // Wait until after layout to update.
     if (frameView->needsLayout() || !document)
         return;
 
     Vector<IntRect> touchEventTargetRects;
     computeAbsoluteTouchEventTargetRects(document, touchEventTargetRects);
     setTouchEventTargetRects(touchEventTargetRects);
+#endif
 }
 
 void ScrollingCoordinator::setWheelEventHandlerCount(unsigned count)
 {
     if (WebLayer* scrollLayer = scrollingWebLayerForScrollableArea(m_page->mainFrame()->view()))
         scrollLayer->setHaveWheelEventHandlers(count > 0);
 }
 
 void ScrollingCoordinator::recomputeWheelEventHandlerCountForFrameView(FrameView* frameView)
 {
@@ skipping 62 matching lines @@
         }
     }
 
     FrameTree* tree = frame->tree();
     for (Frame* subFrame = tree->firstChild(); subFrame; subFrame = subFrame->tree()->nextSibling())
         nonFastScrollableRegion.unite(computeNonFastScrollableRegion(subFrame, offset));
 
     return nonFastScrollableRegion;
 }
 
+#if ENABLE(TOUCH_EVENT_TRACKING)
 static void accumulateRendererTouchEventTargetRects(Vector<IntRect>& rects, const RenderObject* renderer, const IntRect& parentRect = IntRect())
 {
     IntRect adjustedParentRect = parentRect;
     if (parentRect.isEmpty() || renderer->isFloating() || renderer->isPositioned() || renderer->hasTransform()) {
         // FIXME: This method is O(N^2) as it walks the tree to the root for every renderer. RenderGeometryMap would fix this.
         IntRect r = enclosingIntRect(renderer->clippedOverflowRectForRepaint(0));
         if (!r.isEmpty()) {
             // Convert to the top-level view's coordinates.
             ASSERT(renderer->document()->view());
             r = renderer->document()->view()->convertToRootView(r);
@@ skipping 50 matching lines @@
 
 void ScrollingCoordinator::computeAbsoluteTouchEventTargetRects(const Document* document, Vector<IntRect>& rects)
 {
     ASSERT(document);
     if (!document->view())
         return;
 
     // FIXME: These rects won't be properly updated if the renderers are in a sub-tree that scrolls.
     accumulateDocumentEventTargetRects(rects, document);
 }
+#endif
 
 unsigned ScrollingCoordinator::computeCurrentWheelEventHandlerCount()
 {
     unsigned wheelEventHandlerCount = 0;
 
     for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
         if (frame->document())
             wheelEventHandlerCount += frame->document()->wheelEventHandlerCount();
     }
 
@@ skipping 147 matching lines @@
         stringBuilder.resize(stringBuilder.length() - 2);
     return stringBuilder.toString();
 }
 
 String ScrollingCoordinator::mainThreadScrollingReasonsAsText() const
 {
     return mainThreadScrollingReasonsAsText(mainThreadScrollingReasons());
 }
 
 } // namespace WebCore