<!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>[174338] 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/174338">174338</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-05 22:10:55 -0700 (Sun, 05 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use is<>() / downcast<>() for TextTrack subclasses
https://bugs.webkit.org/show_bug.cgi?id=137438
Reviewed by Ryosuke Niwa.
Use is<>() / downcast<>() for TextTrack subclasses.
No new tests, no behavior change.
* Modules/mediasource/SourceBuffer.cpp:
(WebCore::SourceBuffer::sourceBufferPrivateDidReceiveInitializationSegment):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
* html/track/InbandTextTrack.h:
(isType):
* html/track/LoadableTextTrack.h:
(isType):
* html/track/TextTrackList.cpp:
(TextTrackList::getTrackIndex):
(TextTrackList::append): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceSourceBuffercpp">trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackInbandTextTrackh">trunk/Source/WebCore/html/track/InbandTextTrack.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackLoadableTextTrackh">trunk/Source/WebCore/html/track/LoadableTextTrack.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackListcpp">trunk/Source/WebCore/html/track/TextTrackList.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174337 => 174338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-06 05:08:31 UTC (rev 174337)
+++ trunk/Source/WebCore/ChangeLog 2014-10-06 05:10:55 UTC (rev 174338)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-10-05 Christophe Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Use is<>() / downcast<>() for TextTrack subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=137438
+
+ Reviewed by Ryosuke Niwa.
+
+ Use is<>() / downcast<>() for TextTrack subclasses.
+
+ No new tests, no behavior change.
+
+ * Modules/mediasource/SourceBuffer.cpp:
+ (WebCore::SourceBuffer::sourceBufferPrivateDidReceiveInitializationSegment):
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute):
+ * html/track/InbandTextTrack.h:
+ (isType):
+ * html/track/LoadableTextTrack.h:
+ (isType):
+ * html/track/TextTrackList.cpp:
+ (TextTrackList::getTrackIndex):
+ (TextTrackList::append): Deleted.
+
+2014-10-05 Christophe Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Use is<>() / downcast<>() for CryptoKeyData subclasses
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137437
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceSourceBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (174337 => 174338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2014-10-06 05:08:31 UTC (rev 174337)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2014-10-06 05:10:55 UTC (rev 174338)
</span><span class="lines">@@ -922,13 +922,13 @@
</span><span class="cx"> ASSERT(segment.textTracks.size() == textTracks()->length());
</span><span class="cx"> for (auto& textTrackInfo : segment.textTracks) {
</span><span class="cx"> if (textTracks()->length() == 1) {
</span><del>- toInbandTextTrack(textTracks()->item(0))->setPrivate(textTrackInfo.track);
</del><ins>+ downcast<InbandTextTrack>(*textTracks()->item(0)).setPrivate(textTrackInfo.track);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto textTrack = textTracks()->getTrackById(textTrackInfo.track->id());
</span><span class="cx"> ASSERT(textTrack);
</span><del>- toInbandTextTrack(textTrack)->setPrivate(textTrackInfo.track);
</del><ins>+ downcast<InbandTextTrack>(*textTrack).setPrivate(textTrackInfo.track);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (auto& trackBuffer : m_trackBufferMap.values())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (174337 => 174338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-10-06 05:08:31 UTC (rev 174337)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-10-06 05:10:55 UTC (rev 174338)
</span><span class="lines">@@ -1467,9 +1467,9 @@
</span><span class="cx">
</span><span class="cx"> // ... if the text track has a corresponding track element, to then fire a
</span><span class="cx"> // simple event named cuechange at the track element as well.
</span><del>- if (affectedTracks[i]->trackType() == TextTrack::TrackElement) {
</del><ins>+ if (is<LoadableTextTrack>(*affectedTracks[i])) {
</ins><span class="cx"> RefPtr<Event> event = Event::create(eventNames().cuechangeEvent, false, false);
</span><del>- HTMLTrackElement* trackElement = static_cast<LoadableTextTrack*>(affectedTracks[i])->trackElement();
</del><ins>+ HTMLTrackElement* trackElement = downcast<LoadableTextTrack>(*affectedTracks[i]).trackElement();
</ins><span class="cx"> ASSERT(trackElement);
</span><span class="cx"> event->setTarget(trackElement);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackInbandTextTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/InbandTextTrack.h (174337 => 174338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/InbandTextTrack.h 2014-10-06 05:08:31 UTC (rev 174337)
+++ trunk/Source/WebCore/html/track/InbandTextTrack.h 2014-10-06 05:10:55 UTC (rev 174338)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "TextTrack.h"
</span><span class="cx"> #include "TextTrackCueGeneric.h"
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -92,9 +93,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-TYPE_CASTS_BASE(InbandTextTrack, TextTrack, track, track->isInband(), track.isInband());
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif
-#endif
</del><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::InbandTextTrack)
+ static bool isType(const WebCore::TextTrack& track) { return track.isInband(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
+#endif // ENABLE(VIDEO_TRACK)
+
+#endif // InbandTextTrack_h
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmltrackLoadableTextTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/LoadableTextTrack.h (174337 => 174338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/LoadableTextTrack.h 2014-10-06 05:08:31 UTC (rev 174337)
+++ trunk/Source/WebCore/html/track/LoadableTextTrack.h 2014-10-06 05:10:55 UTC (rev 174338)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "TextTrack.h"
</span><span class="cx"> #include "TextTrackLoader.h"
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -79,5 +80,10 @@
</span><span class="cx"> };
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif
-#endif
</del><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::LoadableTextTrack)
+ static bool isType(const WebCore::TextTrack& track) { return track.trackType() == WebCore::TextTrack::TrackElement; }
+SPECIALIZE_TYPE_TRAITS_END()
+
+#endif // ENABLE(VIDEO_TRACK)
+
+#endif // LoadableTextTrack_h
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrackList.cpp (174337 => 174338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TextTrackList.cpp 2014-10-06 05:08:31 UTC (rev 174337)
+++ trunk/Source/WebCore/html/track/TextTrackList.cpp 2014-10-06 05:10:55 UTC (rev 174338)
</span><span class="lines">@@ -51,10 +51,10 @@
</span><span class="cx"> return m_addTrackTracks.size() + m_elementTracks.size() + m_inbandTracks.size();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int TextTrackList::getTrackIndex(TextTrack *textTrack)
</del><ins>+int TextTrackList::getTrackIndex(TextTrack* textTrack)
</ins><span class="cx"> {
</span><del>- if (textTrack->trackType() == TextTrack::TrackElement)
- return static_cast<LoadableTextTrack*>(textTrack)->trackElementIndex();
</del><ins>+ if (is<LoadableTextTrack>(textTrack))
+ return downcast<LoadableTextTrack>(*textTrack).trackElementIndex();
</ins><span class="cx">
</span><span class="cx"> if (textTrack->trackType() == TextTrack::AddTrack)
</span><span class="cx"> return m_elementTracks.size() + m_addTrackTracks.find(textTrack);
</span><span class="lines">@@ -176,9 +176,9 @@
</span><span class="cx">
</span><span class="cx"> if (track->trackType() == TextTrack::AddTrack)
</span><span class="cx"> m_addTrackTracks.append(track);
</span><del>- else if (track->trackType() == TextTrack::TrackElement) {
</del><ins>+ else if (is<LoadableTextTrack>(*track)) {
</ins><span class="cx"> // Insert tracks added for <track> element in tree order.
</span><del>- size_t index = static_cast<LoadableTextTrack*>(track.get())->trackElementIndex();
</del><ins>+ size_t index = downcast<LoadableTextTrack>(*track).trackElementIndex();
</ins><span class="cx"> m_elementTracks.insert(index, track);
</span><span class="cx"> } else if (track->trackType() == TextTrack::InBand) {
</span><span class="cx"> // Insert tracks added for in-band in the media file order.
</span></span></pre>
</div>
</div>
</body>
</html>