Title: [234390] branches/safari-606-branch/Source/WebCore
- Revision
- 234390
- Author
- [email protected]
- Date
- 2018-07-30 15:01:40 -0700 (Mon, 30 Jul 2018)
Log Message
Revert r234044. rdar://problem/42433225
Modified Paths
Diff
Modified: branches/safari-606-branch/Source/WebCore/ChangeLog (234389 => 234390)
--- branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-30 22:01:38 UTC (rev 234389)
+++ branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-30 22:01:40 UTC (rev 234390)
@@ -1,5 +1,9 @@
2018-07-30 Kocsen Chung <[email protected]>
+ Revert r234044. rdar://problem/42433225
+
+2018-07-30 Kocsen Chung <[email protected]>
+
Revert r234051. rdar://problem/42451584
2018-07-30 Babak Shafiei <[email protected]>
Modified: branches/safari-606-branch/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm (234389 => 234390)
--- branches/safari-606-branch/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm 2018-07-30 22:01:38 UTC (rev 234389)
+++ branches/safari-606-branch/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm 2018-07-30 22:01:40 UTC (rev 234390)
@@ -289,8 +289,8 @@
} else if ([getAVLayerVideoGravityResizeAspectFill() isEqualToString:self.videoGravity]) {
sourceVideoFrame = smallestRectWithAspectRatioAroundRect(videoAspectRatio, self.modelVideoLayerFrame);
self.modelVideoLayerFrame = CGRectMake(0, 0, sourceVideoFrame.width(), sourceVideoFrame.height());
- if (auto* model = _fullscreenInterface->videoFullscreenModel())
- model->setVideoLayerFrame(self.modelVideoLayerFrame);
+ ASSERT(_fullscreenInterface->videoFullscreenModel());
+ _fullscreenInterface->videoFullscreenModel()->setVideoLayerFrame(self.modelVideoLayerFrame);
targetVideoFrame = smallestRectWithAspectRatioAroundRect(videoAspectRatio, self.bounds);
} else
ASSERT_NOT_REACHED();
@@ -325,8 +325,8 @@
if (!CGRectEqualToRect(self.modelVideoLayerFrame, [self bounds])) {
self.modelVideoLayerFrame = [self bounds];
- if (auto* model = _fullscreenInterface->videoFullscreenModel())
- model->setVideoLayerFrame(self.modelVideoLayerFrame);
+ ASSERT(_fullscreenInterface->videoFullscreenModel());
+ _fullscreenInterface->videoFullscreenModel()->setVideoLayerFrame(self.modelVideoLayerFrame);
}
[(UIView *)[_videoSublayer delegate] setTransform:CGAffineTransformIdentity];
@@ -350,8 +350,8 @@
else
ASSERT_NOT_REACHED();
- if (auto* model = _fullscreenInterface->videoFullscreenModel())
- model->setVideoLayerGravity(gravity);
+ ASSERT(_fullscreenInterface->videoFullscreenModel());
+ _fullscreenInterface->videoFullscreenModel()->setVideoLayerGravity(gravity);
}
- (NSString *)videoGravity
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
