Merge 137939

Source/WebCore/page/scrolling/chromium/ScrollingCoordinatorChromium.cpp

 /*
  * Copyright (C) 2012 Google 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 97 matching lines @@
 
 void ScrollingCoordinatorChromium::frameViewLayoutUpdated(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. 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
+}
+
+void ScrollingCoordinatorChromium::touchEventTargetRectsDidChange(const Document* document)
+{
+#if ENABLE(TOUCH_EVENT_TRACKING)
+    // Wait until after layout to update.
+    if (m_page->mainFrame()->view()->needsLayout())
+        return;
+
+    // We won't necessarily get a setScrollLayer() call before this one, so grab the root ourselves.
+    setScrollLayer(scrollLayerForFrameView(m_page->mainFrame()->view()));
+    if (m_private->scrollLayer()) {
+        Vector<IntRect> touchEventTargetRects;
+        computeAbsoluteTouchEventTargetRects(document, touchEventTargetRects);
+        setTouchEventTargetRects(touchEventTargetRects);
+    }
+#else
+    UNUSED_PARAM(document);
+#endif
 }
 
 void ScrollingCoordinatorChromium::frameViewRootLayerDidChange(FrameView* frameView)
 {
     ScrollingCoordinator::frameViewRootLayerDidChange(frameView);
     setScrollLayer(scrollLayerForFrameView(frameView));
 }
 
 static WebLayer* scrollableLayerForGraphicsLayer(GraphicsLayer* layer)
 {
@@ skipping 74 matching lines @@
     setScrollLayer(scrollLayerForFrameView(m_page->mainFrame()->view()));
     if (m_private->scrollLayer()) {
         Vector<IntRect> rects = region.rects();
         WebVector<WebRect> webRects(rects.size());
         for (size_t i = 0; i < rects.size(); ++i)
             webRects[i] = rects[i];
         m_private->scrollLayer()->setNonFastScrollableRegion(webRects);
     }
 }
 
+void ScrollingCoordinatorChromium::setTouchEventTargetRects(const Vector<IntRect>& absoluteHitTestRects)
+{
+    // We won't necessarily get a setScrollLayer() call before this one, so grab the root ourselves.
+    setScrollLayer(scrollLayerForFrameView(m_page->mainFrame()->view()));
+    if (m_private->scrollLayer()) {
+        WebVector<WebRect> webRects(absoluteHitTestRects.size());
+        for (size_t i = 0; i < absoluteHitTestRects.size(); ++i)
+            webRects[i] = absoluteHitTestRects[i];
+        m_private->scrollLayer()->setTouchEventHandlerRegion(webRects);
+    }
+}
+
 void ScrollingCoordinatorChromium::setWheelEventHandlerCount(unsigned wheelEventHandlerCount)
 {
     // We won't necessarily get a setScrollLayer() call before this one, so grab the root ourselves.
     setScrollLayer(scrollLayerForFrameView(m_page->mainFrame()->view()));
     if (m_private->scrollLayer())
         m_private->scrollLayer()->setHaveWheelEventHandlers(wheelEventHandlerCount > 0);
 }
 
 void ScrollingCoordinatorChromium::setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReasons reasons)
 {
@@ skipping 29 matching lines @@
     }
 }
 
 void ScrollingCoordinatorChromium::recomputeWheelEventHandlerCountForFrameView(FrameView* frameView)
 {
     UNUSED_PARAM(frameView);
     setWheelEventHandlerCount(computeCurrentWheelEventHandlerCount());
 }
 
 }