Changeset 174505 in webkit

Timestamp:

Oct 9, 2014 9:18:46 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (1 diff)
• html/HTMLMediaElement.h (modified) (1 diff)
• platform/graphics/MediaPlayer.cpp (modified) (3 diffs)
• platform/graphics/MediaPlayer.h (modified) (4 diffs)
• platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (modified) (2 diffs)
• platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (1 diff)
• platform/graphics/mac/MediaPlayerPrivateQTKit.mm (modified) (1 diff)
• rendering/RenderVideo.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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.
+
 2014-10-09  Christophe Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -5709 +5709 @@
 }
 #endif
-    
+
+bool HTMLMediaElement::mediaPlayerIsInMediaDocument() const
+{
+    return document().isMediaDocument();
+}
+
 void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture()
 {

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -584 +584 @@
 #endif
 
+    virtual bool mediaPlayerIsInMediaDocument() const override final;
+
     void loadTimerFired(Timer<HTMLMediaElement>&);
     void progressEventTimerFired(Timer<HTMLMediaElement>&);

trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

@@ -31 +31 @@
 #include "ContentType.h"
 #include "Document.h"
-#include "Frame.h"
-#include "FrameView.h"
 #include "IntRect.h"
 #include "Logging.h"
@@ -313 +311 @@
     , m_private(createNullMediaPlayer(this))
     , m_currentMediaEngine(0)
-    , m_frameView(0)
     , m_preload(Auto)
     , m_visible(false)
@@ -590 +587 @@
 }
 
-bool MediaPlayer::inMediaDocument()
-{
-    if (!m_frameView)
-        return false;
-    Document* document = m_frameView->frame().document();
-    return document && document->isMediaDocument();
+bool MediaPlayer::inMediaDocument() const
+{
+    return m_visible && m_mediaPlayerClient && m_mediaPlayerClient->mediaPlayerIsInMediaDocument();
 }
 

trunk/Source/WebCore/platform/graphics/MediaPlayer.h

@@ -130 +130 @@
 class CachedResourceLoader;
 class ContentType;
-class FrameView;
 class GraphicsContext;
 class GraphicsContext3D;
@@ -265 +264 @@
 
     virtual String mediaPlayerSourceApplicationIdentifier() const { return emptyString(); }
+
+    virtual bool mediaPlayerIsInMediaDocument() const { return false; }
 };
 
@@ -317 +318 @@
     bool hasAudio() const;
 
-    void setFrameView(FrameView* frameView) { m_frameView = frameView; }
-    FrameView* frameView() { return m_frameView; }
-    bool inMediaDocument();
+    bool inMediaDocument() const;
 
     IntSize size() const { return m_size; }
@@ -595 +594 @@
     String m_contentTypeCodecs;
     String m_keySystem;
-    FrameView* m_frameView;
     IntSize m_size;
     Preload m_preload;

trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp

@@ -32 +32 @@
 #include "DocumentLoader.h"
 #include "FloatConversion.h"
-#include "Frame.h"
-#include "FrameView.h"
 #include "GraphicsContext.h"
 #include "InbandTextTrackPrivateAVF.h"
@@ -105 +103 @@
 MediaPlayerPrivateAVFoundation::MediaRenderingMode MediaPlayerPrivateAVFoundation::preferredRenderingMode() const
 {
-    if (!m_player->visible() || !m_player->frameView() || assetStatus() == MediaPlayerAVAssetStatusUnknown)
+    if (!m_player->visible() || assetStatus() == MediaPlayerAVAssetStatusUnknown)
         return MediaRenderingNone;
 

trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp

@@ -36 +36 @@
 #include "COMPtr.h"
 #include "FloatConversion.h"
-#include "FrameView.h"
 #include "GraphicsContext.h"
 #if HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

@@ -39 +39 @@
 #import "FloatConversion.h"
 #import "FloatConversion.h"
-#import "FrameView.h"
 #import "GraphicsContext.h"
 #import "GraphicsContextCG.h"

trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm

@@ -32 +32 @@
 #import "BlockExceptions.h"
 #import "DocumentLoader.h"
-#import "Frame.h"
-#import "HostWindow.h"
 #import "GraphicsContext.h"
 #import "URL.h"

trunk/Source/WebCore/rendering/RenderVideo.cpp

@@ -57 +57 @@
 RenderVideo::~RenderVideo()
 {
-    if (MediaPlayer* player = videoElement().player()) {
+    if (MediaPlayer* player = videoElement().player())
         player->setVisible(false);
-        player->setFrameView(0);
-    }
 }
 
@@ -234 +232 @@
     
     IntRect videoBounds = videoBox(); 
-    mediaPlayer->setFrameView(&view().frameView());
     mediaPlayer->setSize(IntSize(videoBounds.width(), videoBounds.height()));
     mediaPlayer->setVisible(true);