Title: [171135] trunk/Source/WebKit2
- Revision
- 171135
- Author
- benja...@webkit.org
- Date
- 2014-07-15 20:56:41 -0700 (Tue, 15 Jul 2014)
Log Message
Fix r171124
Patch by Benjamin Poulain <bpoul...@apple.com> on 2014-07-15
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _scrollToContentOffset:]):
On landing, I changed the min/max branches to shrunkTo/expandedTo, but the return value
of those was ignored.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (171134 => 171135)
--- trunk/Source/WebKit2/ChangeLog 2014-07-16 03:07:03 UTC (rev 171134)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-16 03:56:41 UTC (rev 171135)
@@ -1,3 +1,12 @@
+2014-07-15 Benjamin Poulain <bpoul...@apple.com>
+
+ Fix r171124
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _scrollToContentOffset:]):
+ On landing, I changed the min/max branches to shrunkTo/expandedTo, but the return value
+ of those was ignored.
+
2014-07-15 Dan Bernstein <m...@apple.com>
WKWebView’s FormClient::willSubmitForm should use CompletionHandlerCallChecker
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (171134 => 171135)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-07-16 03:07:03 UTC (rev 171134)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-07-16 03:56:41 UTC (rev 171135)
@@ -997,8 +997,8 @@
float maximumHorizontalOffset = documentSizeInSelfCoordinates.width() - unobscuredRectSize.width();
float maximumVerticalOffset = documentSizeInSelfCoordinates.height() - unobscuredRectSize.height();
- contentOffsetInDocument.shrunkTo(WebCore::FloatPoint(maximumHorizontalOffset, maximumVerticalOffset));
- contentOffsetInDocument.expandedTo(WebCore::FloatPoint(0, 0));
+ contentOffsetInDocument = contentOffsetInDocument.shrunkTo(WebCore::FloatPoint(maximumHorizontalOffset, maximumVerticalOffset));
+ contentOffsetInDocument = contentOffsetInDocument.expandedTo(WebCore::FloatPoint(0, 0));
[_scrollView _stopScrollingAndZoomingAnimations];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
