<!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>[173969] 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/173969">173969</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-09-25 10:23:21 -0700 (Thu, 25 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Minor refactoring to mediaType/presentationType
https://bugs.webkit.org/show_bug.cgi?id=137085
Reviewed by Eric Carlson.
Add overloads for presentationType for the audio and video
HTML elements so that we don't have to explicity check the
tag name (via string comparison) to identify the type of
element.
No new tests. Should create no change in behavior.
* html/HTMLAudioElement.h: Overload presentationType to always
indicate audio type.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaType): Use the presentationType
method implementation, rather than duplicating that code.
* html/HTMLVideoElement.h: Overload presentationType to always
return video type.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAudioElementh">trunk/Source/WebCore/html/HTMLAudioElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLVideoElementh">trunk/Source/WebCore/html/HTMLVideoElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173968 => 173969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-25 16:17:45 UTC (rev 173968)
+++ trunk/Source/WebCore/ChangeLog 2014-09-25 17:23:21 UTC (rev 173969)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-09-25 Brent Fulgham <bfulgham@apple.com>
+
+ Minor refactoring to mediaType/presentationType
+ https://bugs.webkit.org/show_bug.cgi?id=137085
+
+ Reviewed by Eric Carlson.
+
+ Add overloads for presentationType for the audio and video
+ HTML elements so that we don't have to explicity check the
+ tag name (via string comparison) to identify the type of
+ element.
+
+ No new tests. Should create no change in behavior.
+
+ * html/HTMLAudioElement.h: Overload presentationType to always
+ indicate audio type.
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::mediaType): Use the presentationType
+ method implementation, rather than duplicating that code.
+ * html/HTMLVideoElement.h: Overload presentationType to always
+ return video type.
+
</ins><span class="cx"> 2014-09-25 Javier Fernandez <jfernandez@igalia.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: columnCount in WebCore::CSSParser::parseGridTemplateAreasRow
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAudioElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAudioElement.h (173968 => 173969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAudioElement.h 2014-09-25 16:17:45 UTC (rev 173968)
+++ trunk/Source/WebCore/html/HTMLAudioElement.h 2014-09-25 17:23:21 UTC (rev 173969)
</span><span class="lines">@@ -41,6 +41,8 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> HTMLAudioElement(const QualifiedName&, Document&, bool);
</span><ins>+
+ virtual MediaSession::MediaType presentationType() const override { return MediaSession::Audio; }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } //namespace
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (173968 => 173969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-09-25 16:17:45 UTC (rev 173968)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-09-25 17:23:21 UTC (rev 173969)
</span><span class="lines">@@ -5914,10 +5914,7 @@
</span><span class="cx"> if (m_player && m_readyState >= HAVE_METADATA)
</span><span class="cx"> return hasVideo() ? MediaSession::Video : MediaSession::Audio;
</span><span class="cx">
</span><del>- if (hasTagName(HTMLNames::videoTag))
- return MediaSession::Video;
-
- return MediaSession::Audio;
</del><ins>+ return presentationType();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaSession::MediaType HTMLMediaElement::presentationType() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLVideoElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLVideoElement.h (173968 => 173969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLVideoElement.h 2014-09-25 16:17:45 UTC (rev 173968)
+++ trunk/Source/WebCore/html/HTMLVideoElement.h 2014-09-25 17:23:21 UTC (rev 173969)
</span><span class="lines">@@ -97,6 +97,8 @@
</span><span class="cx"> virtual void didMoveToNewDocument(Document* oldDocument) override;
</span><span class="cx"> virtual void setDisplayMode(DisplayMode) override;
</span><span class="cx">
</span><ins>+ virtual MediaSession::MediaType presentationType() const override { return MediaSession::Video; }
+
</ins><span class="cx"> std::unique_ptr<HTMLImageLoader> m_imageLoader;
</span><span class="cx">
</span><span class="cx"> AtomicString m_defaultPosterURL;
</span></span></pre>
</div>
</div>
</body>
</html>