<!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>[159950] trunk</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/159950">159950</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-02 12:11:27 -0800 (Mon, 02 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use GenericEventQueue in TrackListBase and reduce code duplication with scheduleTrackEvent()
https://bugs.webkit.org/show_bug.cgi?id=124811
Patch by Brendan Long <b.long@cablelabs.com> on 2013-12-02
Reviewed by Eric Carlson.
Source/WebCore:
No new tests because this is just refactoring.
* html/track/TrackListBase.cpp:
(TrackListBase::TrackListBase): Replace event code with a GenericEventQueue.
(TrackListBase::scheduleTrackEvent): Factor out duplicate code in schedule{Add,Remove}TrackEvent functions.
(TrackListBase::scheduleAddTrackEvent): Same.
(TrackListBase::scheduleRemoveTrackEvent): Same.
(TrackListBase::scheduleChangeEvent): Use GenericEventQueue.
* html/track/TrackListBase.h: Replace event code with GenericEventQueue.
LayoutTests:
* platform/mac/TestExpectations: Unskip onremovetrack test which was fixed a long time ago.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTrackListBasecpp">trunk/Source/WebCore/html/track/TrackListBase.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTrackListBaseh">trunk/Source/WebCore/html/track/TrackListBase.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (159949 => 159950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-02 20:05:26 UTC (rev 159949)
+++ trunk/LayoutTests/ChangeLog 2013-12-02 20:11:27 UTC (rev 159950)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2013-12-02 Brendan Long <b.long@cablelabs.com>
+
+ Use GenericEventQueue in TrackListBase and reduce code duplication with scheduleTrackEvent()
+ https://bugs.webkit.org/show_bug.cgi?id=124811
+
+ Reviewed by Eric Carlson.
+
+ * platform/mac/TestExpectations: Unskip onremovetrack test which was fixed a long time ago.
+
</ins><span class="cx"> 2013-12-02 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for WebCrypto RSA-OAEP
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (159949 => 159950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2013-12-02 20:05:26 UTC (rev 159949)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2013-12-02 20:11:27 UTC (rev 159950)
</span><span class="lines">@@ -375,7 +375,6 @@
</span><span class="cx"> webkit.org/b/103926 media/track/opera/interfaces/TextTrackCue/vertical.html [ Skip ]
</span><span class="cx"> webkit.org/b/103926 media/track/opera/interfaces/TextTrackCueList/getter.html [ Skip ]
</span><span class="cx"> webkit.org/b/103926 media/track/opera/interfaces/TextTrackList/getter.html [ Skip ]
</span><del>-webkit.org/b/103926 media/track/opera/interfaces/TextTrackList/onremovetrack.html [ Skip ]
</del><span class="cx"> webkit.org/b/103926 media/track/opera/track/track-element/cloneNode.html [ Skip ]
</span><span class="cx"> webkit.org/b/103926 media/track/opera/track/track-element/src-clear-cues.html [ Skip ]
</span><span class="cx"> webkit.org/b/103926 media/track/opera/track/webvtt/parsing/001.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159949 => 159950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-02 20:05:26 UTC (rev 159949)
+++ trunk/Source/WebCore/ChangeLog 2013-12-02 20:11:27 UTC (rev 159950)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2013-12-02 Brendan Long <b.long@cablelabs.com>
+
+ Use GenericEventQueue in TrackListBase and reduce code duplication with scheduleTrackEvent()
+ https://bugs.webkit.org/show_bug.cgi?id=124811
+
+ Reviewed by Eric Carlson.
+
+ No new tests because this is just refactoring.
+
+ * html/track/TrackListBase.cpp:
+ (TrackListBase::TrackListBase): Replace event code with a GenericEventQueue.
+ (TrackListBase::scheduleTrackEvent): Factor out duplicate code in schedule{Add,Remove}TrackEvent functions.
+ (TrackListBase::scheduleAddTrackEvent): Same.
+ (TrackListBase::scheduleRemoveTrackEvent): Same.
+ (TrackListBase::scheduleChangeEvent): Use GenericEventQueue.
+ * html/track/TrackListBase.h: Replace event code with GenericEventQueue.
+
</ins><span class="cx"> 2013-12-02 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for WebCrypto RSA-OAEP
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTrackListBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TrackListBase.cpp (159949 => 159950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TrackListBase.cpp 2013-12-02 20:05:26 UTC (rev 159949)
+++ trunk/Source/WebCore/html/track/TrackListBase.cpp 2013-12-02 20:11:27 UTC (rev 159950)
</span><span class="lines">@@ -39,8 +39,7 @@
</span><span class="cx"> TrackListBase::TrackListBase(HTMLMediaElement* element, ScriptExecutionContext* context)
</span><span class="cx"> : m_context(context)
</span><span class="cx"> , m_element(element)
</span><del>- , m_pendingEventTimer(this, &TrackListBase::asyncEventTimerFired)
- , m_dispatchingEvents(0)
</del><ins>+ , m_asyncEventQueue(*this)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(context->isDocument());
</span><span class="cx"> }
</span><span class="lines">@@ -79,6 +78,16 @@
</span><span class="cx"> return m_inbandTracks.find(track) != notFound;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TrackListBase::scheduleTrackEvent(const AtomicString& eventName, PassRefPtr<TrackBase> track)
+{
+ TrackEventInit initializer;
+ initializer.track = track;
+ initializer.bubbles = false;
+ initializer.cancelable = false;
+
+ m_asyncEventQueue.enqueueEvent(TrackEvent::create(eventName, initializer));
+}
+
</ins><span class="cx"> void TrackListBase::scheduleAddTrackEvent(PassRefPtr<TrackBase> track)
</span><span class="cx"> {
</span><span class="cx"> // 4.8.10.5 Loading the media resource
</span><span class="lines">@@ -98,17 +107,8 @@
</span><span class="cx"> // ... then queue a task to fire an event with the name addtrack, that does not
</span><span class="cx"> // bubble and is not cancelable, and that uses the TrackEvent interface, with
</span><span class="cx"> // the track attribute initialized to the text track's TextTrack object, at
</span><del>- // the media element's textTracks attribute's TextTrackList object.
-
- RefPtr<TrackBase> trackRef = track;
- TrackEventInit initializer;
- initializer.track = trackRef;
- initializer.bubbles = false;
- initializer.cancelable = false;
-
- m_pendingEvents.append(TrackEvent::create(eventNames().addtrackEvent, initializer));
- if (!m_pendingEventTimer.isActive())
- m_pendingEventTimer.startOneShot(0);
</del><ins>+ // the media element's textTracks attribute's TextTrackList object.
+ scheduleTrackEvent(eventNames().addtrackEvent, track);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TrackListBase::scheduleRemoveTrackEvent(PassRefPtr<TrackBase> track)
</span><span class="lines">@@ -135,16 +135,7 @@
</span><span class="cx"> // interface, with the track attribute initialized to the text track's
</span><span class="cx"> // TextTrack object, at the media element's textTracks attribute's
</span><span class="cx"> // TextTrackList object.
</span><del>-
- RefPtr<TrackBase> trackRef = track;
- TrackEventInit initializer;
- initializer.track = trackRef;
- initializer.bubbles = false;
- initializer.cancelable = false;
-
- m_pendingEvents.append(TrackEvent::create(eventNames().removetrackEvent, initializer));
- if (!m_pendingEventTimer.isActive())
- m_pendingEventTimer.startOneShot(0);
</del><ins>+ scheduleTrackEvent(eventNames().removetrackEvent, track);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TrackListBase::scheduleChangeEvent()
</span><span class="lines">@@ -162,23 +153,9 @@
</span><span class="cx"> initializer.bubbles = false;
</span><span class="cx"> initializer.cancelable = false;
</span><span class="cx">
</span><del>- m_pendingEvents.append(Event::create(eventNames().changeEvent, initializer));
- if (!m_pendingEventTimer.isActive())
- m_pendingEventTimer.startOneShot(0);
</del><ins>+ m_asyncEventQueue.enqueueEvent(Event::create(eventNames().changeEvent, initializer));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void TrackListBase::asyncEventTimerFired(Timer<TrackListBase>*)
-{
- Vector<RefPtr<Event>> pendingEvents;
-
- ++m_dispatchingEvents;
- m_pendingEvents.swap(pendingEvents);
- size_t count = pendingEvents.size();
- for (size_t index = 0; index < count; ++index)
- dispatchEvent(pendingEvents[index].release(), IGNORE_EXCEPTION);
- --m_dispatchingEvents;
-}
-
</del><span class="cx"> bool TrackListBase::isAnyTrackEnabled() const
</span><span class="cx"> {
</span><span class="cx"> for (size_t i = 0; i < m_inbandTracks.size(); ++i) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTrackListBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TrackListBase.h (159949 => 159950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TrackListBase.h 2013-12-02 20:05:26 UTC (rev 159949)
+++ trunk/Source/WebCore/html/track/TrackListBase.h 2013-12-02 20:11:27 UTC (rev 159950)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "EventListener.h"
</span><span class="cx"> #include "EventTarget.h"
</span><ins>+#include "GenericEventQueue.h"
</ins><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -63,8 +64,6 @@
</span><span class="cx"> Element* element() const;
</span><span class="cx"> HTMLMediaElement* mediaElement() const { return m_element; }
</span><span class="cx">
</span><del>- bool isFiringEventListeners() { return m_dispatchingEvents; }
-
</del><span class="cx"> // Needs to be public so tracks can call it
</span><span class="cx"> void scheduleChangeEvent();
</span><span class="cx">
</span><span class="lines">@@ -79,20 +78,16 @@
</span><span class="cx"> Vector<RefPtr<TrackBase>> m_inbandTracks;
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ void scheduleTrackEvent(const AtomicString& eventName, PassRefPtr<TrackBase>);
</ins><span class="cx">
</span><span class="cx"> // EventTarget
</span><span class="cx"> virtual void refEventTarget() OVERRIDE FINAL { ref(); }
</span><span class="cx"> virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
</span><span class="cx">
</span><del>- void asyncEventTimerFired(Timer<TrackListBase>*);
-
</del><span class="cx"> ScriptExecutionContext* m_context;
</span><span class="cx"> HTMLMediaElement* m_element;
</span><span class="cx">
</span><del>- Vector<RefPtr<Event>> m_pendingEvents;
- Timer<TrackListBase> m_pendingEventTimer;
-
- int m_dispatchingEvents;
</del><ins>+ GenericEventQueue m_asyncEventQueue;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>