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

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

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) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 String id() const { return m_id; } 56 String id() const { return m_id; }
57 void setId(const String& id) { m_id = id; } 57 void setId(const String& id) { m_id = id; }
58 58
59 void setMediaElement(HTMLMediaElement* mediaElement) { m_mediaElement = medi aElement; } 59 void setMediaElement(HTMLMediaElement* mediaElement) { m_mediaElement = medi aElement; }
60 HTMLMediaElement* mediaElement() const { return m_mediaElement; } 60 HTMLMediaElement* mediaElement() const { return m_mediaElement; }
61 Node* owner() const; 61 Node* owner() const;
62 62
63 DECLARE_VIRTUAL_TRACE(); 63 DECLARE_VIRTUAL_TRACE();
64 64
65 protected: 65 protected:
66 TrackBase(WebMediaPlayer::TrackType, const AtomicString& label, const Atomic String& language, const String& id); 66 TrackBase(WebMediaPlayer::TrackType, const AtomicString& kind, const AtomicS tring& label, const AtomicString& language, const String& id);
67
68 virtual bool isValidKind(const AtomicString&) const = 0;
69 virtual AtomicString invalidValueDefaultKind() const = 0;
70 67
71 private: 68 private:
72 WebMediaPlayer::TrackId m_trackId; 69 WebMediaPlayer::TrackId m_trackId;
73 WebMediaPlayer::TrackType m_type; 70 WebMediaPlayer::TrackType m_type;
74 AtomicString m_kind; 71 AtomicString m_kind;
75 AtomicString m_label; 72 AtomicString m_label;
76 AtomicString m_language; 73 AtomicString m_language;
77 String m_id; 74 String m_id;
78 Member<HTMLMediaElement> m_mediaElement; 75 Member<HTMLMediaElement> m_mediaElement;
79 }; 76 };
80 77
81 #define DEFINE_TRACK_TYPE_CASTS(thisType, predicate) \ 78 #define DEFINE_TRACK_TYPE_CASTS(thisType, predicate) \
82 DEFINE_TYPE_CASTS(thisType, TrackBase, track, track->type() == predicate, tr ack.type() == predicate) 79 DEFINE_TYPE_CASTS(thisType, TrackBase, track, track->type() == predicate, tr ack.type() == predicate)
83 80
84 } // namespace blink 81 } // namespace blink
85 82
86 #endif // TrackBase_h 83 #endif // TrackBase_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/track/TextTrack.cpp ('k') | third_party/WebKit/Source/core/html/track/TrackBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698