Title: [174229] branches/safari-600.1.4.11-branch/Source/WebCore
- Revision
- 174229
- Author
- [email protected]
- Date
- 2014-10-02 13:56:52 -0700 (Thu, 02 Oct 2014)
Log Message
Merged r174199. <rdar://problem/18459443>
Modified Paths
Diff
Modified: branches/safari-600.1.4.11-branch/Source/WebCore/ChangeLog (174228 => 174229)
--- branches/safari-600.1.4.11-branch/Source/WebCore/ChangeLog 2014-10-02 20:54:21 UTC (rev 174228)
+++ branches/safari-600.1.4.11-branch/Source/WebCore/ChangeLog 2014-10-02 20:56:52 UTC (rev 174229)
@@ -1,3 +1,32 @@
+2014-10-02 Babak Shafiei <[email protected]>
+
+ Merge r174199.
+
+ 2014-10-01 Benjamin Poulain <[email protected]>
+
+ Click events offset in webkit-overflow-scrolling iframes
+ https://bugs.webkit.org/show_bug.cgi?id=134596
+
+ Reviewed by Sam Weinig.
+
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::visibleContentRectInternal):
+ When converting coordinates from the main frame to a subframe's document, the position
+ is first converted to the subframe's FrameView coordinate system, then offset by the scroll
+ offset of the subframe itself.
+
+ The bug in this case was that the scroll offset used was the global scroll offset of the frame
+ in the view instead of the scroll offset of the document in its own frameview.
+
+ The regression was introduced by the refactoring r162663. On iOS WebKit1, the coordinate system
+ is different depending on VisibleContentRectIncludesScrollbars. In r162663, the value was set
+ such that the rect returned is always in absolute coordinate.
+
+ The ideal solution would be to refactor ScrollView::platformVisibleContentRect() to always return
+ the offsets in scroll view coordinates and verify and update all the call sites to use explicit
+ conversion to the top frame. In this patch I only reverted the coordinate change of r162663 to avoid
+ large scale impact.
+
2014-09-18 Babak Shafiei <[email protected]>
Merge patch for <rdar://problem/18382131>.
Modified: branches/safari-600.1.4.11-branch/Source/WebCore/platform/ScrollView.cpp (174228 => 174229)
--- branches/safari-600.1.4.11-branch/Source/WebCore/platform/ScrollView.cpp 2014-10-02 20:54:21 UTC (rev 174228)
+++ branches/safari-600.1.4.11-branch/Source/WebCore/platform/ScrollView.cpp 2014-10-02 20:56:52 UTC (rev 174229)
@@ -310,7 +310,7 @@
#if PLATFORM(IOS)
if (visibleContentRectBehavior == LegacyIOSDocumentViewRect) {
if (platformWidget())
- return platformVisibleContentRect(true /* include scrollbars */);
+ return platformVisibleContentRect(scrollbarInclusion == IncludeScrollbars);
}
if (platformWidget())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
