Revert "Implement a Hit Test Cache for same point hits."

Source/core/layout/LayoutView.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 26 matching lines @@
 #include "core/layout/LayoutScrollbarPart.h"
 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
 #include "core/page/Page.h"
 #include "core/paint/DeprecatedPaintLayer.h"
 #include "core/paint/ViewPainter.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "platform/TraceEvent.h"
 #include "platform/TracedValue.h"
 #include "platform/geometry/FloatQuad.h"
 #include "platform/geometry/TransformState.h"
-#include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/DisplayItemList.h"
 #include <inttypes.h>
 
 namespace blink {
 
 LayoutView::LayoutView(Document* document)
     : LayoutBlockFlow(document)
     , m_frameView(document->view())
     , m_selectionStart(nullptr)
     , m_selectionEnd(nullptr)
     , m_selectionStartPos(-1)
     , m_selectionEndPos(-1)
     , m_pageLogicalHeight(0)
     , m_pageLogicalHeightChanged(false)
     , m_layoutState(nullptr)
     , m_layoutQuoteHead(nullptr)
     , m_layoutCounterCount(0)
     , m_hitTestCount(0)
-    , m_hitTestCacheHits(0)
     , m_pendingSelection(PendingSelection::create())
 {
     // init LayoutObject attributes
     setInline(false);
 
     m_minPreferredLogicalWidth = 0;
     m_maxPreferredLogicalWidth = 0;
 
     setPreferredLogicalWidthsDirty(MarkOnlyThis);
 
     setPositionState(AbsolutePosition); // to 0,0 :)
 }
 
 LayoutView::~LayoutView()
 {
 }
 
 bool LayoutView::hitTest(HitTestResult& result)
 {
+    return hitTest(result.hitTestRequest(), result.hitTestLocation(), result);
+}
+
+bool LayoutView::hitTest(const HitTestRequest& request, const HitTestLocation& location, HitTestResult& result)
+{
     TRACE_EVENT_BEGIN0("blink,devtools.timeline", "HitTest");
     m_hitTestCount++;
 
-    ASSERT(!result.hitTestLocation().isRectBasedTest() || result.hitTestRequest().listBased());
+    ASSERT(!location.isRectBasedTest() || request.listBased());
 
     // We have to recursively update layout/style here because otherwise, when the hit test recurses
     // into a child document, it could trigger a layout on the parent document, which can destroy DeprecatedPaintLayer
     // that are higher up in the call stack, leading to crashes.
     // Note that Document::updateLayout calls its parent's updateLayout.
     // FIXME: It should be the caller's responsibility to ensure an up-to-date layout.
     frameView()->updateLayoutAndStyleForPainting();
     commitPendingSelection();
 
-    uint64_t domTreeVersion = document().domTreeVersion();
-    HitTestResult cacheResult = result;
-    bool cacheHit = m_hitTestCache.lookupCachedResult(cacheResult, domTreeVersion);
-    bool hitLayer = layer()->hitTest(result);
+    bool hitLayer = layer()->hitTest(request, location, result);
 
     // FrameView scrollbars are not the same as Layer scrollbars tested by Layer::hitTestOverflowControls,
     // so we need to test FrameView scrollbars separately here. Note that it's important we do this after
     // the hit test above, because that may overwrite the entire HitTestResult when it finds a hit.
-    IntPoint framePoint = frameView()->contentsToFrame(result.hitTestLocation().roundedPoint());
+    IntPoint framePoint = frameView()->contentsToFrame(location.roundedPoint());
     if (Scrollbar* frameScrollbar = frameView()->scrollbarAtFramePoint(framePoint))
         result.setScrollbar(frameScrollbar);
 
-    if (cacheHit) {
-        m_hitTestCacheHits++;
-        m_hitTestCache.verifyCachedResult(result, cacheResult);
-    }
-
-    if (hitLayer) {
-        m_hitTestCache.addCachedResult(result, domTreeVersion);
-
-        if (layer()->graphicsLayerBacking()) {
-            layer()->graphicsLayerBacking()->platformLayer()->setHitTestCacheRect(enclosingIntRect(result.validityRect()));
-        }
-    }
-
-    TRACE_EVENT_END1("blink,devtools.timeline", "HitTest", "endData", InspectorHitTestEvent::endData(result.hitTestRequest(), result.hitTestLocation(), result));
+    TRACE_EVENT_END1("blink,devtools.timeline", "HitTest", "endData", InspectorHitTestEvent::endData(request, location, result));
     return hitLayer;
 }
 
 void LayoutView::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit, LogicalExtentComputedValues& computedValues) const
 {
     computedValues.m_extent = (!shouldUsePrintingLayout() && m_frameView) ? LayoutUnit(viewLogicalHeightForBoxSizing()) : logicalHeight;
 }
 
 void LayoutView::updateLogicalWidth()
 {
@@ skipping 828 matching lines @@
     return viewHeight(IncludeScrollbars) / scale;
 }
 
 void LayoutView::willBeDestroyed()
 {
     LayoutBlockFlow::willBeDestroyed();
     m_compositor.clear();
 }
 
 } // namespace blink