Title: [220024] branches/safari-604-branch/Source/WebKit
- Revision
- 220024
- Author
- [email protected]
- Date
- 2017-07-28 15:19:54 -0700 (Fri, 28 Jul 2017)
Log Message
Cherry-pick r219973. rdar://problem/33595608
Modified Paths
Diff
Modified: branches/safari-604-branch/Source/WebKit/ChangeLog (220023 => 220024)
--- branches/safari-604-branch/Source/WebKit/ChangeLog 2017-07-28 22:19:52 UTC (rev 220023)
+++ branches/safari-604-branch/Source/WebKit/ChangeLog 2017-07-28 22:19:54 UTC (rev 220024)
@@ -1,5 +1,26 @@
2017-07-28 Jason Marcell <[email protected]>
+ Cherry-pick r219973. rdar://problem/33595608
+
+ 2017-07-26 Tim Horton <[email protected]>
+
+ REGRESSION (r211160): Can't pinch to zoom unlocked encrypted PDFs in WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=174881
+ <rdar://problem/33556312>
+
+ Reviewed by Andy Estes.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _hidePasswordView]):
+ WKPasswordView saves and restores a bunch of scroll view properties, including
+ those relating to zoom limits. The restoration happens in -[WKPasswordView hide],
+ which is never called. Instead, the code added in r211160 just calls
+ removeFromSuperview after unlocking, never restoring the old zoom limits,
+ causing the then fully unlocked PDF to not be zoomable. Fix this by calling
+ -hide instead of -removeFromSuperview (which -hide also calls).
+
+2017-07-28 Jason Marcell <[email protected]>
+
Cherry-pick r219855. rdar://problem/33595427
2017-07-24 Chris Dumez <[email protected]>
Modified: branches/safari-604-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (220023 => 220024)
--- branches/safari-604-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2017-07-28 22:19:52 UTC (rev 220023)
+++ branches/safari-604-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2017-07-28 22:19:54 UTC (rev 220024)
@@ -2696,7 +2696,7 @@
return;
self._currentContentView.hidden = NO;
- [_passwordView removeFromSuperview];
+ [_passwordView hide];
_passwordView = nil;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
