Diff
Modified: trunk/Source/WebCore/ChangeLog (148751 => 148752)
--- trunk/Source/WebCore/ChangeLog 2013-04-19 16:40:17 UTC (rev 148751)
+++ trunk/Source/WebCore/ChangeLog 2013-04-19 17:03:36 UTC (rev 148752)
@@ -1,3 +1,30 @@
+2013-04-19 Erik Arvidsson <[email protected]>
+
+ Rename TextTrackList owner to element for consistency
+ https://bugs.webkit.org/show_bug.cgi?id=79822
+
+ Reviewed by Eric Carlson.
+
+ No new tests. Covered by existing tests.
+
+ * bindings/js/JSTextTrackListCustom.cpp:
+ (WebCore::JSTextTrackListOwner::isReachableFromOpaqueRoots):
+ (WebCore::JSTextTrackList::visitChildren):
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::~HTMLMediaElement):
+ * html/track/TextTrackList.cpp:
+ (TextTrackList::append):
+ (TextTrackList::remove):
+ * html/track/TextTrackList.h:
+ (WebCore::TextTrackList::create):
+ * html/track/TrackListBase.cpp:
+ (TrackListBase::TrackListBase):
+ (TrackListBase::remove):
+ * html/track/TrackListBase.h:
+ (WebCore::TrackListBase::clearElement):
+ (WebCore::TrackListBase::element):
+ (TrackListBase):
+
2013-04-19 Andreas Kling <[email protected]>
[Mac] ComplexTextController is slow with large numbers of text runs.
Modified: trunk/Source/WebCore/bindings/js/JSTextTrackListCustom.cpp (148751 => 148752)
--- trunk/Source/WebCore/bindings/js/JSTextTrackListCustom.cpp 2013-04-19 16:40:17 UTC (rev 148751)
+++ trunk/Source/WebCore/bindings/js/JSTextTrackListCustom.cpp 2013-04-19 17:03:36 UTC (rev 148752)
@@ -50,7 +50,7 @@
return false;
// It is reachable if the media element parent is reachable.
- return visitor.containsOpaqueRoot(root(textTrackList->owner()));
+ return visitor.containsOpaqueRoot(root(textTrackList->element()));
}
void JSTextTrackList::visitChildren(JSCell* cell, SlotVisitor& visitor)
@@ -62,7 +62,7 @@
Base::visitChildren(jsTextTrackList, visitor);
TextTrackList* textTrackList = static_cast<TextTrackList*>(jsTextTrackList->impl());
- visitor.addOpaqueRoot(root(textTrackList->owner()));
+ visitor.addOpaqueRoot(root(textTrackList->element()));
textTrackList->visitJSEventListeners(visitor);
}
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (148751 => 148752)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-04-19 16:40:17 UTC (rev 148751)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-04-19 17:03:36 UTC (rev 148752)
@@ -331,7 +331,7 @@
#if ENABLE(VIDEO_TRACK)
document()->unregisterForCaptionPreferencesChangedCallbacks(this);
if (m_textTracks)
- m_textTracks->clearOwner();
+ m_textTracks->clearElement();
if (m_textTracks) {
for (unsigned i = 0; i < m_textTracks->length(); ++i)
m_textTracks->item(i)->clearClient();
Modified: trunk/Source/WebCore/html/track/TextTrackList.cpp (148751 => 148752)
--- trunk/Source/WebCore/html/track/TextTrackList.cpp 2013-04-19 16:40:17 UTC (rev 148751)
+++ trunk/Source/WebCore/html/track/TextTrackList.cpp 2013-04-19 17:03:36 UTC (rev 148752)
@@ -173,8 +173,8 @@
invalidateTrackIndexesAfterTrack(track.get());
- ASSERT(!track->mediaElement() || track->mediaElement() == owner());
- track->setMediaElement(owner());
+ ASSERT(!track->mediaElement() || track->mediaElement() == element());
+ track->setMediaElement(element());
scheduleAddTrackEvent(track.release());
}
@@ -198,7 +198,7 @@
invalidateTrackIndexesAfterTrack(textTrack);
- ASSERT(!track->mediaElement() || track->mediaElement() == owner());
+ ASSERT(!track->mediaElement() || track->mediaElement() == element());
track->setMediaElement(0);
RefPtr<TrackBase> trackRef = (*tracks)[index];
Modified: trunk/Source/WebCore/html/track/TextTrackList.h (148751 => 148752)
--- trunk/Source/WebCore/html/track/TextTrackList.h 2013-04-19 16:40:17 UTC (rev 148751)
+++ trunk/Source/WebCore/html/track/TextTrackList.h 2013-04-19 17:03:36 UTC (rev 148752)
@@ -36,9 +36,9 @@
class TextTrackList : public TrackListBase {
public:
- static PassRefPtr<TextTrackList> create(HTMLMediaElement* owner, ScriptExecutionContext* context)
+ static PassRefPtr<TextTrackList> create(HTMLMediaElement* element, ScriptExecutionContext* context)
{
- return adoptRef(new TextTrackList(owner, context));
+ return adoptRef(new TextTrackList(element, context));
}
~TextTrackList();
Modified: trunk/Source/WebCore/html/track/TrackListBase.cpp (148751 => 148752)
--- trunk/Source/WebCore/html/track/TrackListBase.cpp 2013-04-19 16:40:17 UTC (rev 148751)
+++ trunk/Source/WebCore/html/track/TrackListBase.cpp 2013-04-19 17:03:36 UTC (rev 148752)
@@ -37,9 +37,9 @@
using namespace WebCore;
-TrackListBase::TrackListBase(HTMLMediaElement* owner, ScriptExecutionContext* context)
+TrackListBase::TrackListBase(HTMLMediaElement* element, ScriptExecutionContext* context)
: m_context(context)
- , m_owner(owner)
+ , m_element(element)
, m_pendingEventTimer(this, &TrackListBase::asyncEventTimerFired)
, m_dispatchingEvents(0)
{
@@ -60,7 +60,7 @@
size_t index = m_inbandTracks.find(track);
ASSERT(index != notFound);
- ASSERT(track->mediaElement() == m_owner);
+ ASSERT(track->mediaElement() == m_element);
track->setMediaElement(0);
RefPtr<TrackBase> trackRef = m_inbandTracks[index];
Modified: trunk/Source/WebCore/html/track/TrackListBase.h (148751 => 148752)
--- trunk/Source/WebCore/html/track/TrackListBase.h 2013-04-19 16:40:17 UTC (rev 148751)
+++ trunk/Source/WebCore/html/track/TrackListBase.h 2013-04-19 17:03:36 UTC (rev 148752)
@@ -58,8 +58,8 @@
DEFINE_ATTRIBUTE_EVENT_LISTENER(change);
DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack);
- void clearOwner() { m_owner = 0; }
- HTMLMediaElement* owner() const { return m_owner; }
+ void clearElement() { m_element = 0; }
+ HTMLMediaElement* element() const { return m_element; }
bool isFiringEventListeners() { return m_dispatchingEvents; }
@@ -85,7 +85,7 @@
void asyncEventTimerFired(Timer<TrackListBase>*);
ScriptExecutionContext* m_context;
- HTMLMediaElement* m_owner;
+ HTMLMediaElement* m_element;
Vector<RefPtr<Event> > m_pendingEvents;
Timer<TrackListBase> m_pendingEventTimer;
