Changeset 220390 in webkit

Timestamp:

Aug 8, 2017 12:29:26 AM (7 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r220248. rdar://problem/33754458

Location:

branches/safari-604-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/WebVideoFullscreenController.mm (modified) (4 diffs)

branches/safari-604-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-08  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r220248. rdar://problem/33754458
+
+    2017-08-03  Jeremy Jones  <jeremyj@apple.com>
+
+            Improve WebKitLegacy video fullscreen animation begin and end rects.
+            https://bugs.webkit.org/show_bug.cgi?id=175152
+            rdar://problem/32840576
+
+            Reviewed by Eric Carlson.
+
+            No new tests, becuase this change has no effect on the DOM.
+
+            This change uses different rects for fullscreen animation to prevent the animation
+            from failing, and to improve the aesthetics of the animation.
+
+            * platform/mac/WebVideoFullscreenController.mm:
+            (frameExpandedToRatioOfFrame):
+            (-[WebVideoFullscreenController enterFullscreen:]):
+            (-[WebVideoFullscreenController exitFullscreen]):
+            (-[WebVideoFullscreenWindow animateFromRect:toRect:withSubAnimation:controllerAction:]):
+            (constrainFrameToRatioOfFrame): Deleted.
+
 2017-08-08  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-604-branch/Source/WebCore/platform/mac/WebVideoFullscreenController.mm

@@ -234 +234 @@
 // MARK: Exposed Interface
 
-static void constrainFrameToRatioOfFrame(NSRect *frameToConstrain, const NSRect *frame)
+static NSRect frameExpandedToRatioOfFrame(NSRect frameToExpand, NSRect frame)
 {
     // Keep a constrained aspect ratio for the destination window
-    CGFloat originalRatio = frame->size.width / frame->size.height;
-    CGFloat newRatio = frameToConstrain->size.width / frameToConstrain->size.height;
+    NSRect result = frameToExpand;
+    CGFloat newRatio = frame.size.width / frame.size.height;
+    CGFloat originalRatio = frameToExpand.size.width / frameToExpand.size.height;
     if (newRatio > originalRatio) {
-        CGFloat newWidth = originalRatio * frameToConstrain->size.height;
-        CGFloat diff = frameToConstrain->size.width - newWidth;
-        frameToConstrain->size.width = newWidth;
-        frameToConstrain->origin.x += diff / 2;
+        CGFloat newWidth = newRatio * frameToExpand.size.height;
+        CGFloat diff = newWidth - frameToExpand.size.width;
+        result.size.width = newWidth;
+        result.origin.x -= diff / 2;
     } else {
-        CGFloat newHeight = frameToConstrain->size.width / originalRatio;
-        CGFloat diff = frameToConstrain->size.height - newHeight;
-        frameToConstrain->size.height = newHeight;
-        frameToConstrain->origin.y += diff / 2;
-    }    
+        CGFloat newHeight = frameToExpand.size.width / newRatio;
+        CGFloat diff = newHeight - frameToExpand.size.height;
+        result.size.height = newHeight;
+        result.origin.y -= diff / 2;
+    }
+    return result;
 }
 
@@ -278 +280 @@
         screen = [NSScreen mainScreen];
 
-    NSRect frame = [self videoElementRect];
     NSRect endFrame = [screen frame];
-    constrainFrameToRatioOfFrame(&endFrame, &frame);
+    NSRect frame = frameExpandedToRatioOfFrame([self videoElementRect], endFrame);
 
     // Create a black window if needed
@@ -317 +318 @@
     // Balanced in windowDidExitFullscreen
     [self retain];    
-    
-    [[self fullscreenWindow] animateFromRect:[[self window] frame] toRect:endFrame withSubAnimation:_fadeAnimation controllerAction:@selector(windowDidExitFullscreen)];
+
+    NSRect startFrame = [[self window] frame];
+    endFrame = frameExpandedToRatioOfFrame(endFrame, startFrame);
+
+    [[self fullscreenWindow] animateFromRect:startFrame toRect:endFrame withSubAnimation:_fadeAnimation controllerAction:@selector(windowDidExitFullscreen)];
 }
 
@@ -505 +509 @@
         // We'll downscale the window during the animation based on the higher resolution rect
         BOOL higherResolutionIsEndRect = startRect.size.width < endRect.size.width && startRect.size.height < endRect.size.height;
-        [self setFrame:higherResolutionIsEndRect ? endRect : startRect display:NO];        
+        [self setFrame:higherResolutionIsEndRect ? endRect : startRect display:NO];
     }