Title: [231811] trunk/Source/WebKit
- Revision
- 231811
- Author
- [email protected]
- Date
- 2018-05-15 12:04:22 -0700 (Tue, 15 May 2018)
Log Message
Fix the Apple Internal build
Make a similar change to WebKit as I did for LegacyWebKit in r231777. See <rdar://problem/40237873> for more details.
* UIProcess/mac/WKFullScreenWindowController.mm:
(-[WKFullScreenWindowController enterFullScreen:]):
(-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
(-[WKFullScreenWindowController exitFullScreen]):
(-[WKFullScreenWindowController beganExitFullScreenWithInitialFrame:finalFrame:]):
(-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
(-[WKFullScreenWindowController completeFinishExitFullScreenAnimationAfterRepaint]):
(-[WKFullScreenWindowController _startEnterFullScreenAnimationWithDuration:]):
(-[WKFullScreenWindowController _startExitFullScreenAnimationWithDuration:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (231810 => 231811)
--- trunk/Source/WebKit/ChangeLog 2018-05-15 18:48:11 UTC (rev 231810)
+++ trunk/Source/WebKit/ChangeLog 2018-05-15 19:04:22 UTC (rev 231811)
@@ -1,3 +1,19 @@
+2018-05-15 Daniel Bates <[email protected]>
+
+ Fix the Apple Internal build
+
+ Make a similar change to WebKit as I did for LegacyWebKit in r231777. See <rdar://problem/40237873> for more details.
+
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (-[WKFullScreenWindowController enterFullScreen:]):
+ (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
+ (-[WKFullScreenWindowController exitFullScreen]):
+ (-[WKFullScreenWindowController beganExitFullScreenWithInitialFrame:finalFrame:]):
+ (-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
+ (-[WKFullScreenWindowController completeFinishExitFullScreenAnimationAfterRepaint]):
+ (-[WKFullScreenWindowController _startEnterFullScreenAnimationWithDuration:]):
+ (-[WKFullScreenWindowController _startExitFullScreenAnimationWithDuration:]):
+
2018-05-15 Megan Gardner <[email protected]>
Clear selections from web content with single tap
Modified: trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm (231810 => 231811)
--- trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm 2018-05-15 18:48:11 UTC (rev 231810)
+++ trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm 2018-05-15 19:04:22 UTC (rev 231811)
@@ -225,10 +225,10 @@
// future overhead.
webViewContents = createImageWithCopiedData(webViewContents.get());
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
// 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
@@ -287,8 +287,11 @@
if (completed) {
_fullScreenState = InFullScreen;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
// Screen updates to be re-enabled ta the end of the current block.
NSDisableScreenUpdates();
+#pragma clang diagnostic pop
[self _manager]->didEnterFullScreen();
[self _manager]->setAnimatingFullScreen(false);
@@ -328,7 +331,10 @@
[self _manager]->setAnimatingFullScreen(false);
}
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSEnableScreenUpdates();
+#pragma clang diagnostic pop
if (_requestedExitFullScreen) {
_requestedExitFullScreen = NO;
@@ -358,10 +364,10 @@
[_webViewPlaceholder setExitWarningVisible:NO];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
// 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
@@ -393,7 +399,10 @@
// Because we are breaking the normal animation pattern, re-enable screen updates
// as exitFullScreen has disabled them, but _startExitFullScreenAnimationWithDuration:
// will never be called.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSEnableScreenUpdates();
+#pragma clang diagnostic pop
}
[[self window] exitFullScreenMode:self];
@@ -416,8 +425,11 @@
NSResponder *firstResponder = [[self window] firstResponder];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
// Screen updates to be re-enabled in completeFinishExitFullScreenAnimationAfterRepaint.
NSDisableScreenUpdates();
+#pragma clang diagnostic pop
_page->setSuppressVisibilityUpdates(true);
[[self window] orderOut:self];
NSView *contentView = [[self window] contentView];
@@ -465,7 +477,10 @@
#pragma clang diagnostic pop
[[_webView window] displayIfNeeded];
_page->setSuppressVisibilityUpdates(false);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSEnableScreenUpdates();
+#pragma clang diagnostic pop
}
- (void)performClose:(id)sender
@@ -666,7 +681,10 @@
[[self window] setAutodisplay:YES];
#pragma clang diagnostic pop
[[self window] displayIfNeeded];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSEnableScreenUpdates();
+#pragma clang diagnostic pop
}
- (void)_startExitFullScreenAnimationWithDuration:(NSTimeInterval)duration
@@ -694,7 +712,10 @@
[[self window] setAutodisplay:YES];
#pragma clang diagnostic pop
[[self window] displayIfNeeded];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSEnableScreenUpdates();
+#pragma clang diagnostic pop
}
- (void)_watchdogTimerFired:(NSTimer *)timer
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
