Title: [226454] trunk/Source/WebKit
- Revision
- 226454
- Author
- [email protected]
- Date
- 2018-01-05 11:09:47 -0800 (Fri, 05 Jan 2018)
Log Message
Fixed the build following AppKit API deprecations in a recent SDKs
* UIProcess/mac/WKFullScreenWindowController.mm:
(-[WKFullScreenWindowController enterFullScreen:]): Suppressed deprecation warnings.
(-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]): Ditto.
(-[WKFullScreenWindowController exitFullScreen]): Ditto.
(-[WKFullScreenWindowController finishedExitFullScreenAnimation:]): Ditto.
(-[WKFullScreenWindowController completeFinishExitFullScreenAnimationAfterRepaint]): Ditto.
(-[WKFullScreenWindowController _startEnterFullScreenAnimationWithDuration:]): Ditto.
(-[WKFullScreenWindowController _startExitFullScreenAnimationWithDuration:]): Ditto.
* UIProcess/mac/WKPrintingView.mm:
(-[WKPrintingView _setAutodisplay:]): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (226453 => 226454)
--- trunk/Source/WebKit/ChangeLog 2018-01-05 19:01:48 UTC (rev 226453)
+++ trunk/Source/WebKit/ChangeLog 2018-01-05 19:09:47 UTC (rev 226454)
@@ -1,3 +1,18 @@
+2018-01-05 Dan Bernstein <[email protected]>
+
+ Fixed the build following AppKit API deprecations in a recent SDKs
+
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (-[WKFullScreenWindowController enterFullScreen:]): Suppressed deprecation warnings.
+ (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]): Ditto.
+ (-[WKFullScreenWindowController exitFullScreen]): Ditto.
+ (-[WKFullScreenWindowController finishedExitFullScreenAnimation:]): Ditto.
+ (-[WKFullScreenWindowController completeFinishExitFullScreenAnimationAfterRepaint]): Ditto.
+ (-[WKFullScreenWindowController _startEnterFullScreenAnimationWithDuration:]): Ditto.
+ (-[WKFullScreenWindowController _startExitFullScreenAnimationWithDuration:]): Ditto.
+ * UIProcess/mac/WKPrintingView.mm:
+ (-[WKPrintingView _setAutodisplay:]): Ditto.
+
2018-01-05 Matt Lewis <[email protected]>
Unreviewed, rolling out r226401.
Modified: trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm (226453 => 226454)
--- trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm 2018-01-05 19:01:48 UTC (rev 226453)
+++ trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm 2018-01-05 19:09:47 UTC (rev 226454)
@@ -227,7 +227,10 @@
// Screen updates to be re-enabled in _startEnterFullScreenAnimationWithDuration:
NSDisableScreenUpdates();
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[[self window] setAutodisplay:NO];
+#pragma clang diagnostic pop
[self _manager]->saveScrollPosition();
_savedTopContentInset = _page->topContentInset();
@@ -303,7 +306,10 @@
// Transition to fullscreen failed. Clean up.
_fullScreenState = NotInFullScreen;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[[self window] setAutodisplay:YES];
+#pragma clang diagnostic pop
_page->setSuppressVisibilityUpdates(false);
NSResponder *firstResponder = [[self window] firstResponder];
@@ -340,7 +346,10 @@
// Screen updates to be re-enabled in _startExitFullScreenAnimationWithDuration: or beganExitFullScreenWithInitialFrame:finalFrame:
NSDisableScreenUpdates();
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[[self window] setAutodisplay:NO];
+#pragma clang diagnostic pop
// See the related comment in enterFullScreen:
// We will resume the normal behavior in _startExitFullScreenAnimationWithDuration:
@@ -400,7 +409,10 @@
NSView *contentView = [[self window] contentView];
contentView.hidden = YES;
[_backgroundView.get().layer removeAllAnimations];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[[_webViewPlaceholder window] setAutodisplay:NO];
+#pragma clang diagnostic pop
[self _replaceView:_webViewPlaceholder.get() with:_webView];
BEGIN_BLOCK_OBJC_EXCEPTIONS
@@ -433,7 +445,10 @@
- (void)completeFinishExitFullScreenAnimationAfterRepaint
{
_repaintCallback = nullptr;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[[_webView window] setAutodisplay:YES];
+#pragma clang diagnostic pop
[[_webView window] displayIfNeeded];
_page->setSuppressVisibilityUpdates(false);
NSEnableScreenUpdates();
@@ -627,7 +642,10 @@
[window makeFirstResponder:_webView];
_page->setSuppressVisibilityUpdates(false);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[[self window] setAutodisplay:YES];
+#pragma clang diagnostic pop
[[self window] displayIfNeeded];
NSEnableScreenUpdates();
}
@@ -652,7 +670,10 @@
[_backgroundView.get().layer addAnimation:fadeAnimation(duration, AnimateOut) forKey:@"fullscreen"];
_page->setSuppressVisibilityUpdates(false);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[[self window] setAutodisplay:YES];
+#pragma clang diagnostic pop
[[self window] displayIfNeeded];
NSEnableScreenUpdates();
}
Modified: trunk/Source/WebKit/UIProcess/mac/WKPrintingView.mm (226453 => 226454)
--- trunk/Source/WebKit/UIProcess/mac/WKPrintingView.mm 2018-01-05 19:01:48 UTC (rev 226453)
+++ trunk/Source/WebKit/UIProcess/mac/WKPrintingView.mm 2018-01-05 19:09:47 UTC (rev 226454)
@@ -78,10 +78,16 @@
- (void)_setAutodisplay:(BOOL)newState
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if (!newState && [[_wkView window] isAutodisplay])
+#pragma clang diagnostic pop
[_wkView displayIfNeeded];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[[_wkView window] setAutodisplay:newState];
+#pragma clang diagnostic pop
// For some reason, painting doesn't happen for a long time without this call, <rdar://problem/8975229>.
if (newState)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
