Changeset 203792 in webkit

Timestamp:

Jul 27, 2016 2:10:23 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Fullscreen video zoom button does not work after rotating when aspect ratio matches display.
​https://bugs.webkit.org/show_bug.cgi?id=160263
rdar://problem/27368872

Patch by Jeremy Jones <​jeremyj@apple.com> on 2016-07-27
Reviewed by Eric Carlson.

When video and display aspect ratio match, and rotating from landscape to protrait, the transform used in layout
will be Identity. This means checking the transform for identity is an insufficient test to see if the bounds
need to be resolved.

Instead, always attempt to resolve the bounds and do a more accurate test while doing so.

• platform/ios/WebVideoFullscreenInterfaceAVKit.mm:

(-[WebAVPlayerLayer layoutSublayers]):
(-[WebAVPlayerLayer resolveBounds]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/WebVideoFullscreenInterfaceAVKit.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-07-27  Jeremy Jones  <jeremyj@apple.com>
+
+        Fullscreen video zoom button does not work after rotating when aspect ratio matches display.
+        https://bugs.webkit.org/show_bug.cgi?id=160263
+        rdar://problem/27368872
+
+        Reviewed by Eric Carlson.
+
+        When video and display aspect ratio match, and rotating from landscape to protrait, the transform used in layout
+        will be Identity. This means checking the transform for identity is an insufficient test to see if the bounds
+        need to be resolved.
+
+        Instead, always attempt to resolve the bounds and do a more accurate test while doing so.
+
+        * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+        (-[WebAVPlayerLayer layoutSublayers]):
+        (-[WebAVPlayerLayer resolveBounds]):
+
 2016-07-27  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm

@@ -270 +270 @@
         [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(resolveBounds) object:nil];
 
-        if (!CGAffineTransformIsIdentity(transform))
-            [self performSelector:@selector(resolveBounds) withObject:nil afterDelay:animationDuration + 0.1];
+        [self performSelector:@selector(resolveBounds) withObject:nil afterDelay:animationDuration + 0.1];
     });
 }
@@ -282 +281 @@
     
     if ([_videoSublayer superlayer] != self)
+        return;
+    
+    if (CGRectEqualToRect(self.modelVideoLayerFrame, [self bounds]) && CGAffineTransformIsIdentity([(UIView *)[_videoSublayer delegate] transform]))
         return;
     
@@ -288 +290 @@
     [CATransaction setDisableActions:YES];
     
-    self.modelVideoLayerFrame = [self bounds];
-    ASSERT(_fullscreenInterface->model());
-    _fullscreenInterface->model()->setVideoLayerFrame(self.modelVideoLayerFrame);
+    if (!CGRectEqualToRect(self.modelVideoLayerFrame, [self bounds])) {
+        self.modelVideoLayerFrame = [self bounds];
+        ASSERT(_fullscreenInterface->model());
+        _fullscreenInterface->model()->setVideoLayerFrame(self.modelVideoLayerFrame);
+    }
     [(UIView *)[_videoSublayer delegate] setTransform:CGAffineTransformIdentity];