<!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>[207690] 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/207690">207690</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-10-21 11:53:05 -0700 (Fri, 21 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Web IDL] MediaControlsHost has invalid operation overloads
https://bugs.webkit.org/show_bug.cgi?id=163793
Reviewed by Darin Adler.
MediaControlsHost has invalid operation overloads:
- sortedTrackListForMenu()
- displayNameForTrack()
The parameter is nullable for both overloads which is not valid IDL.
- sortedTrackListForMenu(): The parameter is no longer nullable. This is a minor
behavior change and it should be safe since this is Apple-specific and only
called from mediaControlsApple.js which uses HTMLMediaElement.videoTracks and
HTMLMediaElement.audioTracks as input, both of which are not nullable.
Note that we could have also kept one of the parameters as nullable to not
change behavior but allowing null does not seem useful here.
- displayNameForTrack(): Use a union instead of overloading, no behavior change.
* Modules/mediacontrols/MediaControlsHost.cpp:
(WebCore::MediaControlsHost::sortedTrackListForMenu):
(WebCore::MediaControlsHost::displayNameForTrack):
* Modules/mediacontrols/MediaControlsHost.h:
* Modules/mediacontrols/MediaControlsHost.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHosth">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHostidl">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207689 => 207690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-21 18:45:39 UTC (rev 207689)
+++ trunk/Source/WebCore/ChangeLog 2016-10-21 18:53:05 UTC (rev 207690)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-10-21 Chris Dumez <cdumez@apple.com>
+
+ [Web IDL] MediaControlsHost has invalid operation overloads
+ https://bugs.webkit.org/show_bug.cgi?id=163793
+
+ Reviewed by Darin Adler.
+
+ MediaControlsHost has invalid operation overloads:
+ - sortedTrackListForMenu()
+ - displayNameForTrack()
+
+ The parameter is nullable for both overloads which is not valid IDL.
+
+ - sortedTrackListForMenu(): The parameter is no longer nullable. This is a minor
+ behavior change and it should be safe since this is Apple-specific and only
+ called from mediaControlsApple.js which uses HTMLMediaElement.videoTracks and
+ HTMLMediaElement.audioTracks as input, both of which are not nullable.
+ Note that we could have also kept one of the parameters as nullable to not
+ change behavior but allowing null does not seem useful here.
+ - displayNameForTrack(): Use a union instead of overloading, no behavior change.
+
+ * Modules/mediacontrols/MediaControlsHost.cpp:
+ (WebCore::MediaControlsHost::sortedTrackListForMenu):
+ (WebCore::MediaControlsHost::displayNameForTrack):
+ * Modules/mediacontrols/MediaControlsHost.h:
+ * Modules/mediacontrols/MediaControlsHost.idl:
+
</ins><span class="cx"> 2016-10-21 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement basic pointer lock behavior for WebKit and WebKit2.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp (207689 => 207690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2016-10-21 18:45:39 UTC (rev 207689)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2016-10-21 18:53:05 UTC (rev 207690)
</span><span class="lines">@@ -84,31 +84,25 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Vector<RefPtr<TextTrack>> MediaControlsHost::sortedTrackListForMenu(TextTrackList* trackList)
</del><ins>+Vector<RefPtr<TextTrack>> MediaControlsHost::sortedTrackListForMenu(TextTrackList& trackList)
</ins><span class="cx"> {
</span><del>- if (!trackList)
- return Vector<RefPtr<TextTrack>>();
-
</del><span class="cx"> Page* page = m_mediaElement->document().page();
</span><span class="cx"> if (!page)
</span><del>- return Vector<RefPtr<TextTrack>>();
</del><ins>+ return { };
</ins><span class="cx">
</span><del>- return page->group().captionPreferences().sortedTrackListForMenu(trackList);
</del><ins>+ return page->group().captionPreferences().sortedTrackListForMenu(&trackList);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Vector<RefPtr<AudioTrack>> MediaControlsHost::sortedTrackListForMenu(AudioTrackList* trackList)
</del><ins>+Vector<RefPtr<AudioTrack>> MediaControlsHost::sortedTrackListForMenu(AudioTrackList& trackList)
</ins><span class="cx"> {
</span><del>- if (!trackList)
- return Vector<RefPtr<AudioTrack>>();
-
</del><span class="cx"> Page* page = m_mediaElement->document().page();
</span><span class="cx"> if (!page)
</span><del>- return Vector<RefPtr<AudioTrack>>();
</del><ins>+ return { };
</ins><span class="cx">
</span><del>- return page->group().captionPreferences().sortedTrackListForMenu(trackList);
</del><ins>+ return page->group().captionPreferences().sortedTrackListForMenu(&trackList);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String MediaControlsHost::displayNameForTrack(TextTrack* track)
</del><ins>+String MediaControlsHost::displayNameForTrack(const Optional<TextOrAudioTrack>& track)
</ins><span class="cx"> {
</span><span class="cx"> if (!track)
</span><span class="cx"> return emptyString();
</span><span class="lines">@@ -117,21 +111,11 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return emptyString();
</span><span class="cx">
</span><del>- return page->group().captionPreferences().displayNameForTrack(track);
</del><ins>+ return WTF::visit([&page](auto& track) {
+ return page->group().captionPreferences().displayNameForTrack(track.get());
+ }, track.value());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String MediaControlsHost::displayNameForTrack(AudioTrack* track)
-{
- if (!track)
- return emptyString();
-
- Page* page = m_mediaElement->document().page();
- if (!page)
- return emptyString();
-
- return page->group().captionPreferences().displayNameForTrack(track);
-}
-
</del><span class="cx"> TextTrack* MediaControlsHost::captionMenuOffItem()
</span><span class="cx"> {
</span><span class="cx"> return TextTrack::captionMenuOffItem();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h (207689 => 207690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h 2016-10-21 18:45:39 UTC (rev 207689)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h 2016-10-21 18:53:05 UTC (rev 207690)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include <bindings/ScriptObject.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><ins>+#include <wtf/Variant.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -52,10 +53,12 @@
</span><span class="cx"> static const AtomicString& alwaysOnKeyword();
</span><span class="cx"> static const AtomicString& manualKeyword();
</span><span class="cx">
</span><del>- Vector<RefPtr<TextTrack>> sortedTrackListForMenu(TextTrackList*);
- Vector<RefPtr<AudioTrack>> sortedTrackListForMenu(AudioTrackList*);
- String displayNameForTrack(TextTrack*);
- String displayNameForTrack(AudioTrack*);
</del><ins>+ Vector<RefPtr<TextTrack>> sortedTrackListForMenu(TextTrackList&);
+ Vector<RefPtr<AudioTrack>> sortedTrackListForMenu(AudioTrackList&);
+
+ using TextOrAudioTrack = WTF::Variant<RefPtr<TextTrack>, RefPtr<AudioTrack>>;
+ String displayNameForTrack(const Optional<TextOrAudioTrack>&);
+
</ins><span class="cx"> TextTrack* captionMenuOffItem();
</span><span class="cx"> TextTrack* captionMenuAutomaticItem();
</span><span class="cx"> AtomicString captionDisplayMode();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHostidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl (207689 => 207690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl 2016-10-21 18:45:39 UTC (rev 207689)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl 2016-10-21 18:53:05 UTC (rev 207690)
</span><span class="lines">@@ -34,10 +34,9 @@
</span><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> NoInterfaceObject,
</span><span class="cx"> ] interface MediaControlsHost {
</span><del>- sequence<TextTrack> sortedTrackListForMenu(TextTrackList? trackList);
- sequence<AudioTrack> sortedTrackListForMenu(AudioTrackList? trackList);
- DOMString displayNameForTrack(TextTrack? track);
- DOMString displayNameForTrack(AudioTrack? track);
</del><ins>+ sequence<TextTrack> sortedTrackListForMenu(TextTrackList trackList);
+ sequence<AudioTrack> sortedTrackListForMenu(AudioTrackList trackList);
+ DOMString displayNameForTrack((TextTrack or AudioTrack)? track);
</ins><span class="cx"> readonly attribute TextTrack captionMenuOffItem;
</span><span class="cx"> readonly attribute TextTrack captionMenuAutomaticItem;
</span><span class="cx"> readonly attribute DOMString captionDisplayMode;
</span></span></pre>
</div>
</div>
</body>
</html>