Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1354)

Unified Diff: Source/core/layout/LayoutView.cpp

Issue 1177123003: Revert "Implement a Hit Test Cache for same point hits." (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/LayoutView.h ('k') | Source/core/paint/DeprecatedPaintLayer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutView.cpp
diff --git a/Source/core/layout/LayoutView.cpp b/Source/core/layout/LayoutView.cpp
index 2d0d8aaa1f1c769adb942329cbc1df38df103853..859e6ae3546397e624cb2089f4837c23e65d201e 100644
--- a/Source/core/layout/LayoutView.cpp
+++ b/Source/core/layout/LayoutView.cpp
@@ -44,7 +44,6 @@
#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>
@@ -63,7 +62,6 @@ LayoutView::LayoutView(Document* document)
, m_layoutQuoteHead(nullptr)
, m_layoutCounterCount(0)
, m_hitTestCount(0)
- , m_hitTestCacheHits(0)
, m_pendingSelection(PendingSelection::create())
{
// init LayoutObject attributes
@@ -83,10 +81,15 @@ 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
@@ -96,32 +99,16 @@ bool LayoutView::hitTest(HitTestResult& result)
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;
}
« no previous file with comments | « Source/core/layout/LayoutView.h ('k') | Source/core/paint/DeprecatedPaintLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698