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

Unified Diff: sky/engine/core/rendering/RenderObject.cpp

Issue 924273002: Remove HitTestFilter. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: rebase Created 5 years, 10 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 | « sky/engine/core/rendering/RenderObject.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderObject.cpp
diff --git a/sky/engine/core/rendering/RenderObject.cpp b/sky/engine/core/rendering/RenderObject.cpp
index b9afa5dcbb1fa536ea830a6527740faea35f139a..8a93f1c9454cf1a49e024c66e5774e76c297fcaa 100644
--- a/sky/engine/core/rendering/RenderObject.cpp
+++ b/sky/engine/core/rendering/RenderObject.cpp
@@ -1674,18 +1674,13 @@ PositionWithAffinity RenderObject::positionForPoint(const LayoutPoint&)
return createPositionWithAffinity(caretMinOffset(), DOWNSTREAM);
}
-bool RenderObject::hitTest(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestFilter hitTestFilter)
+bool RenderObject::hitTest(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset)
{
- bool inside = false;
- if (hitTestFilter != HitTestSelf) {
- // First test the foreground layer (lines and inlines).
- inside = nodeAtPoint(request, result, locationInContainer, accumulatedOffset, HitTestForeground);
- }
-
+ // First test the foreground layer (lines and inlines).
+ bool inside = nodeAtPoint(request, result, locationInContainer, accumulatedOffset, HitTestForeground);
// See if the mouse is inside us but not any of our descendants
- if (hitTestFilter != HitTestDescendants && !inside)
+ if (!inside)
inside = nodeAtPoint(request, result, locationInContainer, accumulatedOffset, HitTestBlockBackground);
-
return inside;
}
« no previous file with comments | « sky/engine/core/rendering/RenderObject.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698