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

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

Issue 1308173007: Correct touch rect hit-test against iframe with scrolled content (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: optimization that only calling nodeAtPointOverWidget() once Created 5 years, 3 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 | « LayoutTests/fast/dom/nodesFromRect/resources/child-frame-scrolled.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutPart.cpp
diff --git a/Source/core/layout/LayoutPart.cpp b/Source/core/layout/LayoutPart.cpp
index 1f21e6f37993227580d6f39d4d2a665acaf6a9b8..f984289626dd96a3c8499242d1041fbb0cb4dbe2 100644
--- a/Source/core/layout/LayoutPart.cpp
+++ b/Source/core/layout/LayoutPart.cpp
@@ -184,8 +184,19 @@ bool LayoutPart::nodeAtPoint(HitTestResult& result, const HitTestLocation& locat
result = childFrameResult;
}
- if (isInsideChildFrame)
- return true;
+ // Don't trust |isInsideChildFrame|. Returns true only when the hit test
+ // point/rect is totally within the iframe, i.e. nodeAtPointOverWidget()
+ // also returns true.
+ // Use a temparory HitTestResult because we don't want to collect the
+ // iframe element itself if the hit-test rect is totally within the iframe.
+ if (isInsideChildFrame) {
dtapuska 2015/09/08 20:07:48 I presume this code path isn't necessary for the n
Yufeng Shen (Slow to review) 2015/09/08 22:08:42 done.
+ HitTestResult pointOverWidgetResult = result;
+ bool pointOverWidget = nodeAtPointOverWidget(pointOverWidgetResult, locationInContainer, accumulatedOffset, action);
+ if (pointOverWidget)
+ return true;
+ result = pointOverWidgetResult;
+ return false;
+ }
}
}
« no previous file with comments | « LayoutTests/fast/dom/nodesFromRect/resources/child-frame-scrolled.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698