Diff
Modified: trunk/Source/WebCore/ChangeLog (236930 => 236931)
--- trunk/Source/WebCore/ChangeLog 2018-10-08 19:58:09 UTC (rev 236930)
+++ trunk/Source/WebCore/ChangeLog 2018-10-08 20:00:35 UTC (rev 236931)
@@ -1,3 +1,27 @@
+2018-10-08 Jeremy Jones <[email protected]>
+
+ Use MediaPlayerEnums::VideoGravity in VideoFullscreenModel.
+ https://bugs.webkit.org/show_bug.cgi?id=190357
+
+ Reviewed by Jon Lee.
+
+ No new tests because no behavior change.
+
+ Use MediaPlayerEnums::VideoGravity instead of creating another identical enum in VideoFullscreenModel.
+
+ * platform/cocoa/VideoFullscreenModel.h:
+ (): Deleted.
+ * platform/cocoa/VideoFullscreenModelVideoElement.h:
+ * platform/cocoa/VideoFullscreenModelVideoElement.mm:
+ (WebCore::VideoFullscreenModelVideoElement::setVideoLayerGravity):
+ * platform/ios/VideoFullscreenInterfaceAVKit.mm:
+ (-[WebAVPlayerLayer setVideoGravity:]):
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+ (VideoFullscreenControllerContext::setVideoLayerGravity):
+ * platform/mac/VideoFullscreenInterfaceMac.mm:
+ (-[WebVideoFullscreenInterfaceMacObjC setUpPIPForVideoView:withFrame:inWindow:]):
+ (-[WebVideoFullscreenInterfaceMacObjC pipDidClose:]):
+
2018-10-08 Devin Rousso <[email protected]>
Web Inspector: group media network entries by the node that triggered the request
Modified: trunk/Source/WebCore/platform/cocoa/VideoFullscreenModel.h (236930 => 236931)
--- trunk/Source/WebCore/platform/cocoa/VideoFullscreenModel.h 2018-10-08 19:58:09 UTC (rev 236930)
+++ trunk/Source/WebCore/platform/cocoa/VideoFullscreenModel.h 2018-10-08 20:00:35 UTC (rev 236931)
@@ -30,6 +30,7 @@
#include "FloatRect.h"
#include "HTMLMediaElementEnums.h"
+#include "MediaPlayerEnums.h"
#include "PlaybackSessionModel.h"
#if PLATFORM(IOS)
@@ -49,8 +50,7 @@
virtual void requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode, bool finishedWithMedia = false) = 0;
virtual void setVideoLayerFrame(FloatRect) = 0;
- enum VideoGravity { VideoGravityResize, VideoGravityResizeAspect, VideoGravityResizeAspectFill };
- virtual void setVideoLayerGravity(VideoGravity) = 0;
+ virtual void setVideoLayerGravity(MediaPlayerEnums::VideoGravity) = 0;
virtual void fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenMode) = 0;
virtual bool isVisible() const = 0;
Modified: trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.h (236930 => 236931)
--- trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.h 2018-10-08 19:58:09 UTC (rev 236930)
+++ trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.h 2018-10-08 20:00:35 UTC (rev 236931)
@@ -31,6 +31,7 @@
#include "EventListener.h"
#include "FloatRect.h"
#include "HTMLMediaElementEnums.h"
+#include "MediaPlayerEnums.h"
#include "PlatformLayer.h"
#include "VideoFullscreenModel.h"
#include <wtf/Function.h>
@@ -66,7 +67,7 @@
WEBCORE_EXPORT void removeClient(VideoFullscreenModelClient&) override;
WEBCORE_EXPORT void requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode, bool finishedWithMedia = false) override;
WEBCORE_EXPORT void setVideoLayerFrame(FloatRect) override;
- WEBCORE_EXPORT void setVideoLayerGravity(VideoGravity) override;
+ WEBCORE_EXPORT void setVideoLayerGravity(MediaPlayerEnums::VideoGravity) override;
WEBCORE_EXPORT void fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenMode) override;
WEBCORE_EXPORT bool isVisible() const override;
FloatSize videoDimensions() const override { return m_videoDimensions; }
Modified: trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm (236930 => 236931)
--- trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm 2018-10-08 19:58:09 UTC (rev 236930)
+++ trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm 2018-10-08 20:00:35 UTC (rev 236931)
@@ -166,19 +166,9 @@
m_videoElement->setVideoFullscreenFrame(rect);
}
-void VideoFullscreenModelVideoElement::setVideoLayerGravity(VideoFullscreenModel::VideoGravity gravity)
+void VideoFullscreenModelVideoElement::setVideoLayerGravity(MediaPlayerEnums::VideoGravity gravity)
{
- MediaPlayer::VideoGravity videoGravity = MediaPlayer::VideoGravityResizeAspect;
- if (gravity == VideoFullscreenModel::VideoGravityResize)
- videoGravity = MediaPlayer::VideoGravityResize;
- else if (gravity == VideoFullscreenModel::VideoGravityResizeAspect)
- videoGravity = MediaPlayer::VideoGravityResizeAspect;
- else if (gravity == VideoFullscreenModel::VideoGravityResizeAspectFill)
- videoGravity = MediaPlayer::VideoGravityResizeAspectFill;
- else
- ASSERT_NOT_REACHED();
-
- m_videoElement->setVideoFullscreenGravity(videoGravity);
+ m_videoElement->setVideoFullscreenGravity(gravity);
}
const Vector<AtomicString>& VideoFullscreenModelVideoElement::observedEventNames()
Modified: trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm (236930 => 236931)
--- trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm 2018-10-08 19:58:09 UTC (rev 236930)
+++ trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm 2018-10-08 20:00:35 UTC (rev 236931)
@@ -338,13 +338,13 @@
if (![_avPlayerController delegate])
return;
- WebCore::VideoFullscreenModel::VideoGravity gravity = WebCore::VideoFullscreenModel::VideoGravityResizeAspect;
+ WebCore::MediaPlayerEnums::VideoGravity gravity = WebCore::MediaPlayerEnums::VideoGravityResizeAspect;
if (videoGravity == getAVLayerVideoGravityResize())
- gravity = WebCore::VideoFullscreenModel::VideoGravityResize;
+ gravity = WebCore::MediaPlayerEnums::VideoGravityResize;
if (videoGravity == getAVLayerVideoGravityResizeAspect())
- gravity = WebCore::VideoFullscreenModel::VideoGravityResizeAspect;
+ gravity = WebCore::MediaPlayerEnums::VideoGravityResizeAspect;
else if (videoGravity == getAVLayerVideoGravityResizeAspectFill())
- gravity = WebCore::VideoFullscreenModel::VideoGravityResizeAspectFill;
+ gravity = WebCore::MediaPlayerEnums::VideoGravityResizeAspectFill;
else
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (236930 => 236931)
--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2018-10-08 19:58:09 UTC (rev 236930)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2018-10-08 20:00:35 UTC (rev 236931)
@@ -195,7 +195,7 @@
void removeClient(VideoFullscreenModelClient&) override;
void requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode, bool finishedWithMedia = false) override;
void setVideoLayerFrame(FloatRect) override;
- void setVideoLayerGravity(VideoFullscreenModel::VideoGravity) override;
+ void setVideoLayerGravity(MediaPlayerEnums::VideoGravity) override;
void fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenMode) override;
bool isVisible() const override;
bool hasVideo() const override;
@@ -587,7 +587,7 @@
});
}
-void VideoFullscreenControllerContext::setVideoLayerGravity(VideoFullscreenModel::VideoGravity videoGravity)
+void VideoFullscreenControllerContext::setVideoLayerGravity(MediaPlayerEnums::VideoGravity videoGravity)
{
ASSERT(isUIThread());
WebThreadRun([protectedThis = makeRefPtr(this), this, videoGravity] {
Modified: trunk/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm (236930 => 236931)
--- trunk/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm 2018-10-08 19:58:09 UTC (rev 236930)
+++ trunk/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm 2018-10-08 20:00:35 UTC (rev 236931)
@@ -59,6 +59,7 @@
using WebCore::VideoFullscreenModel;
using WebCore::HTMLMediaElementEnums;
+using WebCore::MediaPlayerEnums;
using WebCore::VideoFullscreenInterfaceMac;
using WebCore::VideoFullscreenChangeObserver;
using WebCore::PlaybackSessionModel;
@@ -193,7 +194,7 @@
[_pipViewController setPlaying:_playing];
[self setVideoDimensions:NSEqualSizes(_videoDimensions, NSZeroSize) ? frame.size : _videoDimensions];
if (_videoFullscreenInterfaceMac && _videoFullscreenInterfaceMac->videoFullscreenModel())
- _videoFullscreenInterfaceMac->videoFullscreenModel()->setVideoLayerGravity(VideoFullscreenModel::VideoGravityResizeAspectFill);
+ _videoFullscreenInterfaceMac->videoFullscreenModel()->setVideoLayerGravity(MediaPlayerEnums::VideoGravityResizeAspectFill);
_videoViewContainer = adoptNS([[WebVideoViewContainer alloc] initWithFrame:frame]);
[_videoViewContainer setVideoViewContainerDelegate:self];
@@ -288,7 +289,7 @@
context.allowsImplicitAnimation = NO;
[_videoViewContainer setFrame:_returningRect];
_videoFullscreenInterfaceMac->videoFullscreenModel()->setVideoLayerFrame([_videoViewContainer bounds]);
- _videoFullscreenInterfaceMac->videoFullscreenModel()->setVideoLayerGravity(VideoFullscreenModel::VideoGravityResizeAspect);
+ _videoFullscreenInterfaceMac->videoFullscreenModel()->setVideoLayerGravity(MediaPlayerEnums::VideoGravityResizeAspect);
[[_returningWindow contentView] addSubview:_videoViewContainer.get() positioned:NSWindowAbove relativeTo:nil];
} completionHandler:nil];
@@ -298,7 +299,7 @@
if (!self.isExitingToStandardFullscreen) {
if (VideoFullscreenModel* videoFullscreenModel = _videoFullscreenInterfaceMac->videoFullscreenModel()) {
videoFullscreenModel->didExitPictureInPicture();
- videoFullscreenModel->setVideoLayerGravity(VideoFullscreenModel::VideoGravityResizeAspect);
+ videoFullscreenModel->setVideoLayerGravity(MediaPlayerEnums::VideoGravityResizeAspect);
}
}
Modified: trunk/Source/WebKit/ChangeLog (236930 => 236931)
--- trunk/Source/WebKit/ChangeLog 2018-10-08 19:58:09 UTC (rev 236930)
+++ trunk/Source/WebKit/ChangeLog 2018-10-08 20:00:35 UTC (rev 236931)
@@ -1,3 +1,19 @@
+2018-10-08 Jeremy Jones <[email protected]>
+
+ Use MediaPlayerEnums::VideoGravity in VideoFullscreenModel.
+ https://bugs.webkit.org/show_bug.cgi?id=190357
+
+ Reviewed by Jon Lee.
+
+ Use MediaPlayerEnums::VideoGravity instead of creating another identical enum in VideoFullscreenModel.
+
+ * UIProcess/Cocoa/VideoFullscreenManagerProxy.h:
+ * UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
+ (WebKit::VideoFullscreenModelContext::setVideoLayerGravity):
+ (WebKit::VideoFullscreenManagerProxy::setVideoLayerGravity):
+ * WebProcess/cocoa/VideoFullscreenManager.mm:
+ (WebKit::VideoFullscreenManager::setVideoLayerGravityEnum):
+
2018-10-08 Alex Christensen <[email protected]>
Remove WKBundleFileHandleRef
Modified: trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.h (236930 => 236931)
--- trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.h 2018-10-08 19:58:09 UTC (rev 236930)
+++ trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.h 2018-10-08 20:00:35 UTC (rev 236931)
@@ -80,7 +80,7 @@
void removeClient(WebCore::VideoFullscreenModelClient&) override;
void requestFullscreenMode(WebCore::HTMLMediaElementEnums::VideoFullscreenMode, bool finishedWithMedia = false) override;
void setVideoLayerFrame(WebCore::FloatRect) override;
- void setVideoLayerGravity(VideoGravity) override;
+ void setVideoLayerGravity(WebCore::MediaPlayerEnums::VideoGravity) override;
void fullscreenModeChanged(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
bool isVisible() const override;
bool hasVideo() const override { return m_hasVideo; }
@@ -174,7 +174,7 @@
void didEnterFullscreen(uint64_t contextId);
void didCleanupFullscreen(uint64_t contextId);
void setVideoLayerFrame(uint64_t contextId, WebCore::FloatRect);
- void setVideoLayerGravity(uint64_t contextId, WebCore::VideoFullscreenModel::VideoGravity);
+ void setVideoLayerGravity(uint64_t contextId, WebCore::MediaPlayerEnums::VideoGravity);
void fullscreenModeChanged(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode);
void fullscreenMayReturnToInline(uint64_t contextId);
Modified: trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm (236930 => 236931)
--- trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm 2018-10-08 19:58:09 UTC (rev 236930)
+++ trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm 2018-10-08 20:00:35 UTC (rev 236931)
@@ -193,7 +193,7 @@
m_manager->setVideoLayerFrame(m_contextId, frame);
}
-void VideoFullscreenModelContext::setVideoLayerGravity(WebCore::VideoFullscreenModel::VideoGravity gravity)
+void VideoFullscreenModelContext::setVideoLayerGravity(WebCore::MediaPlayerEnums::VideoGravity gravity)
{
if (m_manager)
m_manager->setVideoLayerGravity(m_contextId, gravity);
@@ -663,7 +663,7 @@
}
}
-void VideoFullscreenManagerProxy::setVideoLayerGravity(uint64_t contextId, WebCore::VideoFullscreenModel::VideoGravity gravity)
+void VideoFullscreenManagerProxy::setVideoLayerGravity(uint64_t contextId, WebCore::MediaPlayerEnums::VideoGravity gravity)
{
m_page->send(Messages::VideoFullscreenManager::SetVideoLayerGravityEnum(contextId, (unsigned)gravity), m_page->pageID());
}
Modified: trunk/Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.mm (236930 => 236931)
--- trunk/Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.mm 2018-10-08 19:58:09 UTC (rev 236930)
+++ trunk/Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.mm 2018-10-08 20:00:35 UTC (rev 236931)
@@ -544,7 +544,7 @@
void VideoFullscreenManager::setVideoLayerGravityEnum(uint64_t contextId, unsigned gravity)
{
- ensureModel(contextId).setVideoLayerGravity((VideoFullscreenModel::VideoGravity)gravity);
+ ensureModel(contextId).setVideoLayerGravity((MediaPlayerEnums::VideoGravity)gravity);
}
void VideoFullscreenManager::fullscreenMayReturnToInline(uint64_t contextId, bool isPageVisible)
