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

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

Issue 60763002: Never create HTMLTrackElement when VideoTrack is not enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: consistency Created 7 years, 1 month 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
« no previous file with comments | « Source/core/html/HTMLTagNames.in ('k') | Source/platform/RuntimeEnabledFeatures.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLTrackElement.cpp
diff --git a/Source/core/html/HTMLTrackElement.cpp b/Source/core/html/HTMLTrackElement.cpp
index 00231371f29abbb390559068a79d40348fd88eac..9858080fb54992e85c8325f11e50861a2206df00 100644
--- a/Source/core/html/HTMLTrackElement.cpp
+++ b/Source/core/html/HTMLTrackElement.cpp
@@ -31,7 +31,6 @@
#include "core/events/Event.h"
#include "core/html/HTMLMediaElement.h"
#include "core/frame/ContentSecurityPolicy.h"
-#include "RuntimeEnabledFeatures.h"
#include "platform/Logging.h"
using namespace std;
@@ -94,23 +93,22 @@ void HTMLTrackElement::removedFrom(ContainerNode* insertionPoint)
void HTMLTrackElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
{
- if (RuntimeEnabledFeatures::videoTrackEnabled()) {
- if (name == srcAttr) {
- if (!value.isEmpty())
- scheduleLoad();
- else if (m_track)
- m_track->removeAllCues();
-
- // 4.8.10.12.3 Sourcing out-of-band text tracks
- // As the kind, label, and srclang attributes are set, changed, or removed, the text track must update accordingly...
- } else if (name == kindAttr)
- track()->setKind(value.lower());
- else if (name == labelAttr)
- track()->setLabel(value);
- else if (name == srclangAttr)
- track()->setLanguage(value);
- else if (name == defaultAttr)
- track()->setIsDefault(!value.isNull());
+ if (name == srcAttr) {
+ if (!value.isEmpty())
+ scheduleLoad();
+ else if (m_track)
+ m_track->removeAllCues();
+
+ // 4.8.10.12.3 Sourcing out-of-band text tracks
+ // As the kind, label, and srclang attributes are set, changed, or removed, the text track must update accordingly...
+ } else if (name == kindAttr) {
+ track()->setKind(value.lower());
+ } else if (name == labelAttr) {
+ track()->setLabel(value);
+ } else if (name == srclangAttr) {
+ track()->setLanguage(value);
+ } else if (name == defaultAttr) {
+ track()->setIsDefault(!value.isNull());
}
HTMLElement::parseAttribute(name, value);
@@ -187,9 +185,6 @@ void HTMLTrackElement::scheduleLoad()
if (m_loadTimer.isActive())
return;
- if (!RuntimeEnabledFeatures::videoTrackEnabled())
- return;
-
// 2. If the text track's text track mode is not set to one of hidden or showing, abort these steps.
if (ensureTrack()->mode() != TextTrack::hiddenKeyword() && ensureTrack()->mode() != TextTrack::showingKeyword())
return;
@@ -227,9 +222,6 @@ void HTMLTrackElement::loadTimerFired(Timer<HTMLTrackElement>*)
bool HTMLTrackElement::canLoadUrl(const KURL& url)
{
- if (!RuntimeEnabledFeatures::videoTrackEnabled())
- return false;
-
HTMLMediaElement* parent = mediaElement();
if (!parent)
return false;
« no previous file with comments | « Source/core/html/HTMLTagNames.in ('k') | Source/platform/RuntimeEnabledFeatures.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698