From 1d3f70fc06386cb44c99f7a1b3403b2ff5192e62 Mon Sep 17 00:00:00 2001 From: Ojan Vafai Date: Fri, 13 Feb 2015 14:12:38 -0800 Subject: [PATCH] Remove unnecessary operator overload on RenderLayer::hitTest. R=eseidel@chromium.org Review URL: https://codereview.chromium.org/925903005 --- engine/core/rendering/RenderLayer.cpp | 5 ----- engine/core/rendering/RenderLayer.h | 5 +---- engine/web/WebLocalFrameImpl.cpp | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/engine/core/rendering/RenderLayer.cpp b/engine/core/rendering/RenderLayer.cpp index 7ff87f2d4..84d000d9b 100644 --- a/engine/core/rendering/RenderLayer.cpp +++ b/engine/core/rendering/RenderLayer.cpp @@ -797,11 +797,6 @@ static inline LayoutRect frameVisibleRect(RenderObject* renderer) return frameView->visibleContentRect(); } -bool RenderLayer::hitTest(const HitTestRequest& request, HitTestResult& result) -{ - return hitTest(request, result.hitTestLocation(), result); -} - bool RenderLayer::hitTest(const HitTestRequest& request, const HitTestLocation& hitTestLocation, HitTestResult& result) { ASSERT(isSelfPaintingLayer() || hasSelfPaintingLayerDescendant()); diff --git a/engine/core/rendering/RenderLayer.h b/engine/core/rendering/RenderLayer.h index 5fbbef54a..3e69137e9 100644 --- a/engine/core/rendering/RenderLayer.h +++ b/engine/core/rendering/RenderLayer.h @@ -149,11 +149,8 @@ public: void convertToLayerCoords(const RenderLayer* ancestorLayer, LayoutPoint&) const; void convertToLayerCoords(const RenderLayer* ancestorLayer, LayoutRect&) const; - // The two main functions that use the layer system. The paint method - // paints the layers that intersect the damage rect from back to - // front. The hitTest method looks for mouse events by walking + // The hitTest method looks for mouse events by walking // layers that intersect the point from front to back. - bool hitTest(const HitTestRequest&, HitTestResult&); bool hitTest(const HitTestRequest&, const HitTestLocation&, HitTestResult&); // Pass offsetFromRoot if known. diff --git a/engine/web/WebLocalFrameImpl.cpp b/engine/web/WebLocalFrameImpl.cpp index 79a4179b1..94d5c6480 100644 --- a/engine/web/WebLocalFrameImpl.cpp +++ b/engine/web/WebLocalFrameImpl.cpp @@ -496,7 +496,7 @@ VisiblePosition WebLocalFrameImpl::visiblePositionForWindowPoint(const WebPoint& { HitTestRequest request = HitTestRequest::Move | HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::IgnoreClipping; HitTestResult result(frame()->view()->windowToContents(roundedIntPoint(FloatPoint(point)))); - frame()->document()->renderView()->layer()->hitTest(request, result); + frame()->document()->renderView()->layer()->hitTest(request, result.hitTestLocation(), result); if (Node* node = result.targetNode()) return frame()->selection().selection().visiblePositionRespectingEditingBoundary(result.localPoint(), node); -- GitLab