Title: [110684] trunk/Source/WebCore
- Revision
- 110684
- Author
- [email protected]
- Date
- 2012-03-14 03:11:30 -0700 (Wed, 14 Mar 2012)
Log Message
Unreviewed build fix.
* html/track/TextTrackList.cpp:
(TextTrackList::append):
(TextTrackList::remove):
(TextTrackList::owner): Changed return type from HTMLMediaElement* to Node* and uninlined.
* html/track/TextTrackList.h:
(TextTrackList):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (110683 => 110684)
--- trunk/Source/WebCore/ChangeLog 2012-03-14 10:04:33 UTC (rev 110683)
+++ trunk/Source/WebCore/ChangeLog 2012-03-14 10:11:30 UTC (rev 110684)
@@ -1,3 +1,14 @@
+2012-03-14 Hajime Morrita <[email protected]>
+
+ Unreviewed build fix.
+
+ * html/track/TextTrackList.cpp:
+ (TextTrackList::append):
+ (TextTrackList::remove):
+ (TextTrackList::owner): Changed return type from HTMLMediaElement* to Node* and uninlined.
+ * html/track/TextTrackList.h:
+ (TextTrackList):
+
2012-03-13 Vsevolod Vlasov <[email protected]>
Web Inspector: [InspectorIndexedDB] Remote object should be released when data view is removed/updated.
Modified: trunk/Source/WebCore/html/track/TextTrackList.cpp (110683 => 110684)
--- trunk/Source/WebCore/html/track/TextTrackList.cpp 2012-03-14 10:04:33 UTC (rev 110683)
+++ trunk/Source/WebCore/html/track/TextTrackList.cpp 2012-03-14 10:11:30 UTC (rev 110684)
@@ -109,8 +109,8 @@
} else
ASSERT_NOT_REACHED();
- ASSERT(!track->mediaElement() || track->mediaElement() == owner());
- track->setMediaElement(owner());
+ ASSERT(!track->mediaElement() || track->mediaElement() == m_owner);
+ track->setMediaElement(m_owner);
scheduleAddTrackEvent(track.release());
}
@@ -130,7 +130,7 @@
if (index == notFound)
return;
- ASSERT(track->mediaElement() == owner());
+ ASSERT(track->mediaElement() == m_owner);
track->setMediaElement(0);
tracks->remove(index);
@@ -175,4 +175,9 @@
--m_dispatchingEvents;
}
+Node* TextTrackList::owner() const
+{
+ return m_owner;
+}
+
#endif
Modified: trunk/Source/WebCore/html/track/TextTrackList.h (110683 => 110684)
--- trunk/Source/WebCore/html/track/TextTrackList.h 2012-03-14 10:04:33 UTC (rev 110683)
+++ trunk/Source/WebCore/html/track/TextTrackList.h 2012-03-14 10:11:30 UTC (rev 110684)
@@ -66,7 +66,7 @@
DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack);
void clearOwner() { m_owner = 0; }
- HTMLMediaElement* owner() { return m_owner; }
+ Node* owner() const;
bool isFiringEventListeners() { return m_dispatchingEvents; }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
