<!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>[172868] 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/172868">172868</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-08-22 13:10:21 -0700 (Fri, 22 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Cleanup media code
https://bugs.webkit.org/show_bug.cgi?id=136163
Reviewed by Jer Noble.
No new tests, no functionality was changed.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::HTMLMediaElement): Don't initialize m_requestingPlay.
(WebCore::HTMLMediaElement::parseMediaPlayerAttribute): Deleted.
(WebCore::HTMLMediaElement::parseAttribute): Don't call parseMediaPlayerAttribute.
(WebCore::HTMLMediaElement::playInternal): m_requestingPlay is dead, Jim.
(WebCore::HTMLMediaElement::updatePlayState): Ditto.
(WebCore::HTMLMediaElement::updatePlayState): Remove obsolete FIXME.
* html/HTMLMediaElement.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::attributeChanged): Deleted.
(WebCore::MediaPlayer::readyForPlayback): Deleted.
* platform/graphics/MediaPlayer.h:
* platform/graphics/MediaPlayerPrivate.h:
(WebCore::MediaPlayerPrivateInterface::attributeChanged): Deleted.
(WebCore::MediaPlayerPrivateInterface::readyForPlayback): Deleted.</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="#trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh">trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172867 => 172868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-08-22 19:54:30 UTC (rev 172867)
+++ trunk/Source/WebCore/ChangeLog        2014-08-22 20:10:21 UTC (rev 172868)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-08-22 Eric Carlson <eric.carlson@apple.com>
+
+ [iOS] Cleanup media code
+ https://bugs.webkit.org/show_bug.cgi?id=136163
+
+ Reviewed by Jer Noble.
+
+ No new tests, no functionality was changed.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::HTMLMediaElement): Don't initialize m_requestingPlay.
+ (WebCore::HTMLMediaElement::parseMediaPlayerAttribute): Deleted.
+ (WebCore::HTMLMediaElement::parseAttribute): Don't call parseMediaPlayerAttribute.
+ (WebCore::HTMLMediaElement::playInternal): m_requestingPlay is dead, Jim.
+ (WebCore::HTMLMediaElement::updatePlayState): Ditto.
+ (WebCore::HTMLMediaElement::updatePlayState): Remove obsolete FIXME.
+ * html/HTMLMediaElement.h:
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::attributeChanged): Deleted.
+ (WebCore::MediaPlayer::readyForPlayback): Deleted.
+ * platform/graphics/MediaPlayer.h:
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::attributeChanged): Deleted.
+ (WebCore::MediaPlayerPrivateInterface::readyForPlayback): Deleted.
+
</ins><span class="cx"> 2014-08-20 Maciej Stachowiak <mjs@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace use of WKCopyCFLocalizationPreferredName with NSLocale public API
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (172867 => 172868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp        2014-08-22 19:54:30 UTC (rev 172867)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp        2014-08-22 20:10:21 UTC (rev 172868)
</span><span class="lines">@@ -312,9 +312,6 @@
</span><span class="cx"> , m_havePreparedToPlay(false)
</span><span class="cx"> , m_parsingInProgress(createdByParser)
</span><span class="cx"> , m_elementIsHidden(document.hidden())
</span><del>-#if PLATFORM(IOS)
- , m_requestingPlay(false)
-#endif
</del><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx"> , m_mediaControlsDependOnPageScaleFactor(false)
</span><span class="cx"> #endif
</span><span class="lines">@@ -514,35 +511,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-bool HTMLMediaElement::parseMediaPlayerAttribute(const QualifiedName& name, const AtomicString& value)
-{
- ASSERT(m_player);
- if (name == data_youtube_idAttr) {
- m_player->attributeChanged(name.toString(), value);
- return true;
- }
- if (name == titleAttr) {
- m_player->attributeChanged(name.toString(), value);
- return true;
- }
-
- if (Settings* settings = document().settings()) {
-#if ENABLE(IOS_AIRPLAY)
- if (name == webkitairplayAttr && settings->mediaPlaybackAllowsAirPlay()) {
- m_player->attributeChanged(name.toString(), value);
- return true;
- }
-#endif
- if (name == webkit_playsinlineAttr && settings->mediaPlaybackAllowsInline()) {
- m_player->attributeChanged(name.toString(), ASCIILiteral(value.isNull() ? "false" : "true"));
- return true;
- }
- }
- return false;
-}
-#endif
-
</del><span class="cx"> void HTMLMediaElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="cx"> {
</span><span class="cx"> if (name == srcAttr) {
</span><span class="lines">@@ -634,10 +602,6 @@
</span><span class="cx"> else if (name == onwebkitplaybacktargetavailabilitychangedAttr)
</span><span class="cx"> setAttributeEventListener(eventNames().webkitplaybacktargetavailabilitychangedEvent, name, value);
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(IOS)
- else if (m_player && parseMediaPlayerAttribute(name, value))
- return;
-#endif
</del><span class="cx"> else
</span><span class="cx"> HTMLElement::parseAttribute(name, value);
</span><span class="cx"> }
</span><span class="lines">@@ -2784,9 +2748,6 @@
</span><span class="cx"> scheduleEvent(eventNames().playingEvent);
</span><span class="cx"> }
</span><span class="cx"> m_autoplaying = false;
</span><del>-#if PLATFORM(IOS)
- m_requestingPlay = true;
-#endif
</del><span class="cx"> updatePlayState();
</span><span class="cx"> updateMediaController();
</span><span class="cx"> }
</span><span class="lines">@@ -4573,10 +4534,6 @@
</span><span class="cx"> m_activityToken = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- m_requestingPlay = false;
-#endif
-
</del><span class="cx"> updateMediaController();
</span><span class="cx">
</span><span class="cx"> if (renderer())
</span><span class="lines">@@ -4754,9 +4711,6 @@
</span><span class="cx"> // m_error is only left at MEDIA_ERR_ABORTED when the document becomes inactive (it is set to
</span><span class="cx"> // MEDIA_ERR_ABORTED while the abortEvent is being sent, but cleared immediately afterwards).
</span><span class="cx"> // This behavior is not specified but it seems like a sensible thing to do.
</span><del>-#if PLATFORM(IOS)
- // FIXME: <rdar://problem/9751303> Merge: Does r1033092 need to be refixed in ToT?
-#endif
</del><span class="cx"> // As it is not safe to immedately start loading now, let's schedule a load.
</span><span class="cx"> scheduleDelayedAction(LoadMediaResource);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (172867 => 172868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h        2014-08-22 19:54:30 UTC (rev 172867)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h        2014-08-22 20:10:21 UTC (rev 172868)
</span><span class="lines">@@ -646,10 +646,6 @@
</span><span class="cx"> double minTimeSeekable() const;
</span><span class="cx"> double maxTimeSeekable() const;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- bool parseMediaPlayerAttribute(const QualifiedName&, const AtomicString&);
-#endif
-
</del><span class="cx"> // Pauses playback without changing any states or generating events
</span><span class="cx"> void setPausedInternal(bool);
</span><span class="cx">
</span><span class="lines">@@ -828,10 +824,6 @@
</span><span class="cx"> bool m_parsingInProgress : 1;
</span><span class="cx"> bool m_elementIsHidden : 1;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- bool m_requestingPlay : 1;
-#endif
-
</del><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx"> bool m_mediaControlsDependOnPageScaleFactor : 1;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (172867 => 172868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp        2014-08-22 19:54:30 UTC (rev 172867)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp        2014-08-22 20:10:21 UTC (rev 172868)
</span><span class="lines">@@ -1029,18 +1029,6 @@
</span><span class="cx"> m_private->setPrivateBrowsingMode(m_privateBrowsing);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-void MediaPlayer::attributeChanged(const String& name, const String& value)
-{
- m_private->attributeChanged(name, value);
-}
-
-bool MediaPlayer::readyForPlayback() const
-{
- return m_private->readyForPlayback();
-}
-#endif
-
</del><span class="cx"> // Client callbacks.
</span><span class="cx"> void MediaPlayer::networkStateChanged()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (172867 => 172868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h        2014-08-22 19:54:30 UTC (rev 172867)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h        2014-08-22 20:10:21 UTC (rev 172868)
</span><span class="lines">@@ -536,11 +536,6 @@
</span><span class="cx">
</span><span class="cx"> String engineDescription() const;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- void attributeChanged(const String& name, const String& value);
- bool readyForPlayback() const;
-#endif
-
</del><span class="cx"> CachedResourceLoader* cachedResourceLoader();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (172867 => 172868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h        2014-08-22 19:54:30 UTC (rev 172867)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h        2014-08-22 20:10:21 UTC (rev 172868)
</span><span class="lines">@@ -238,11 +238,6 @@
</span><span class="cx"> virtual void simulateAudioInterruption() { }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- virtual void attributeChanged(const String&, const String&) { }
- virtual bool readyForPlayback() const { return true; }
-#endif
-
</del><span class="cx"> virtual String languageOfPrimaryAudioTrack() const { return emptyString(); }
</span><span class="cx">
</span><span class="cx"> virtual size_t extraMemoryCost() const { return 0; }
</span></span></pre>
</div>
</div>
</body>
</html>