Fix the Apple Internal build
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 May 2018 23:34:06 +0000 (23:34 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 May 2018 23:34:06 +0000 (23:34 +0000)
See <rdar://problem/40237873> for more details.

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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231777 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index 219e7d8..36085f4 100644 (file)
@@ -1,3 +1,17 @@
+2018-05-14  Daniel Bates  <dabates@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  <timothy@apple.com>
 
         WebHTMLView is not setting aside subviews when drawing.
index ec0df94..fd3d352 100644 (file)
@@ -207,9 +207,9 @@ static NSRect convertRectToScreen(NSWindow *window, NSRect rect)
     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 @@ static void setClipRectForWindow(NSWindow *window, NSRect clipRect)
     _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 @@ static void setClipRectForWindow(NSWindow *window, NSRect clipRect)
         
         [_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 @@ static void setClipRectForWindow(NSWindow *window, NSRect clipRect)
     if (!_isFullScreen)
         return;
     _isFullScreen = NO;
-    
-    // Screen updates to be re-enabled in beganExitFullScreenWithInitialFrame:finalFrame:
-    NSDisableScreenUpdates();
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    // Screen updates to be re-enabled in beganExitFullScreenWithInitialFrame:finalFrame:
+    NSDisableScreenUpdates();
     [[self window] setAutodisplay:NO];
 #pragma clang diagnostic pop
 
@@ -353,9 +359,12 @@ static void setClipRectForWindow(NSWindow *window, NSRect clipRect)
     _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 @@ static void setClipRectForWindow(NSWindow *window, NSRect clipRect)
 
     [[_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 @@ static NSRect windowFrameFromApparentFrames(NSRect screenFrame, NSRect initialFr
     [[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 @@ static NSRect windowFrameFromApparentFrames(NSRect screenFrame, NSRect initialFr
 #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