Changeset 148752 in webkit

Timestamp:

Apr 19, 2013 10:03:36 AM (11 years ago)

Author:

arv@chromium.org

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSTextTrackListCustom.cpp (modified) (2 diffs)
• html/HTMLMediaElement.cpp (modified) (1 diff)
• html/track/TextTrackList.cpp (modified) (2 diffs)
• html/track/TextTrackList.h (modified) (1 diff)
• html/track/TrackListBase.cpp (modified) (2 diffs)
• html/track/TrackListBase.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-19  Erik Arvidsson  <arv@chromium.org>
+
+        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  <akling@apple.com>
 

trunk/Source/WebCore/bindings/js/JSTextTrackListCustom.cpp

@@ -51 +51 @@
 
     // It is reachable if the media element parent is reachable.
-    return visitor.containsOpaqueRoot(root(textTrackList->owner()));
+    return visitor.containsOpaqueRoot(root(textTrackList->element()));
 }
 
@@ -63 +63 @@
     
     TextTrackList* textTrackList = static_cast<TextTrackList*>(jsTextTrackList->impl());
-    visitor.addOpaqueRoot(root(textTrackList->owner()));
+    visitor.addOpaqueRoot(root(textTrackList->element()));
     textTrackList->visitJSEventListeners(visitor);
 }

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -332 +332 @@
     document()->unregisterForCaptionPreferencesChangedCallbacks(this);
     if (m_textTracks)
-        m_textTracks->clearOwner();
+        m_textTracks->clearElement();
     if (m_textTracks) {
         for (unsigned i = 0; i < m_textTracks->length(); ++i)

trunk/Source/WebCore/html/track/TextTrackList.cpp

@@ -174 +174 @@
     invalidateTrackIndexesAfterTrack(track.get());
 
-    ASSERT(!track->mediaElement() || track->mediaElement() == owner());
-    track->setMediaElement(owner());
+    ASSERT(!track->mediaElement() || track->mediaElement() == element());
+    track->setMediaElement(element());
 
     scheduleAddTrackEvent(track.release());
@@ -199 +199 @@
     invalidateTrackIndexesAfterTrack(textTrack);
 
-    ASSERT(!track->mediaElement() || track->mediaElement() == owner());
+    ASSERT(!track->mediaElement() || track->mediaElement() == element());
     track->setMediaElement(0);
 

trunk/Source/WebCore/html/track/TextTrackList.h

@@ -37 +37 @@
 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();

trunk/Source/WebCore/html/track/TrackListBase.cpp

@@ -38 +38 @@
 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)
@@ -61 +61 @@
     ASSERT(index != notFound);
 
-    ASSERT(track->mediaElement() == m_owner);
+    ASSERT(track->mediaElement() == m_element);
     track->setMediaElement(0);
 

trunk/Source/WebCore/html/track/TrackListBase.h

@@ -59 +59 @@
     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; }
@@ -86 +86 @@
 
     ScriptExecutionContext* m_context;
-    HTMLMediaElement* m_owner;
+    HTMLMediaElement* m_element;
 
     Vector<RefPtr<Event> > m_pendingEvents;