diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 10:22:43 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 12:36:28 +0000 |
commit | 271a6c3487a14599023a9106329505597638d793 (patch) | |
tree | e040d58ffc86c1480b79ca8528020ca9ec919bf8 /chromium/third_party/blink/renderer/core/layout/layout_text_control_multi_line.cc | |
parent | 7b2ffa587235a47d4094787d72f38102089f402a (diff) | |
download | qtwebengine-chromium-271a6c3487a14599023a9106329505597638d793.tar.gz |
BASELINE: Update Chromium to 77.0.3865.59
Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/layout/layout_text_control_multi_line.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/layout/layout_text_control_multi_line.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/chromium/third_party/blink/renderer/core/layout/layout_text_control_multi_line.cc b/chromium/third_party/blink/renderer/core/layout/layout_text_control_multi_line.cc index 0395634b474..ef3a634471d 100644 --- a/chromium/third_party/blink/renderer/core/layout/layout_text_control_multi_line.cc +++ b/chromium/third_party/blink/renderer/core/layout/layout_text_control_multi_line.cc @@ -38,21 +38,20 @@ LayoutTextControlMultiLine::~LayoutTextControlMultiLine() = default; bool LayoutTextControlMultiLine::NodeAtPoint( HitTestResult& result, - const HitTestLocation& location_in_container, - const LayoutPoint& accumulated_offset, + const HitTestLocation& hit_test_location, + const PhysicalOffset& accumulated_offset, HitTestAction hit_test_action) { - if (!LayoutTextControl::NodeAtPoint(result, location_in_container, + if (!LayoutTextControl::NodeAtPoint(result, hit_test_location, accumulated_offset, hit_test_action)) return false; + const LayoutObject* stop_node = result.GetHitTestRequest().GetStopNode(); + if (stop_node && stop_node->NodeForHitTest() == result.InnerNode()) + return true; + if (result.InnerNode() == GetNode() || - result.InnerNode() == InnerEditorElement()) { - const LayoutObject* stop_node = result.GetHitTestRequest().GetStopNode(); - if (!stop_node || stop_node->NodeForHitTest() != result.InnerNode()) { - HitInnerEditorElement(result, location_in_container.Point(), - accumulated_offset); - } - } + result.InnerNode() == InnerEditorElement()) + HitInnerEditorElement(result, hit_test_location, accumulated_offset); return true; } |