<!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>[166250] 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/166250">166250</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-03-25 14:00:19 -0700 (Tue, 25 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Pass additional options to AVFoundation during playback.
https://bugs.webkit.org/show_bug.cgi?id=130624
Reviewed by Eric Carlson.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::doesHaveAttribute): Return attribute value if the user
passes a pointer to fill in.
* html/HTMLMediaElement.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::doesHaveAttribute):
* platform/graphics/MediaPlayer.h:
(WebCore::MediaPlayerClient::doesHaveAttribute):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem): Pass additional
option if supplied by user.</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="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166249 => 166250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-25 20:43:27 UTC (rev 166249)
+++ trunk/Source/WebCore/ChangeLog 2014-03-25 21:00:19 UTC (rev 166250)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-03-25 Brent Fulgham <bfulgham@apple.com>
+
+ [iOS] Pass additional options to AVFoundation during playback.
+ https://bugs.webkit.org/show_bug.cgi?id=130624
+
+ Reviewed by Eric Carlson.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::doesHaveAttribute): Return attribute value if the user
+ passes a pointer to fill in.
+ * html/HTMLMediaElement.h:
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::doesHaveAttribute):
+ * platform/graphics/MediaPlayer.h:
+ (WebCore::MediaPlayerClient::doesHaveAttribute):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem): Pass additional
+ option if supplied by user.
+
</ins><span class="cx"> 2014-03-25 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r166070.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (166249 => 166250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-03-25 20:43:27 UTC (rev 166249)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-03-25 21:00:19 UTC (rev 166250)
</span><span class="lines">@@ -6042,16 +6042,21 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLMediaElement::doesHaveAttribute(const AtomicString& attribute) const
</del><ins>+bool HTMLMediaElement::doesHaveAttribute(const AtomicString& attribute, AtomicString* value) const
</ins><span class="cx"> {
</span><span class="cx"> QualifiedName attributeName(nullAtom, attribute, nullAtom);
</span><del>- if (!fastHasAttribute(attributeName))
</del><ins>+
+ AtomicString elementValue = fastGetAttribute(attributeName);
+ if (elementValue.isNull())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (Settings* settings = document().settings()) {
</span><del>- if (attributeName == HTMLNames::x_itunes_inherit_uri_query_componentAttr)
- return settings->enableInheritURIQueryComponent();
</del><ins>+ if (attributeName == HTMLNames::x_itunes_inherit_uri_query_componentAttr && !settings->enableInheritURIQueryComponent())
+ return false;
</ins><span class="cx"> }
</span><ins>+
+ if (value)
+ *value = elementValue;
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (166249 => 166250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-03-25 20:43:27 UTC (rev 166249)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-03-25 21:00:19 UTC (rev 166250)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> virtual bool supportsSave() const;
</span><span class="cx"> virtual bool supportsScanning() const override;
</span><span class="cx">
</span><del>- virtual bool doesHaveAttribute(const AtomicString&) const override;
</del><ins>+ virtual bool doesHaveAttribute(const AtomicString&, AtomicString* value = nullptr) const override;
</ins><span class="cx">
</span><span class="cx"> PlatformMedia platformMedia() const;
</span><span class="cx"> PlatformLayer* platformLayer() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (166249 => 166250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-03-25 20:43:27 UTC (rev 166249)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-03-25 21:00:19 UTC (rev 166250)
</span><span class="lines">@@ -1412,12 +1412,12 @@
</span><span class="cx"> registerMediaEngine(addMediaEngine);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaPlayer::doesHaveAttribute(const AtomicString& attribute) const
</del><ins>+bool MediaPlayer::doesHaveAttribute(const AtomicString& attribute, AtomicString* value) const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_mediaPlayerClient)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return m_mediaPlayerClient->doesHaveAttribute(attribute);
</del><ins>+ return m_mediaPlayerClient->doesHaveAttribute(attribute, value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (166249 => 166250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-03-25 20:43:27 UTC (rev 166249)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-03-25 21:00:19 UTC (rev 166250)
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> virtual HostWindow* mediaPlayerHostWindow() { return 0; }
</span><span class="cx"> virtual IntRect mediaPlayerWindowClipRect() { return IntRect(); }
</span><span class="cx"> virtual CachedResourceLoader* mediaPlayerCachedResourceLoader() { return 0; }
</span><del>- virtual bool doesHaveAttribute(const AtomicString&) const { return false; }
</del><ins>+ virtual bool doesHaveAttribute(const AtomicString&, AtomicString* = 0) const { return false; }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> virtual void mediaPlayerDidAddAudioTrack(PassRefPtr<AudioTrackPrivate>) { }
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> bool supportsSave() const;
</span><span class="cx"> bool supportsScanning() const;
</span><span class="cx"> bool requiresImmediateCompositing() const;
</span><del>- bool doesHaveAttribute(const AtomicString&) const;
</del><ins>+ bool doesHaveAttribute(const AtomicString&, AtomicString* value = nullptr) const;
</ins><span class="cx"> PlatformMedia platformMedia() const;
</span><span class="cx"> PlatformLayer* platformLayer() const;
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (166249 => 166250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-03-25 20:43:27 UTC (rev 166249)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-03-25 21:00:19 UTC (rev 166250)
</span><span class="lines">@@ -90,6 +90,13 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+@class AVPlayerItem;
+@interface AVPlayerItem (WebKitExtensions)
+@property (nonatomic, copy) NSString* dataYouTubeID;
+@end
+#endif
+
</ins><span class="cx"> SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
</span><span class="cx"> SOFT_LINK_FRAMEWORK_OPTIONAL(CoreMedia)
</span><span class="cx"> SOFT_LINK_FRAMEWORK_OPTIONAL(CoreImage)
</span><span class="lines">@@ -702,6 +709,12 @@
</span><span class="cx"> if (m_avPlayer)
</span><span class="cx"> [m_avPlayer.get() replaceCurrentItemWithPlayerItem:m_avPlayerItem.get()];
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ AtomicString value;
+ if (player()->doesHaveAttribute("data-youtube-id", &value)) {
+ [m_avPlayerItem.get() setDataYouTubeID: value];
+ #endif
+
</ins><span class="cx"> #if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP) && HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
</span><span class="cx"> const NSTimeInterval legibleOutputAdvanceInterval = 2;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>