Title: [239346] trunk/Source/WebKit
- Revision
- 239346
- Author
- [email protected]
- Date
- 2018-12-18 11:45:24 -0800 (Tue, 18 Dec 2018)
Log Message
Unreviewed, fix the 32-bit watchOS build after r239314
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _zoomToFocusRect:selectionRect:insideFixed:fontSize:minimumScale:maximumScale:allowScaling:forceScroll:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (239345 => 239346)
--- trunk/Source/WebKit/ChangeLog 2018-12-18 19:43:55 UTC (rev 239345)
+++ trunk/Source/WebKit/ChangeLog 2018-12-18 19:45:24 UTC (rev 239346)
@@ -1,3 +1,10 @@
+2018-12-18 Wenson Hsieh <[email protected]>
+
+ Unreviewed, fix the 32-bit watchOS build after r239314
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _zoomToFocusRect:selectionRect:insideFixed:fontSize:minimumScale:maximumScale:allowScaling:forceScroll:]):
+
2018-12-18 Alex Christensen <[email protected]>
WKWebView has old URL while displaying SafeBrowsing interstitial, for link-click navigations
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (239345 => 239346)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-12-18 19:43:55 UTC (rev 239345)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-12-18 19:45:24 UTC (rev 239346)
@@ -2357,8 +2357,8 @@
// Adjust the min and max allowable scroll offsets, such that the selection rect remains visible.
minimumAllowableHorizontalOffsetInWebViewCoordinates = CGRectGetMaxX(selectionRectInNewScale) + caretOffsetFromWindowEdge - visibleSize.width;
minimumAllowableVerticalOffsetInWebViewCoordinates = CGRectGetMaxY(selectionRectInNewScale) + caretOffsetFromWindowEdge - visibleSize.height - visibleOffsetFromTop;
- maximumAllowableHorizontalOffsetInWebViewCoordinates = std::min(maximumAllowableHorizontalOffsetInWebViewCoordinates, CGRectGetMinX(selectionRectInNewScale) - caretOffsetFromWindowEdge);
- maximumAllowableVerticalOffsetInWebViewCoordinates = std::min(maximumAllowableVerticalOffsetInWebViewCoordinates, CGRectGetMinY(selectionRectInNewScale) - caretOffsetFromWindowEdge - visibleOffsetFromTop);
+ maximumAllowableHorizontalOffsetInWebViewCoordinates = std::min<CGFloat>(maximumAllowableHorizontalOffsetInWebViewCoordinates, CGRectGetMinX(selectionRectInNewScale) - caretOffsetFromWindowEdge);
+ maximumAllowableVerticalOffsetInWebViewCoordinates = std::min<CGFloat>(maximumAllowableVerticalOffsetInWebViewCoordinates, CGRectGetMinY(selectionRectInNewScale) - caretOffsetFromWindowEdge - visibleOffsetFromTop);
}
// Constrain the left edge in document coordinates so that:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
