Changeset 209494 in webkit

Timestamp:

Dec 7, 2016, 4:27:35 PM (9 years ago)

Author:

dino@apple.com

Message:

Expose internal API to detect media documents
​https://bugs.webkit.org/show_bug.cgi?id=165559
<rdar://problems/29564054>

Reviewed by Antoine Quint.

Expose via MediaControlsHost whether or not we're in
a MediaDocument.

Since MediaControlsHost is only exposed to our
internal controls, it's not possible to test this
directly. However, a subsequent test for media documents
with audio-only content will cover this change.

• Modules/mediacontrols/MediaControlsHost.cpp: Add isInMediaDocument and put const on

various methods that should have it.
(WebCore::MediaControlsHost::captionDisplayMode):
(WebCore::MediaControlsHost::supportsFullscreen):
(WebCore::MediaControlsHost::isVideoLayerInline):
(WebCore::MediaControlsHost::isInMediaDocument):

• Modules/mediacontrols/MediaControlsHost.h:
• Modules/mediacontrols/MediaControlsHost.idl: Add isInMediaDocument.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediacontrols/MediaControlsHost.cpp (modified) (2 diffs)
• Modules/mediacontrols/MediaControlsHost.h (modified) (1 diff)
• Modules/mediacontrols/MediaControlsHost.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-12-07  Dean Jackson  <dino@apple.com>
+
+        Expose internal API to detect media documents
+        https://bugs.webkit.org/show_bug.cgi?id=165559
+        <rdar://problems/29564054>
+
+        Reviewed by Antoine Quint.
+
+        Expose via MediaControlsHost whether or not we're in
+        a MediaDocument.
+
+        Since MediaControlsHost is only exposed to our
+        internal controls, it's not possible to test this
+        directly. However, a subsequent test for media documents
+        with audio-only content will cover this change.
+
+        * Modules/mediacontrols/MediaControlsHost.cpp: Add isInMediaDocument and put const on
+        various methods that should have it.
+        (WebCore::MediaControlsHost::captionDisplayMode):
+        (WebCore::MediaControlsHost::supportsFullscreen):
+        (WebCore::MediaControlsHost::isVideoLayerInline):
+        (WebCore::MediaControlsHost::isInMediaDocument):
+        * Modules/mediacontrols/MediaControlsHost.h:
+        * Modules/mediacontrols/MediaControlsHost.idl: Add isInMediaDocument.
+
 2016-12-07  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp

@@ -127 +127 @@
 }
 
-AtomicString MediaControlsHost::captionDisplayMode()
+AtomicString MediaControlsHost::captionDisplayMode() const
 {
     Page* page = m_mediaElement->document().page();
@@ -191 +191 @@
 }
 
-bool MediaControlsHost::supportsFullscreen()
+bool MediaControlsHost::supportsFullscreen() const
 {
     return m_mediaElement->supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard);
 }
 
-bool MediaControlsHost::isVideoLayerInline()
+bool MediaControlsHost::isVideoLayerInline() const
 {
     return m_mediaElement->isVideoLayerInline();
+}
+
+bool MediaControlsHost::isInMediaDocument() const
+{
+    return m_mediaElement->document().isMediaDocument();
 }
 

trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h

@@ -62 +62 @@
     TextTrack* captionMenuOffItem();
     TextTrack* captionMenuAutomaticItem();
-    AtomicString captionDisplayMode();
+    AtomicString captionDisplayMode() const;
     void setSelectedTextTrack(TextTrack*);
     Element* textTrackContainer();
     void updateTextTrackContainer();
     bool allowsInlineMediaPlayback() const;
-    bool supportsFullscreen();
-    bool isVideoLayerInline();
+    bool supportsFullscreen() const;
+    bool isVideoLayerInline() const;
+    bool isInMediaDocument() const;
     bool userGestureRequired() const;
     void setPreparedToReturnVideoLayerToInline(bool);

trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl

@@ -48 +48 @@
     readonly attribute boolean isVideoLayerInline;
     readonly attribute boolean userGestureRequired;
+    readonly attribute boolean isInMediaDocument;
 
     readonly attribute DOMString externalDeviceDisplayName;