<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174505] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174505">174505</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-09 09:18:46 -0700 (Thu, 09 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Layering violation: MediaPlayer should not reference/use FrameView
https://bugs.webkit.org/show_bug.cgi?id=21562
Reviewed by Darin Adler.
Remove FrameView dependency from MediaPlayer.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaPlayerIsInMediaDocument): Check if
the element document is a media document.
* html/HTMLMediaElement.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::MediaPlayer): Remove m_frameView initialization.
(WebCore::MediaPlayer::inMediaDocument): Use the MediaPlayerClient
to check if the media player is in a media document.
* platform/graphics/MediaPlayer.h:
(WebCore::MediaPlayerClient::mediaPlayerIsInMediaDocument):
(WebCore::MediaPlayer::setFrameView): Deleted.
(WebCore::MediaPlayer::frameView): Deleted.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::preferredRenderingMode):
Do not check if the media player has a frame view, checking whether it's visible
is enough.
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
Remove unneeded header include.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: Ditto.
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm: Ditto.
* rendering/RenderVideo.cpp:
(WebCore::RenderVideo::~RenderVideo): Do not call MediaPlayer::setFrameView().
(WebCore::RenderVideo::updatePlayer): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderVideocpp">trunk/Source/WebCore/rendering/RenderVideo.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174504 => 174505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-09 16:17:06 UTC (rev 174504)
+++ trunk/Source/WebCore/ChangeLog 2014-10-09 16:18:46 UTC (rev 174505)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-10-09 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Layering violation: MediaPlayer should not reference/use FrameView
+ https://bugs.webkit.org/show_bug.cgi?id=21562
+
+ Reviewed by Darin Adler.
+
+ Remove FrameView dependency from MediaPlayer.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::mediaPlayerIsInMediaDocument): Check if
+ the element document is a media document.
+ * html/HTMLMediaElement.h:
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::MediaPlayer): Remove m_frameView initialization.
+ (WebCore::MediaPlayer::inMediaDocument): Use the MediaPlayerClient
+ to check if the media player is in a media document.
+ * platform/graphics/MediaPlayer.h:
+ (WebCore::MediaPlayerClient::mediaPlayerIsInMediaDocument):
+ (WebCore::MediaPlayer::setFrameView): Deleted.
+ (WebCore::MediaPlayer::frameView): Deleted.
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundation::preferredRenderingMode):
+ Do not check if the media player has a frame view, checking whether it's visible
+ is enough.
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ Remove unneeded header include.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: Ditto.
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm: Ditto.
+ * rendering/RenderVideo.cpp:
+ (WebCore::RenderVideo::~RenderVideo): Do not call MediaPlayer::setFrameView().
+ (WebCore::RenderVideo::updatePlayer): Ditto.
+
</ins><span class="cx"> 2014-10-09 Christophe Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Use is<>() / downcast<>() for RenderBlockFlow
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (174504 => 174505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-10-09 16:17:06 UTC (rev 174504)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-10-09 16:18:46 UTC (rev 174505)
</span><span class="lines">@@ -5708,7 +5708,12 @@
</span><span class="cx"> return getRawCookies(&document(), url, cookies);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>-
</del><ins>+
+bool HTMLMediaElement::mediaPlayerIsInMediaDocument() const
+{
+ return document().isMediaDocument();
+}
+
</ins><span class="cx"> void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture()
</span><span class="cx"> {
</span><span class="cx"> m_mediaSession->removeBehaviorRestriction(HTMLMediaSession::RequireUserGestureForLoad);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (174504 => 174505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-10-09 16:17:06 UTC (rev 174504)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-10-09 16:18:46 UTC (rev 174505)
</span><span class="lines">@@ -583,6 +583,8 @@
</span><span class="cx"> virtual bool mediaPlayerGetRawCookies(const URL&, Vector<Cookie>&) const override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ virtual bool mediaPlayerIsInMediaDocument() const override final;
+
</ins><span class="cx"> void loadTimerFired(Timer<HTMLMediaElement>&);
</span><span class="cx"> void progressEventTimerFired(Timer<HTMLMediaElement>&);
</span><span class="cx"> void playbackProgressTimerFired(Timer<HTMLMediaElement>&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (174504 => 174505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-10-09 16:17:06 UTC (rev 174504)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-10-09 16:18:46 UTC (rev 174505)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #include "ContentType.h"
</span><span class="cx"> #include "Document.h"
</span><del>-#include "Frame.h"
-#include "FrameView.h"
</del><span class="cx"> #include "IntRect.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="lines">@@ -312,7 +310,6 @@
</span><span class="cx"> , m_reloadTimer(this, &MediaPlayer::reloadTimerFired)
</span><span class="cx"> , m_private(createNullMediaPlayer(this))
</span><span class="cx"> , m_currentMediaEngine(0)
</span><del>- , m_frameView(0)
</del><span class="cx"> , m_preload(Auto)
</span><span class="cx"> , m_visible(false)
</span><span class="cx"> , m_rate(1.0f)
</span><span class="lines">@@ -589,12 +586,9 @@
</span><span class="cx"> return m_private->hasAudio();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaPlayer::inMediaDocument()
</del><ins>+bool MediaPlayer::inMediaDocument() const
</ins><span class="cx"> {
</span><del>- if (!m_frameView)
- return false;
- Document* document = m_frameView->frame().document();
- return document && document->isMediaDocument();
</del><ins>+ return m_visible && m_mediaPlayerClient && m_mediaPlayerClient->mediaPlayerIsInMediaDocument();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PlatformMedia MediaPlayer::platformMedia() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (174504 => 174505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-10-09 16:17:06 UTC (rev 174504)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-10-09 16:18:46 UTC (rev 174505)
</span><span class="lines">@@ -129,7 +129,6 @@
</span><span class="cx">
</span><span class="cx"> class CachedResourceLoader;
</span><span class="cx"> class ContentType;
</span><del>-class FrameView;
</del><span class="cx"> class GraphicsContext;
</span><span class="cx"> class GraphicsContext3D;
</span><span class="cx"> class IntRect;
</span><span class="lines">@@ -264,6 +263,8 @@
</span><span class="cx"> virtual void mediaPlayerHandlePlaybackCommand(MediaSession::RemoteControlCommandType) { }
</span><span class="cx">
</span><span class="cx"> virtual String mediaPlayerSourceApplicationIdentifier() const { return emptyString(); }
</span><ins>+
+ virtual bool mediaPlayerIsInMediaDocument() const { return false; }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class MediaPlayerSupportsTypeClient {
</span><span class="lines">@@ -316,9 +317,7 @@
</span><span class="cx"> bool hasVideo() const;
</span><span class="cx"> bool hasAudio() const;
</span><span class="cx">
</span><del>- void setFrameView(FrameView* frameView) { m_frameView = frameView; }
- FrameView* frameView() { return m_frameView; }
- bool inMediaDocument();
</del><ins>+ bool inMediaDocument() const;
</ins><span class="cx">
</span><span class="cx"> IntSize size() const { return m_size; }
</span><span class="cx"> void setSize(const IntSize& size);
</span><span class="lines">@@ -594,7 +593,6 @@
</span><span class="cx"> String m_contentMIMEType;
</span><span class="cx"> String m_contentTypeCodecs;
</span><span class="cx"> String m_keySystem;
</span><del>- FrameView* m_frameView;
</del><span class="cx"> IntSize m_size;
</span><span class="cx"> Preload m_preload;
</span><span class="cx"> bool m_visible;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (174504 => 174505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2014-10-09 16:17:06 UTC (rev 174504)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2014-10-09 16:18:46 UTC (rev 174505)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx">
</span><span class="cx"> #include "DocumentLoader.h"
</span><span class="cx"> #include "FloatConversion.h"
</span><del>-#include "Frame.h"
-#include "FrameView.h"
</del><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "InbandTextTrackPrivateAVF.h"
</span><span class="cx"> #include "InbandTextTrackPrivateClient.h"
</span><span class="lines">@@ -104,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> MediaPlayerPrivateAVFoundation::MediaRenderingMode MediaPlayerPrivateAVFoundation::preferredRenderingMode() const
</span><span class="cx"> {
</span><del>- if (!m_player->visible() || !m_player->frameView() || assetStatus() == MediaPlayerAVAssetStatusUnknown)
</del><ins>+ if (!m_player->visible() || assetStatus() == MediaPlayerAVAssetStatusUnknown)
</ins><span class="cx"> return MediaRenderingNone;
</span><span class="cx">
</span><span class="cx"> if (supportsAcceleratedRendering() && m_player->mediaPlayerClient()->mediaPlayerRenderingCanBeAccelerated(m_player))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (174504 => 174505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-10-09 16:17:06 UTC (rev 174504)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-10-09 16:18:46 UTC (rev 174505)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include "CDMSessionAVFoundationCF.h"
</span><span class="cx"> #include "COMPtr.h"
</span><span class="cx"> #include "FloatConversion.h"
</span><del>-#include "FrameView.h"
</del><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #if HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
</span><span class="cx"> #include "InbandTextTrackPrivateAVCF.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (174504 => 174505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-10-09 16:17:06 UTC (rev 174504)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-10-09 16:18:46 UTC (rev 174505)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #import "ExceptionCodePlaceholder.h"
</span><span class="cx"> #import "FloatConversion.h"
</span><span class="cx"> #import "FloatConversion.h"
</span><del>-#import "FrameView.h"
</del><span class="cx"> #import "GraphicsContext.h"
</span><span class="cx"> #import "GraphicsContextCG.h"
</span><span class="cx"> #import "InbandMetadataTextTrackPrivateAVF.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (174504 => 174505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-10-09 16:17:06 UTC (rev 174504)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-10-09 16:18:46 UTC (rev 174505)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx">
</span><span class="cx"> #import "BlockExceptions.h"
</span><span class="cx"> #import "DocumentLoader.h"
</span><del>-#import "Frame.h"
-#import "HostWindow.h"
</del><span class="cx"> #import "GraphicsContext.h"
</span><span class="cx"> #import "URL.h"
</span><span class="cx"> #import "Logging.h"
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderVideocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderVideo.cpp (174504 => 174505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderVideo.cpp 2014-10-09 16:17:06 UTC (rev 174504)
+++ trunk/Source/WebCore/rendering/RenderVideo.cpp 2014-10-09 16:18:46 UTC (rev 174505)
</span><span class="lines">@@ -56,10 +56,8 @@
</span><span class="cx">
</span><span class="cx"> RenderVideo::~RenderVideo()
</span><span class="cx"> {
</span><del>- if (MediaPlayer* player = videoElement().player()) {
</del><ins>+ if (MediaPlayer* player = videoElement().player())
</ins><span class="cx"> player->setVisible(false);
</span><del>- player->setFrameView(0);
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntSize RenderVideo::defaultSize()
</span><span class="lines">@@ -233,7 +231,6 @@
</span><span class="cx"> contentChanged(VideoChanged);
</span><span class="cx">
</span><span class="cx"> IntRect videoBounds = videoBox();
</span><del>- mediaPlayer->setFrameView(&view().frameView());
</del><span class="cx"> mediaPlayer->setSize(IntSize(videoBounds.width(), videoBounds.height()));
</span><span class="cx"> mediaPlayer->setVisible(true);
</span><span class="cx"> mediaPlayer->setShouldMaintainAspectRatio(style().objectFit() != ObjectFitFill);
</span></span></pre>
</div>
</div>
</body>
</html>