Title: [227797] branches/safari-605-branch/Tools
- Revision
- 227797
- Author
- [email protected]
- Date
- 2018-01-30 10:49:41 -0800 (Tue, 30 Jan 2018)
Log Message
Cherry-pick r227563. rdar://problem/37019479
Modified Paths
Diff
Modified: branches/safari-605-branch/Tools/ChangeLog (227796 => 227797)
--- branches/safari-605-branch/Tools/ChangeLog 2018-01-30 18:47:51 UTC (rev 227796)
+++ branches/safari-605-branch/Tools/ChangeLog 2018-01-30 18:49:41 UTC (rev 227797)
@@ -1,3 +1,22 @@
+2018-01-30 Jason Marcell <[email protected]>
+
+ Cherry-pick r227563. rdar://problem/37019479
+
+ 2018-01-24 Ali Juma <[email protected]>
+
+ REGRESSION (r227430): ASSERTION FAILED: !self.zoomToScaleCompletionHandler in TestRunnerWKWebView::zoomToScale
+ https://bugs.webkit.org/show_bug.cgi?id=182052
+
+ Reviewed by Simon Fraser.
+
+ Don't set zoomToScaleCompletionHandler in zoomToScale:animated when calling the completion handler
+ immediately.
+
+ Test: fast/visual-viewport/viewport-dimensions.html
+
+ * WebKitTestRunner/cocoa/TestRunnerWKWebView.mm:
+ (-[TestRunnerWKWebView zoomToScale:animated:completionHandler:]):
+
2018-01-29 Jason Marcell <[email protected]>
Cherry-pick r227737. rdar://problem/36746140
Modified: branches/safari-605-branch/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm (227796 => 227797)
--- branches/safari-605-branch/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm 2018-01-30 18:47:51 UTC (rev 227796)
+++ branches/safari-605-branch/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm 2018-01-30 18:49:41 UTC (rev 227797)
@@ -127,7 +127,6 @@
- (void)zoomToScale:(double)scale animated:(BOOL)animated completionHandler:(void (^)(void))completionHandler
{
ASSERT(!self.zoomToScaleCompletionHandler);
- self.zoomToScaleCompletionHandler = completionHandler;
if (self.scrollView.zoomScale == scale) {
dispatch_async(dispatch_get_main_queue(), ^{
@@ -136,6 +135,7 @@
return;
}
+ self.zoomToScaleCompletionHandler = completionHandler;
[self.scrollView setZoomScale:scale animated:animated];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
