Diff
Modified: trunk/Source/WebCore/ChangeLog (236933 => 236934)
--- trunk/Source/WebCore/ChangeLog 2018-10-08 20:14:10 UTC (rev 236933)
+++ trunk/Source/WebCore/ChangeLog 2018-10-08 20:15:22 UTC (rev 236934)
@@ -1,5 +1,23 @@
2018-10-08 Jeremy Jones <[email protected]>
+ Remove dead code: VideoFullscreenModel::isVisible()
+ https://bugs.webkit.org/show_bug.cgi?id=190356
+
+ Reviewed by Jon Lee.
+
+ No new tests because there is no behavior change.
+
+ Remove isVisible() since it is no longer used.
+
+ * platform/cocoa/VideoFullscreenModel.h:
+ * platform/cocoa/VideoFullscreenModelVideoElement.h:
+ * platform/cocoa/VideoFullscreenModelVideoElement.mm:
+ (WebCore::VideoFullscreenModelVideoElement::isVisible const): Deleted.
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+ (VideoFullscreenControllerContext::isVisible const): Deleted.
+
+2018-10-08 Jeremy Jones <[email protected]>
+
Remove dead code: resetMediaState.
https://bugs.webkit.org/show_bug.cgi?id=190355
Modified: trunk/Source/WebCore/platform/cocoa/VideoFullscreenModel.h (236933 => 236934)
--- trunk/Source/WebCore/platform/cocoa/VideoFullscreenModel.h 2018-10-08 20:14:10 UTC (rev 236933)
+++ trunk/Source/WebCore/platform/cocoa/VideoFullscreenModel.h 2018-10-08 20:15:22 UTC (rev 236934)
@@ -53,7 +53,6 @@
virtual void setVideoLayerGravity(MediaPlayerEnums::VideoGravity) = 0;
virtual void fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenMode) = 0;
- virtual bool isVisible() const = 0;
virtual FloatSize videoDimensions() const = 0;
virtual bool hasVideo() const = 0;
Modified: trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.h (236933 => 236934)
--- trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.h 2018-10-08 20:14:10 UTC (rev 236933)
+++ trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.h 2018-10-08 20:15:22 UTC (rev 236934)
@@ -69,7 +69,6 @@
WEBCORE_EXPORT void setVideoLayerFrame(FloatRect) 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; }
bool hasVideo() const override { return m_hasVideo; }
Modified: trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm (236933 => 236934)
--- trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm 2018-10-08 20:14:10 UTC (rev 236933)
+++ trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm 2018-10-08 20:15:22 UTC (rev 236934)
@@ -201,17 +201,6 @@
m_clients.remove(&client);
}
-bool VideoFullscreenModelVideoElement::isVisible() const
-{
- if (!m_videoElement)
- return false;
-
- if (Page* page = m_videoElement->document().page())
- return page->isVisible();
-
- return false;
-}
-
void VideoFullscreenModelVideoElement::setHasVideo(bool hasVideo)
{
if (hasVideo == m_hasVideo)
Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (236933 => 236934)
--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2018-10-08 20:14:10 UTC (rev 236933)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2018-10-08 20:15:22 UTC (rev 236934)
@@ -197,7 +197,6 @@
void setVideoLayerFrame(FloatRect) override;
void setVideoLayerGravity(MediaPlayerEnums::VideoGravity) override;
void fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenMode) override;
- bool isVisible() const override;
bool hasVideo() const override;
FloatSize videoDimensions() const override;
bool isMuted() const override;
@@ -605,12 +604,6 @@
});
}
-bool VideoFullscreenControllerContext::isVisible() const
-{
- ASSERT(isUIThread());
- return m_fullscreenModel ? m_fullscreenModel->isVisible() : false;
-}
-
bool VideoFullscreenControllerContext::hasVideo() const
{
ASSERT(isUIThread());
Modified: trunk/Source/WebKit/ChangeLog (236933 => 236934)
--- trunk/Source/WebKit/ChangeLog 2018-10-08 20:14:10 UTC (rev 236933)
+++ trunk/Source/WebKit/ChangeLog 2018-10-08 20:15:22 UTC (rev 236934)
@@ -1,5 +1,19 @@
2018-10-08 Jeremy Jones <[email protected]>
+ Remove dead code: VideoFullscreenModel::isVisible()
+ https://bugs.webkit.org/show_bug.cgi?id=190356
+
+ Reviewed by Jon Lee.
+
+ Remove isVisible since it is no longer used.
+
+ * UIProcess/Cocoa/VideoFullscreenManagerProxy.h:
+ * UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
+ (WebKit::VideoFullscreenModelContext::isVisible const): Deleted.
+ (WebKit::VideoFullscreenManagerProxy::isVisible const): Deleted.
+
+2018-10-08 Jeremy Jones <[email protected]>
+
Remove dead code: resetMediaState.
https://bugs.webkit.org/show_bug.cgi?id=190355
Modified: trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.h (236933 => 236934)
--- trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.h 2018-10-08 20:14:10 UTC (rev 236933)
+++ trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.h 2018-10-08 20:15:22 UTC (rev 236934)
@@ -82,7 +82,6 @@
void setVideoLayerFrame(WebCore::FloatRect) override;
void setVideoLayerGravity(WebCore::MediaPlayerEnums::VideoGravity) override;
void fullscreenModeChanged(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
- bool isVisible() const override;
bool hasVideo() const override { return m_hasVideo; }
WebCore::FloatSize videoDimensions() const override { return m_videoDimensions; }
#if PLATFORM(IOS)
Modified: trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm (236933 => 236934)
--- trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm 2018-10-08 20:14:10 UTC (rev 236933)
+++ trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm 2018-10-08 20:15:22 UTC (rev 236934)
@@ -205,11 +205,6 @@
m_manager->fullscreenModeChanged(m_contextId, mode);
}
-bool VideoFullscreenModelContext::isVisible() const
-{
- return m_manager ? m_manager->isVisible() : false;
-}
-
#if PLATFORM(IOS)
UIViewController *VideoFullscreenModelContext::presentingViewController()
{
@@ -674,11 +669,6 @@
m_page->send(Messages::VideoFullscreenManager::FullscreenModeChanged(contextId, mode), m_page->pageID());
}
-bool VideoFullscreenManagerProxy::isVisible() const
-{
- return m_page->isViewVisible() && m_page->isInWindow();
-}
-
void VideoFullscreenManagerProxy::fullscreenMayReturnToInline(uint64_t contextId)
{
bool isViewVisible = m_page->isViewVisible();
