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

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

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes 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 * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 108
109 bool hasBeenConfigured() const { return m_hasBeenConfigured; } 109 bool hasBeenConfigured() const { return m_hasBeenConfigured; }
110 void setHasBeenConfigured(bool flag) { m_hasBeenConfigured = flag; } 110 void setHasBeenConfigured(bool flag) { m_hasBeenConfigured = flag; }
111 111
112 virtual bool isDefault() const { return false; } 112 virtual bool isDefault() const { return false; }
113 113
114 void removeAllCues(); 114 void removeAllCues();
115 115
116 // EventTarget methods 116 // EventTarget methods
117 const AtomicString& interfaceName() const override; 117 const AtomicString& interfaceName() const override;
118 ExecutionContext* executionContext() const override; 118 ExecutionContext* getExecutionContext() const override;
119 119
120 DECLARE_VIRTUAL_TRACE(); 120 DECLARE_VIRTUAL_TRACE();
121 121
122 protected: 122 protected:
123 TextTrack(const AtomicString& kind, const AtomicString& label, const AtomicS tring& language, const AtomicString& id, TextTrackType); 123 TextTrack(const AtomicString& kind, const AtomicString& label, const AtomicS tring& language, const AtomicString& id, TextTrackType);
124 124
125 bool isValidKind(const AtomicString& kind) const override { return isValidKi ndKeyword(kind); } 125 bool isValidKind(const AtomicString& kind) const override { return isValidKi ndKeyword(kind); }
126 AtomicString defaultKind() const override { return subtitlesKeyword(); } 126 AtomicString defaultKind() const override { return subtitlesKeyword(); }
127 127
128 void addListOfCues(HeapVector<Member<TextTrackCue>>&); 128 void addListOfCues(HeapVector<Member<TextTrackCue>>&);
(...skipping 15 matching lines...) Expand all
144 int m_trackIndex; 144 int m_trackIndex;
145 int m_renderedTrackIndex; 145 int m_renderedTrackIndex;
146 bool m_hasBeenConfigured; 146 bool m_hasBeenConfigured;
147 }; 147 };
148 148
149 DEFINE_TRACK_TYPE_CASTS(TextTrack, TrackBase::TextTrack); 149 DEFINE_TRACK_TYPE_CASTS(TextTrack, TrackBase::TextTrack);
150 150
151 } // namespace blink 151 } // namespace blink
152 152
153 #endif // TextTrack_h 153 #endif // TextTrack_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp ('k') | third_party/WebKit/Source/core/html/track/TextTrack.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698