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

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

Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-5
Patch Set: get-names-6: . Created 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 const AtomicString& kind(); 44 const AtomicString& kind();
45 void setKind(const AtomicString&); 45 void setKind(const AtomicString&);
46 46
47 enum ReadyState { 47 enum ReadyState {
48 NONE = 0, 48 NONE = 0,
49 LOADING = 1, 49 LOADING = 1,
50 LOADED = 2, 50 LOADED = 2,
51 TRACK_ERROR = 3 51 TRACK_ERROR = 3
52 }; 52 };
53 ReadyState readyState(); 53 ReadyState getReadyState();
54 void scheduleLoad(); 54 void scheduleLoad();
55 55
56 TextTrack* track(); 56 TextTrack* track();
57 57
58 DECLARE_VIRTUAL_TRACE(); 58 DECLARE_VIRTUAL_TRACE();
59 59
60 private: 60 private:
61 explicit HTMLTrackElement(Document&); 61 explicit HTMLTrackElement(Document&);
62 ~HTMLTrackElement() override; 62 ~HTMLTrackElement() override;
63 63
(...skipping 27 matching lines...) Expand all
91 91
92 PersistentWillBeMember<LoadableTextTrack> m_track; 92 PersistentWillBeMember<LoadableTextTrack> m_track;
93 OwnPtrWillBeMember<TextTrackLoader> m_loader; 93 OwnPtrWillBeMember<TextTrackLoader> m_loader;
94 Timer<HTMLTrackElement> m_loadTimer; 94 Timer<HTMLTrackElement> m_loadTimer;
95 KURL m_url; 95 KURL m_url;
96 }; 96 };
97 97
98 } // namespace blink 98 } // namespace blink
99 99
100 #endif // HTMLTrackElement_h 100 #endif // HTMLTrackElement_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLMediaElement.idl ('k') | third_party/WebKit/Source/core/html/HTMLTrackElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698