Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(946)

Unified Diff: Source/core/html/HTMLMediaElement.cpp

Issue 195813003: Use new is*Element() helper functions further more in HTML code (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix bad assertion Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/html/HTMLMediaElement.cpp
diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp
index 7d18cd590f2593af0cc3e76038f2b06a936d858d..47d690db9e70f8f430bcf19a962089a60015a0bd 100644
--- a/Source/core/html/HTMLMediaElement.cpp
+++ b/Source/core/html/HTMLMediaElement.cpp
@@ -2319,8 +2319,6 @@ TextTrackList* HTMLMediaElement::textTracks()
void HTMLMediaElement::didAddTrackElement(HTMLTrackElement* trackElement)
{
- ASSERT(trackElement->hasTagName(trackTag));
adamk 2014/03/13 20:20:36 Do you understand why this was here before? I cert
philipj_slow 2014/03/14 02:20:01 It's from <http://trac.webkit.org/changeset/102968
-
if (!RuntimeEnabledFeatures::videoTrackEnabled())
return;
@@ -2345,16 +2343,12 @@ void HTMLMediaElement::didAddTrackElement(HTMLTrackElement* trackElement)
void HTMLMediaElement::didRemoveTrackElement(HTMLTrackElement* trackElement)
{
- ASSERT(trackElement->hasTagName(trackTag));
-
if (!RuntimeEnabledFeatures::videoTrackEnabled())
return;
#if !LOG_DISABLED
- if (trackElement->hasTagName(trackTag)) {
- KURL url = trackElement->getNonEmptyURLAttribute(srcAttr);
- WTF_LOG(Media, "HTMLMediaElement::didRemoveTrackElement - 'src' is %s", urlForLoggingMedia(url).utf8().data());
- }
+ KURL url = trackElement->getNonEmptyURLAttribute(srcAttr);
+ WTF_LOG(Media, "HTMLMediaElement::didRemoveTrackElement - 'src' is %s", urlForLoggingMedia(url).utf8().data());
#endif
RefPtr<TextTrack> textTrack = trackElement->track();
@@ -2594,7 +2588,7 @@ KURL HTMLMediaElement::selectNextSourceChild(ContentType* contentType, String* k
continue;
lookingForStartNode = false;
- if (!node->hasTagName(sourceTag))
+ if (!isHTMLSourceElement(*node))
continue;
if (node->parentNode() != this)
continue;
@@ -2668,10 +2662,8 @@ void HTMLMediaElement::sourceWasAdded(HTMLSourceElement* source)
WTF_LOG(Media, "HTMLMediaElement::sourceWasAdded(%p)", source);
#if !LOG_DISABLED
- if (source->hasTagName(sourceTag)) {
- KURL url = source->getNonEmptyURLAttribute(srcAttr);
- WTF_LOG(Media, "HTMLMediaElement::sourceWasAdded - 'src' is %s", urlForLoggingMedia(url).utf8().data());
- }
+ KURL url = source->getNonEmptyURLAttribute(srcAttr);
+ WTF_LOG(Media, "HTMLMediaElement::sourceWasAdded - 'src' is %s", urlForLoggingMedia(url).utf8().data());
#endif
// We should only consider a <source> element when there is not src attribute at all.
@@ -2716,10 +2708,8 @@ void HTMLMediaElement::sourceWasRemoved(HTMLSourceElement* source)
WTF_LOG(Media, "HTMLMediaElement::sourceWasRemoved(%p)", source);
#if !LOG_DISABLED
- if (source->hasTagName(sourceTag)) {
- KURL url = source->getNonEmptyURLAttribute(srcAttr);
- WTF_LOG(Media, "HTMLMediaElement::sourceWasRemoved - 'src' is %s", urlForLoggingMedia(url).utf8().data());
- }
+ KURL url = source->getNonEmptyURLAttribute(srcAttr);
+ WTF_LOG(Media, "HTMLMediaElement::sourceWasRemoved - 'src' is %s", urlForLoggingMedia(url).utf8().data());
#endif
if (source != m_currentSourceNode && source != m_nextChildNodeToConsider)

Powered by Google App Engine
This is Rietveld 408576698