[webkit-changes] [231777] trunk/Source/WebKitLegacy/mac

[dbates]

Title: [231777] trunk/Source/WebKitLegacy/mac

Revision

231777

Author

dba...@webkit.org

Date

2018-05-14 16:34:06 -0700 (Mon, 14 May 2018)

Log Message

Fix the Apple Internal build

See <rdar://problem/40237873> for more details.

* WebView/WebFullScreenController.mm:
(-[WebFullScreenController enterFullScreen:]):
(-[WebFullScreenController finishedEnterFullScreenAnimation:]):
(-[WebFullScreenController exitFullScreen]):
(-[WebFullScreenController finishedExitFullScreenAnimation:]):
(-[WebFullScreenController _startEnterFullScreenAnimationWithDuration:]):
(-[WebFullScreenController _startExitFullScreenAnimationWithDuration:]):

Modified Paths

• trunk/Source/WebKitLegacy/mac/ChangeLog
• trunk/Source/WebKitLegacy/mac/WebView/WebFullScreenController.mm

Diff

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (231776 => 231777)

--- trunk/Source/WebKitLegacy/mac/ChangeLog	2018-05-14 23:19:29 UTC (rev 231776)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2018-05-14 23:34:06 UTC (rev 231777)
@@ -1,3 +1,17 @@
+2018-05-14  Daniel Bates  <daba...@apple.com>
+
+        Fix the Apple Internal build
+
+        See <rdar://problem/40237873> for more details.
+
+        * WebView/WebFullScreenController.mm:
+        (-[WebFullScreenController enterFullScreen:]):
+        (-[WebFullScreenController finishedEnterFullScreenAnimation:]):
+        (-[WebFullScreenController exitFullScreen]):
+        (-[WebFullScreenController finishedExitFullScreenAnimation:]):
+        (-[WebFullScreenController _startEnterFullScreenAnimationWithDuration:]):
+        (-[WebFullScreenController _startExitFullScreenAnimationWithDuration:]):
+
 2018-05-11  Timothy Hatcher  <timo...@apple.com>
 
         WebHTMLView is not setting aside subviews when drawing.

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebFullScreenController.mm (231776 => 231777)

--- trunk/Source/WebKitLegacy/mac/WebView/WebFullScreenController.mm	2018-05-14 23:19:29 UTC (rev 231776)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebFullScreenController.mm	2018-05-14 23:34:06 UTC (rev 231777)
@@ -207,9 +207,9 @@
     RetainPtr<CGImageRef> webViewContents = adoptCF(CGWindowListCreateImage(NSRectToCGRect(webViewFrame), kCGWindowListOptionIncludingWindow, windowID, kCGWindowImageShouldBeOpaque));
     
     // Screen updates to be re-enabled in beganEnterFullScreenWithInitialFrame:finalFrame:
-    NSDisableScreenUpdates();
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    NSDisableScreenUpdates();
     [[self window] setAutodisplay:NO];
 #pragma clang diagnostic pop
 
@@ -268,8 +268,11 @@
     _isEnteringFullScreen = NO;
     
     if (completed) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         // Screen updates to be re-enabled at the end of this block
         NSDisableScreenUpdates();
+#pragma clang diagnostic pop
         [self _document]->setAnimatingFullScreen(false);
         [self _document]->webkitDidEnterFullScreenForElement(_element.get());
         
@@ -291,7 +294,10 @@
         
         [_backgroundWindow.get() orderOut:self];
         [_backgroundWindow.get() setFrame:NSZeroRect display:YES];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         NSEnableScreenUpdates();
+#pragma clang diagnostic pop
     } else
         [_scaleAnimation.get() stopAnimation];
 }
@@ -308,11 +314,11 @@
     if (!_isFullScreen)
         return;
     _isFullScreen = NO;
-    
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     // Screen updates to be re-enabled in beganExitFullScreenWithInitialFrame:finalFrame:
     NSDisableScreenUpdates();
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     [[self window] setAutodisplay:NO];
 #pragma clang diagnostic pop
 
@@ -353,9 +359,12 @@
     _isExitingFullScreen = NO;
     
     [self _updateMenuAndDockForFullScreen];
-    
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     // Screen updates to be re-enabled at the end of this function
     NSDisableScreenUpdates();
+#pragma clang diagnostic pop
 
     [self _document]->setAnimatingFullScreen(false);
     [self _document]->webkitDidExitFullScreenForElement(_element.get());
@@ -382,7 +391,10 @@
 
     [[_webView window] makeKeyAndOrderFront:self];
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     NSEnableScreenUpdates();
+#pragma clang diagnostic pop
 }
 
 - (void)performClose:(id)sender
@@ -536,8 +548,11 @@
     [[self window] setAutodisplay:YES];
 #pragma clang diagnostic pop
     [[self window] displayIfNeeded];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     // Screen updates disabled in enterFullScreen:
     NSEnableScreenUpdates();
+#pragma clang diagnostic pop
 }
 
 - (void)_startExitFullScreenAnimationWithDuration:(NSTimeInterval)duration
@@ -588,8 +603,11 @@
 #pragma clang diagnostic pop
     [[self window] displayIfNeeded];
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     // Screen updates disabled in exitFullScreen:
     NSEnableScreenUpdates();
+#pragma clang diagnostic pop
 }
 
 @end

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes