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

Side by Side Diff: third_party/WebKit/Source/core/html/track/TrackBase.cpp

Issue 1973343002: Clean up HTMLTrackElement.kind invalid/missing value default handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 22 matching lines...) Expand all
33 #include "core/html/HTMLMediaElement.h" 33 #include "core/html/HTMLMediaElement.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 static WebMediaPlayer::TrackId nextTrackId() 37 static WebMediaPlayer::TrackId nextTrackId()
38 { 38 {
39 static WebMediaPlayer::TrackId next = 0; 39 static WebMediaPlayer::TrackId next = 0;
40 return ++next; 40 return ++next;
41 } 41 }
42 42
43 TrackBase::TrackBase(WebMediaPlayer::TrackType type, const AtomicString& label, const AtomicString& language, const String& id) 43 TrackBase::TrackBase(WebMediaPlayer::TrackType type, const AtomicString& kind, c onst AtomicString& label, const AtomicString& language, const String& id)
44 : m_trackId(nextTrackId()) 44 : m_trackId(nextTrackId())
45 , m_type(type) 45 , m_type(type)
46 , m_kind(kind)
46 , m_label(label) 47 , m_label(label)
47 , m_language(language) 48 , m_language(language)
48 , m_id(id) 49 , m_id(id)
49 , m_mediaElement(nullptr) 50 , m_mediaElement(nullptr)
50 { 51 {
51 } 52 }
52 53
53 TrackBase::~TrackBase() 54 TrackBase::~TrackBase()
54 { 55 {
55 } 56 }
56 57
57 Node* TrackBase::owner() const 58 Node* TrackBase::owner() const
58 { 59 {
59 return m_mediaElement; 60 return m_mediaElement;
60 } 61 }
61 62
62 DEFINE_TRACE(TrackBase) 63 DEFINE_TRACE(TrackBase)
63 { 64 {
64 Supplementable<TrackBase>::trace(visitor); 65 Supplementable<TrackBase>::trace(visitor);
65 visitor->trace(m_mediaElement); 66 visitor->trace(m_mediaElement);
66 } 67 }
67 68
68 void TrackBase::setKind(const AtomicString& kind) 69 void TrackBase::setKind(const AtomicString& kind)
69 { 70 {
70 if (isValidKind(kind)) 71 m_kind = kind;
71 m_kind = kind;
72 else
73 m_kind = invalidValueDefaultKind();
74 } 72 }
75 73
76 } // namespace blink 74 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/track/TrackBase.h ('k') | third_party/WebKit/Source/core/html/track/VideoTrack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698