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

Unified Diff: third_party/WebKit/Source/core/layout/line/InlineBox.cpp

Issue 1616673005: Revert "Fix-up a wrong hit testing when a parent inline has border radius." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | « third_party/WebKit/LayoutTests/fast/inline-block/hittest-child-of-inlineblock.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/line/InlineBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/line/InlineBox.cpp b/third_party/WebKit/Source/core/layout/line/InlineBox.cpp
index 781e32918360807579ff2d6bcb6b29f73c9c15b7..fceffdfd42f60992b4c009c0ef6e49f2ee05ca4d 100644
--- a/third_party/WebKit/Source/core/layout/line/InlineBox.cpp
+++ b/third_party/WebKit/Source/core/layout/line/InlineBox.cpp
@@ -226,17 +226,15 @@ bool InlineBox::nodeAtPoint(HitTestResult& result, const HitTestLocation& locati
if (parent()->lineLayoutItem().hasFlippedBlocksWritingMode()) // Faster than calling containingBlock().
childPoint = layoutObject().containingBlock()->flipForWritingModeForChild(&toLayoutBox(layoutObject()), childPoint);
- if (lineLayoutItem().hitTest(result, locationInContainer, childPoint))
- return true;
-
if (lineLayoutItem().style()->hasBorderRadius()) {
LayoutRect borderRect = logicalFrameRect();
borderRect.moveBy(accumulatedOffset);
FloatRoundedRect border = lineLayoutItem().style()->getRoundedBorderFor(borderRect);
- if (locationInContainer.intersects(border))
- return true;
+ if (!locationInContainer.intersects(border))
+ return false;
}
- return false;
+
+ return lineLayoutItem().hitTest(result, locationInContainer, childPoint);
}
const RootInlineBox& InlineBox::root() const
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/inline-block/hittest-child-of-inlineblock.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698