remove updateTouchEventTargetRectsIfNeeded

sky/engine/core/rendering/RenderObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 18 matching lines @@
 
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/StyleEngine.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/editing/EditingBoundary.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/htmlediting.h"
 #include "core/fetch/ResourceLoadPriorityOptimizer.h"
 #include "core/fetch/ResourceLoader.h"
-#include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLAnchorElement.h"
 #include "core/html/HTMLElement.h"
 #include "core/page/AutoscrollController.h"
 #include "core/page/EventHandler.h"
 #include "core/page/Page.h"
 #include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
 #include "core/rendering/HitTestResult.h"
@@ skipping 1762 matching lines @@
             && parent() && (parent()->isRenderBlockFlow() || parent()->isRenderInline());
 
         // Clearing these bits is required to avoid leaving stale renderers.
         // FIXME: We shouldn't need that hack if our logic was totally correct.
         if (diff.needsLayout()) {
             clearPositionedState();
         }
     } else {
         s_affectsParentBlock = false;
     }
-
-    // Elements with non-auto touch-action will send a SetTouchAction message
-    // on touchstart in EventHandler::handleTouchEvent, and so effectively have
-    // a touchstart handler that must be reported.
-    //
-    // Since a CSS property cannot be applied directly to a text node, a
-    // handler will have already been added for its parent so ignore it.
-    TouchAction oldTouchAction = m_style ? m_style->touchAction() : TouchActionAuto;
-    if (node() && !node()->isTextNode() && (oldTouchAction == TouchActionAuto) != (newStyle.touchAction() == TouchActionAuto)) {
-        EventHandlerRegistry& registry = document().frameHost()->eventHandlerRegistry();
-        if (newStyle.touchAction() != TouchActionAuto)
-            registry.didAddEventHandler(*node(), EventHandlerRegistry::TouchEvent);
-        else
-            registry.didRemoveEventHandler(*node(), EventHandlerRegistry::TouchEvent);
-    }
 }
 
 static bool areNonIdenticalCursorListsEqual(const RenderStyle* a, const RenderStyle* b)
 {
     ASSERT(a->cursors() != b->cursors());
     return a->cursors() && b->cursors() && *a->cursors() == *b->cursors();
 }
 
 static inline bool areCursorsEqual(const RenderStyle* a, const RenderStyle* b)
 {
@@ skipping 250 matching lines @@
 }
 
 LayoutRect RenderObject::localCaretRect(InlineBox*, int, LayoutUnit* extraWidthToEndOfLine)
 {
     if (extraWidthToEndOfLine)
         *extraWidthToEndOfLine = 0;
 
     return LayoutRect();
 }
 
-void RenderObject::computeLayerHitTestRects(LayerHitTestRects& layerRects) const
-{
-    // Figure out what layer our container is in. Any offset (or new layer) for this
-    // renderer within it's container will be applied in addLayerHitTestRects.
-    LayoutPoint layerOffset;
-    const RenderLayer* currentLayer = 0;
-
-    if (!hasLayer()) {
-        RenderObject* container = this->container();
-        currentLayer = container->enclosingLayer();
-        if (container && currentLayer->renderer() != container) {
-            layerOffset.move(container->offsetFromAncestorContainer(currentLayer->renderer()));
-            // If the layer itself is scrolled, we have to undo the subtraction of its scroll
-            // offset since we want the offset relative to the scrolling content, not the
-            // element itself.
-            if (currentLayer->renderer()->hasOverflowClip())
-                layerOffset.move(currentLayer->renderBox()->scrolledContentOffset());
-        }
-    }
-
-    this->addLayerHitTestRects(layerRects, currentLayer, layerOffset, LayoutRect());
-}
-
-void RenderObject::addLayerHitTestRects(LayerHitTestRects& layerRects, const RenderLayer* currentLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const
-{
-    ASSERT(currentLayer);
-    ASSERT(currentLayer == this->enclosingLayer());
-
-    // Compute the rects for this renderer only and add them to the results.
-    // Note that we could avoid passing the offset and instead adjust each result, but this
-    // seems slightly simpler.
-    Vector<LayoutRect> ownRects;
-    LayoutRect newContainerRect;
-    computeSelfHitTestRects(ownRects, layerOffset);
-
-    // When we get to have a lot of rects on a layer, the performance cost of tracking those
-    // rects outweighs the benefit of doing compositor thread hit testing.
-    // FIXME: This limit needs to be low due to the O(n^2) algorithm in
-    // WebLayer::setTouchEventHandlerRegion - crbug.com/300282.
-    const size_t maxRectsPerLayer = 100;
-
-    LayerHitTestRects::iterator iter = layerRects.find(currentLayer);
-    Vector<LayoutRect>* iterValue;
-    if (iter == layerRects.end())
-        iterValue = &layerRects.add(currentLayer, Vector<LayoutRect>()).storedValue->value;
-    else
-        iterValue = &iter->value;
-    for (size_t i = 0; i < ownRects.size(); i++) {
-        if (!containerRect.contains(ownRects[i])) {
-            iterValue->append(ownRects[i]);
-            if (iterValue->size() > maxRectsPerLayer) {
-                // Just mark the entire layer instead, and switch to walking the layer
-                // tree instead of the render tree.
-                layerRects.remove(currentLayer);
-                currentLayer->addLayerHitTestRects(layerRects);
-                return;
-            }
-            if (newContainerRect.isEmpty())
-                newContainerRect = ownRects[i];
-        }
-    }
-    if (newContainerRect.isEmpty())
-        newContainerRect = containerRect;
-
-    // If it's possible for children to have rects outside our bounds, then we need to descend into
-    // the children and compute them.
-    // Ideally there would be other cases where we could detect that children couldn't have rects
-    // outside our bounds and prune the tree walk.
-    // Note that we don't use Region here because Union is O(N) - better to just keep a list of
-    // partially redundant rectangles. If we find examples where this is expensive, then we could
-    // rewrite Region to be more efficient. See https://bugs.webkit.org/show_bug.cgi?id=100814.
-    if (!isRenderView()) {
-        for (RenderObject* curr = slowFirstChild(); curr; curr = curr->nextSibling()) {
-            curr->addLayerHitTestRects(layerRects, currentLayer,  layerOffset, newContainerRect);
-        }
-    }
-}
-
 bool RenderObject::isRooted() const
 {
     const RenderObject* object = this;
     while (object->parent() && !object->hasLayer())
         object = object->parent();
     if (object->hasLayer())
         return toRenderLayerModelObject(object)->layer()->root()->isRootLayer();
     return false;
 }
 
@@ skipping 80 matching lines @@
         children->destroyLeftoverChildren();
 
     // If this renderer is being autoscrolled, stop the autoscrolling.
     if (LocalFrame* frame = this->frame()) {
         if (frame->page())
             frame->page()->autoscrollController().stopAutoscrollIfNeeded(this);
     }
 
     remove();
 
-    // Remove the handler if node had touch-action set. Don't call when
-    // document is being destroyed as all handlers will have been cleared
-    // previously. Handlers are not added for text nodes so don't try removing
-    // for one too. Need to check if m_style is null in cases of partial construction.
-    if (!documentBeingDestroyed() && node() && !node()->isTextNode() && m_style && m_style->touchAction() != TouchActionAuto)
-        document().frameHost()->eventHandlerRegistry().didRemoveEventHandler(*node(), EventHandlerRegistry::TouchEvent);
-
     setAncestorLineBoxDirty(false);
 
     clearLayoutRootIfNeeded();
 }
 
 void RenderObject::insertedIntoTree()
 {
     // FIXME: We should ASSERT(isRooted()) here but generated content makes some out-of-order insertion.
 
     // Keep our layer hierarchy updated. Optimize for the common case where we don't have any children
@@ skipping 510 matching lines @@
 {
     if (object1) {
         const blink::RenderObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif