diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/html/track')
32 files changed, 150 insertions, 151 deletions
diff --git a/chromium/third_party/blink/renderer/core/html/track/audio_track_list.cc b/chromium/third_party/blink/renderer/core/html/track/audio_track_list.cc index 9c306e33048..0b9cb73be56 100644 --- a/chromium/third_party/blink/renderer/core/html/track/audio_track_list.cc +++ b/chromium/third_party/blink/renderer/core/html/track/audio_track_list.cc @@ -25,7 +25,7 @@ bool AudioTrackList::HasEnabledTrack() const { } const AtomicString& AudioTrackList::InterfaceName() const { - return EventTargetNames::AudioTrackList; + return event_target_names::kAudioTrackList; } } // namespace blink diff --git a/chromium/third_party/blink/renderer/core/html/track/cue_timeline.cc b/chromium/third_party/blink/renderer/core/html/track/cue_timeline.cc index 791d3112662..37f7e02c0fb 100644 --- a/chromium/third_party/blink/renderer/core/html/track/cue_timeline.cc +++ b/chromium/third_party/blink/renderer/core/html/track/cue_timeline.cc @@ -299,13 +299,13 @@ void CueTimeline::UpdateActiveCues(double movie_time) { // less than the endTime in the cue. if (task.second->startTime() >= task.second->endTime()) { media_element.ScheduleEvent( - CreateEventWithTarget(EventTypeNames::enter, task.second.Get())); + CreateEventWithTarget(event_type_names::kEnter, task.second.Get())); media_element.ScheduleEvent( - CreateEventWithTarget(EventTypeNames::exit, task.second.Get())); + CreateEventWithTarget(event_type_names::kExit, task.second.Get())); } else { bool is_enter_event = task.first == task.second->startTime(); AtomicString event_name = - is_enter_event ? EventTypeNames::enter : EventTypeNames::exit; + is_enter_event ? event_type_names::kEnter : event_type_names::kExit; media_element.ScheduleEvent( CreateEventWithTarget(event_name, task.second.Get())); } @@ -320,7 +320,7 @@ void CueTimeline::UpdateActiveCues(double movie_time) { // ... for (const auto& track : affected_tracks) { media_element.ScheduleEvent( - CreateEventWithTarget(EventTypeNames::cuechange, track.Get())); + CreateEventWithTarget(event_type_names::kCuechange, track.Get())); // ... if the text track has a corresponding track element, to then fire a // simple event named cuechange at the track element as well. @@ -329,7 +329,7 @@ void CueTimeline::UpdateActiveCues(double movie_time) { ToLoadableTextTrack(track.Get())->TrackElement(); DCHECK(track_element); media_element.ScheduleEvent( - CreateEventWithTarget(EventTypeNames::cuechange, track_element)); + CreateEventWithTarget(event_type_names::kCuechange, track_element)); } } diff --git a/chromium/third_party/blink/renderer/core/html/track/html_track_element.cc b/chromium/third_party/blink/renderer/core/html/track/html_track_element.cc index ba60beffed9..21b74d44baa 100644 --- a/chromium/third_party/blink/renderer/core/html/track/html_track_element.cc +++ b/chromium/third_party/blink/renderer/core/html/track/html_track_element.cc @@ -38,7 +38,7 @@ namespace blink { -using namespace HTMLNames; +using namespace html_names; static String UrlForLoggingTrack(const KURL& url) { static const unsigned kMaximumURLLengthForLogging = 128; @@ -49,7 +49,7 @@ static String UrlForLoggingTrack(const KURL& url) { } inline HTMLTrackElement::HTMLTrackElement(Document& document) - : HTMLElement(trackTag, document), + : HTMLElement(kTrackTag, document), load_timer_(document.GetTaskRunner(TaskType::kNetworking), this, &HTMLTrackElement::LoadTimerFired) { @@ -89,13 +89,13 @@ void HTMLTrackElement::RemovedFrom(ContainerNode& insertion_point) { void HTMLTrackElement::ParseAttribute( const AttributeModificationParams& params) { const QualifiedName& name = params.name; - if (name == srcAttr) { + if (name == kSrcAttr) { ScheduleLoad(); // 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) { + } else if (name == kKindAttr) { AtomicString lower_case_value = params.new_value.LowerASCII(); // 'missing value default' ("subtitles") if (lower_case_value.IsNull()) @@ -105,11 +105,11 @@ void HTMLTrackElement::ParseAttribute( lower_case_value = TextTrack::MetadataKeyword(); track()->SetKind(lower_case_value); - } else if (name == labelAttr) { + } else if (name == kLabelAttr) { track()->SetLabel(params.new_value); - } else if (name == srclangAttr) { + } else if (name == kSrclangAttr) { track()->SetLanguage(params.new_value); - } else if (name == idAttr) { + } else if (name == kIdAttr) { track()->SetId(params.new_value); } @@ -121,7 +121,7 @@ const AtomicString& HTMLTrackElement::kind() { } void HTMLTrackElement::setKind(const AtomicString& kind) { - setAttribute(kindAttr, kind); + setAttribute(kKindAttr, kind); } LoadableTextTrack* HTMLTrackElement::EnsureTrack() { @@ -137,7 +137,7 @@ TextTrack* HTMLTrackElement::track() { } bool HTMLTrackElement::IsURLAttribute(const Attribute& attribute) const { - return attribute.GetName() == srcAttr || + return attribute.GetName() == kSrcAttr || HTMLElement::IsURLAttribute(attribute); } @@ -175,7 +175,7 @@ void HTMLTrackElement::LoadTimerFired(TimerBase*) { DVLOG(TRACK_LOG_LEVEL) << "loadTimerFired"; // 7. [X] Let URL be the track URL of the track element. - KURL url = GetNonEmptyURLAttribute(srcAttr); + KURL url = GetNonEmptyURLAttribute(kSrcAttr); // Whenever a track element has its src attribute set, changed, // or removed, the user agent must immediately empty the @@ -265,7 +265,7 @@ void HTMLTrackElement::DidCompleteLoad(LoadStatus status) { // simple event named error at the track element. if (status == kFailure) { SetReadyState(kError); - DispatchEvent(*Event::Create(EventTypeNames::error)); + DispatchEvent(*Event::Create(event_type_names::kError)); return; } @@ -275,7 +275,7 @@ void HTMLTrackElement::DidCompleteLoad(LoadStatus status) { // readiness state to loaded, and fire a simple event named load at the track // element. SetReadyState(kLoaded); - DispatchEvent(*Event::Create(EventTypeNames::load)); + DispatchEvent(*Event::Create(event_type_names::kLoad)); } void HTMLTrackElement::NewCuesAvailable(TextTrackLoader* loader) { @@ -327,7 +327,7 @@ HTMLTrackElement::ReadyState HTMLTrackElement::getReadyState() { const AtomicString& HTMLTrackElement::MediaElementCrossOriginAttribute() const { if (HTMLMediaElement* parent = MediaElement()) - return parent->FastGetAttribute(HTMLNames::crossoriginAttr); + return parent->FastGetAttribute(html_names::kCrossoriginAttr); return g_null_atom; } diff --git a/chromium/third_party/blink/renderer/core/html/track/inband_text_track.cc b/chromium/third_party/blink/renderer/core/html/track/inband_text_track.cc index 454642cd60c..3c0f256c32d 100644 --- a/chromium/third_party/blink/renderer/core/html/track/inband_text_track.cc +++ b/chromium/third_party/blink/renderer/core/html/track/inband_text_track.cc @@ -60,7 +60,7 @@ const AtomicString& TextTrackKindToString(WebInbandTextTrack::Kind kind) { } // namespace InbandTextTrack* InbandTextTrack::Create(WebInbandTextTrack* web_track) { - return new InbandTextTrack(web_track); + return MakeGarbageCollected<InbandTextTrack>(web_track); } InbandTextTrack::InbandTextTrack(WebInbandTextTrack* web_track) diff --git a/chromium/third_party/blink/renderer/core/html/track/inband_text_track.h b/chromium/third_party/blink/renderer/core/html/track/inband_text_track.h index 6d4c15ff4b0..819df92fa70 100644 --- a/chromium/third_party/blink/renderer/core/html/track/inband_text_track.h +++ b/chromium/third_party/blink/renderer/core/html/track/inband_text_track.h @@ -42,13 +42,13 @@ class InbandTextTrack final : public TextTrack, public WebInbandTextTrackClient { public: static InbandTextTrack* Create(WebInbandTextTrack*); + + explicit InbandTextTrack(WebInbandTextTrack*); ~InbandTextTrack() override; void SetTrackList(TextTrackList*) override; private: - explicit InbandTextTrack(WebInbandTextTrack*); - void AddWebVTTCue(double, double, const WebString&, diff --git a/chromium/third_party/blink/renderer/core/html/track/loadable_text_track.cc b/chromium/third_party/blink/renderer/core/html/track/loadable_text_track.cc index 5cc4303c694..adc5bf3e86d 100644 --- a/chromium/third_party/blink/renderer/core/html/track/loadable_text_track.cc +++ b/chromium/third_party/blink/renderer/core/html/track/loadable_text_track.cc @@ -43,7 +43,7 @@ LoadableTextTrack::LoadableTextTrack(HTMLTrackElement* track) LoadableTextTrack::~LoadableTextTrack() = default; bool LoadableTextTrack::IsDefault() const { - return track_element_->FastHasAttribute(HTMLNames::defaultAttr); + return track_element_->FastHasAttribute(html_names::kDefaultAttr); } void LoadableTextTrack::setMode(const AtomicString& mode) { diff --git a/chromium/third_party/blink/renderer/core/html/track/loadable_text_track.h b/chromium/third_party/blink/renderer/core/html/track/loadable_text_track.h index fd35fee038c..2a5f44c740b 100644 --- a/chromium/third_party/blink/renderer/core/html/track/loadable_text_track.h +++ b/chromium/third_party/blink/renderer/core/html/track/loadable_text_track.h @@ -37,8 +37,10 @@ class HTMLTrackElement; class LoadableTextTrack final : public TextTrack { public: static LoadableTextTrack* Create(HTMLTrackElement* track) { - return new LoadableTextTrack(track); + return MakeGarbageCollected<LoadableTextTrack>(track); } + + explicit LoadableTextTrack(HTMLTrackElement*); ~LoadableTextTrack() override; // TextTrack method. @@ -54,8 +56,6 @@ class LoadableTextTrack final : public TextTrack { void Trace(blink::Visitor*) override; private: - explicit LoadableTextTrack(HTMLTrackElement*); - Member<HTMLTrackElement> track_element_; }; diff --git a/chromium/third_party/blink/renderer/core/html/track/text_track.cc b/chromium/third_party/blink/renderer/core/html/track/text_track.cc index 36828b44680..59c52cdb198 100644 --- a/chromium/third_party/blink/renderer/core/html/track/text_track.cc +++ b/chromium/third_party/blink/renderer/core/html/track/text_track.cc @@ -348,7 +348,7 @@ int TextTrack::TrackIndexRelativeToRenderedTracks() { } const AtomicString& TextTrack::InterfaceName() const { - return EventTargetNames::TextTrack; + return event_target_names::kTextTrack; } ExecutionContext* TextTrack::GetExecutionContext() const { diff --git a/chromium/third_party/blink/renderer/core/html/track/text_track.h b/chromium/third_party/blink/renderer/core/html/track/text_track.h index 323e86eeb7c..6f291977244 100644 --- a/chromium/third_party/blink/renderer/core/html/track/text_track.h +++ b/chromium/third_party/blink/renderer/core/html/track/text_track.h @@ -53,8 +53,17 @@ class CORE_EXPORT TextTrack : public EventTargetWithInlineData, static TextTrack* Create(const AtomicString& kind, const AtomicString& label, const AtomicString& language) { - return new TextTrack(kind, label, language, g_empty_atom, kAddTrack); + return MakeGarbageCollected<TextTrack>(kind, label, language, g_empty_atom, + kAddTrack); } + + enum TextTrackType { kTrackElement, kAddTrack, kInBand }; + + TextTrack(const AtomicString& kind, + const AtomicString& label, + const AtomicString& language, + const AtomicString& id, + TextTrackType); ~TextTrack() override; virtual void SetTrackList(TextTrackList*); @@ -102,9 +111,8 @@ class CORE_EXPORT TextTrack : public EventTargetWithInlineData, void CueWillChange(TextTrackCue*); void CueDidChange(TextTrackCue*, bool update_cue_index); - DEFINE_ATTRIBUTE_EVENT_LISTENER(cuechange); + DEFINE_ATTRIBUTE_EVENT_LISTENER(cuechange, kCuechange); - enum TextTrackType { kTrackElement, kAddTrack, kInBand }; TextTrackType TrackType() const { return track_type_; } int TrackIndex(); @@ -128,12 +136,6 @@ class CORE_EXPORT TextTrack : public EventTargetWithInlineData, void Trace(blink::Visitor*) override; protected: - TextTrack(const AtomicString& kind, - const AtomicString& label, - const AtomicString& language, - const AtomicString& id, - TextTrackType); - void AddListOfCues(HeapVector<Member<TextTrackCue>>&); private: diff --git a/chromium/third_party/blink/renderer/core/html/track/text_track_container.cc b/chromium/third_party/blink/renderer/core/html/track/text_track_container.cc index f2b58c04b6a..8a571082375 100644 --- a/chromium/third_party/blink/renderer/core/html/track/text_track_container.cc +++ b/chromium/third_party/blink/renderer/core/html/track/text_track_container.cc @@ -77,7 +77,7 @@ void TextTrackContainer::Trace(blink::Visitor* visitor) { TextTrackContainer* TextTrackContainer::Create( HTMLMediaElement& media_element) { TextTrackContainer* element = - new TextTrackContainer(media_element.GetDocument()); + MakeGarbageCollected<TextTrackContainer>(media_element.GetDocument()); element->SetShadowPseudoId( AtomicString("-webkit-media-text-track-container")); if (IsHTMLVideoElement(media_element)) diff --git a/chromium/third_party/blink/renderer/core/html/track/text_track_container.h b/chromium/third_party/blink/renderer/core/html/track/text_track_container.h index d265cd73ec7..01a234e7400 100644 --- a/chromium/third_party/blink/renderer/core/html/track/text_track_container.h +++ b/chromium/third_party/blink/renderer/core/html/track/text_track_container.h @@ -40,6 +40,8 @@ class TextTrackContainer final : public HTMLDivElement { public: static TextTrackContainer* Create(HTMLMediaElement&); + TextTrackContainer(Document&); + // Runs the "rules for updating the text track rendering". The // ExposingControls enum is used in the WebVTT processing model to reset the // layout when the media controls become visible, to avoid overlapping them. @@ -53,8 +55,6 @@ class TextTrackContainer final : public HTMLDivElement { void Trace(blink::Visitor*) override; private: - TextTrackContainer(Document&); - bool IsTextTrackContainer() const override { return true; } void ObserveSizeChanges(Element&); diff --git a/chromium/third_party/blink/renderer/core/html/track/text_track_cue.cc b/chromium/third_party/blink/renderer/core/html/track/text_track_cue.cc index 2c037af48f5..ee1c59a070e 100644 --- a/chromium/third_party/blink/renderer/core/html/track/text_track_cue.cc +++ b/chromium/third_party/blink/renderer/core/html/track/text_track_cue.cc @@ -129,7 +129,7 @@ DispatchEventResult TextTrackCue::DispatchEventInternal(Event& event) { } const AtomicString& TextTrackCue::InterfaceName() const { - return EventTargetNames::TextTrackCue; + return event_target_names::kTextTrackCue; } void TextTrackCue::Trace(blink::Visitor* visitor) { diff --git a/chromium/third_party/blink/renderer/core/html/track/text_track_cue.h b/chromium/third_party/blink/renderer/core/html/track/text_track_cue.h index 51d3734993d..e992c3ff305 100644 --- a/chromium/third_party/blink/renderer/core/html/track/text_track_cue.h +++ b/chromium/third_party/blink/renderer/core/html/track/text_track_cue.h @@ -94,8 +94,8 @@ class TextTrackCue : public EventTargetWithInlineData { virtual String ToString() const = 0; #endif - DEFINE_ATTRIBUTE_EVENT_LISTENER(enter); - DEFINE_ATTRIBUTE_EVENT_LISTENER(exit); + DEFINE_ATTRIBUTE_EVENT_LISTENER(enter, kEnter); + DEFINE_ATTRIBUTE_EVENT_LISTENER(exit, kExit); void Trace(blink::Visitor*) override; diff --git a/chromium/third_party/blink/renderer/core/html/track/text_track_cue_list.h b/chromium/third_party/blink/renderer/core/html/track/text_track_cue_list.h index a72890ca84e..a08d4e41d9a 100644 --- a/chromium/third_party/blink/renderer/core/html/track/text_track_cue_list.h +++ b/chromium/third_party/blink/renderer/core/html/track/text_track_cue_list.h @@ -37,7 +37,11 @@ class TextTrackCueList final : public ScriptWrappable { DEFINE_WRAPPERTYPEINFO(); public: - static TextTrackCueList* Create() { return new TextTrackCueList; } + static TextTrackCueList* Create() { + return MakeGarbageCollected<TextTrackCueList>(); + } + + TextTrackCueList(); wtf_size_t length() const; @@ -59,7 +63,6 @@ class TextTrackCueList final : public ScriptWrappable { void Trace(blink::Visitor*) override; private: - TextTrackCueList(); wtf_size_t FindInsertionIndex(const TextTrackCue*) const; void InvalidateCueIndex(wtf_size_t index); void Clear(); diff --git a/chromium/third_party/blink/renderer/core/html/track/text_track_list.cc b/chromium/third_party/blink/renderer/core/html/track/text_track_list.cc index ae30ca5edb2..126f1e0eb46 100644 --- a/chromium/third_party/blink/renderer/core/html/track/text_track_list.cc +++ b/chromium/third_party/blink/renderer/core/html/track/text_track_list.cc @@ -236,7 +236,7 @@ bool TextTrackList::Contains(TextTrack* track) const { } const AtomicString& TextTrackList::InterfaceName() const { - return EventTargetNames::TextTrackList; + return event_target_names::kTextTrackList; } ExecutionContext* TextTrackList::GetExecutionContext() const { @@ -256,7 +256,7 @@ void TextTrackList::ScheduleAddTrackEvent(TextTrack* track) { // not bubble and is not cancelable, and that uses the TrackEvent interface, // with the track attribute initialized to the text track's TextTrack object, // at the media element's textTracks attribute's TextTrackList object. - ScheduleTrackEvent(EventTypeNames::addtrack, track); + ScheduleTrackEvent(event_type_names::kAddtrack, track); } void TextTrackList::ScheduleChangeEvent() { @@ -267,7 +267,7 @@ void TextTrackList::ScheduleChangeEvent() { // ... // Fire a simple event named change at the media element's textTracks // attribute's TextTrackList object. - EnqueueEvent(*Event::Create(EventTypeNames::change), + EnqueueEvent(*Event::Create(event_type_names::kChange), TaskType::kMediaElementEvent); } @@ -281,7 +281,7 @@ void TextTrackList::ScheduleRemoveTrackEvent(TextTrack* track) { // interface, with the track attribute initialized to the text track's // TextTrack object, at the media element's textTracks attribute's // TextTrackList object. - ScheduleTrackEvent(EventTypeNames::removetrack, track); + ScheduleTrackEvent(event_type_names::kRemovetrack, track); } bool TextTrackList::HasShowingTracks() { diff --git a/chromium/third_party/blink/renderer/core/html/track/text_track_list.h b/chromium/third_party/blink/renderer/core/html/track/text_track_list.h index 45fde7480e2..f8f8ad3f4e7 100644 --- a/chromium/third_party/blink/renderer/core/html/track/text_track_list.h +++ b/chromium/third_party/blink/renderer/core/html/track/text_track_list.h @@ -43,8 +43,10 @@ class CORE_EXPORT TextTrackList final : public EventTargetWithInlineData { public: static TextTrackList* Create(HTMLMediaElement* owner) { - return new TextTrackList(owner); + return MakeGarbageCollected<TextTrackList>(owner); } + + explicit TextTrackList(HTMLMediaElement*); ~TextTrackList() override; unsigned length() const; @@ -61,9 +63,9 @@ class CORE_EXPORT TextTrackList final : public EventTargetWithInlineData { const AtomicString& InterfaceName() const override; ExecutionContext* GetExecutionContext() const override; - DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack); - DEFINE_ATTRIBUTE_EVENT_LISTENER(change); - DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack); + DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack, kAddtrack); + DEFINE_ATTRIBUTE_EVENT_LISTENER(change, kChange); + DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack, kRemovetrack); HTMLMediaElement* Owner() const; @@ -75,8 +77,6 @@ class CORE_EXPORT TextTrackList final : public EventTargetWithInlineData { void Trace(blink::Visitor*) override; private: - explicit TextTrackList(HTMLMediaElement*); - void ScheduleTrackEvent(const AtomicString& event_name, TextTrack*); void ScheduleAddTrackEvent(TextTrack*); diff --git a/chromium/third_party/blink/renderer/core/html/track/track_event.cc b/chromium/third_party/blink/renderer/core/html/track/track_event.cc index 88ef5ca41f7..218fb465a53 100644 --- a/chromium/third_party/blink/renderer/core/html/track/track_event.cc +++ b/chromium/third_party/blink/renderer/core/html/track/track_event.cc @@ -27,6 +27,7 @@ #include "third_party/blink/public/platform/web_media_player.h" #include "third_party/blink/renderer/bindings/core/v8/video_track_or_audio_track_or_text_track.h" +#include "third_party/blink/renderer/core/event_interface_names.h" #include "third_party/blink/renderer/core/html/track/audio_track.h" #include "third_party/blink/renderer/core/html/track/text_track.h" #include "third_party/blink/renderer/core/html/track/video_track.h" @@ -36,12 +37,12 @@ namespace blink { TrackEvent::TrackEvent() = default; TrackEvent::TrackEvent(const AtomicString& type, - const TrackEventInit& initializer) + const TrackEventInit* initializer) : Event(type, initializer) { - if (!initializer.hasTrack()) + if (!initializer->hasTrack()) return; - const VideoTrackOrAudioTrackOrTextTrack& track = initializer.track(); + const VideoTrackOrAudioTrackOrTextTrack& track = initializer->track(); if (track.IsVideoTrack()) track_ = track.GetAsVideoTrack(); else if (track.IsAudioTrack()) @@ -55,7 +56,7 @@ TrackEvent::TrackEvent(const AtomicString& type, TrackEvent::~TrackEvent() = default; const AtomicString& TrackEvent::InterfaceName() const { - return EventNames::TrackEvent; + return event_interface_names::kTrackEvent; } void TrackEvent::track(VideoTrackOrAudioTrackOrTextTrack& return_value) { diff --git a/chromium/third_party/blink/renderer/core/html/track/track_event.h b/chromium/third_party/blink/renderer/core/html/track/track_event.h index 9349378700b..ce10e6c3f87 100644 --- a/chromium/third_party/blink/renderer/core/html/track/track_event.h +++ b/chromium/third_party/blink/renderer/core/html/track/track_event.h @@ -38,18 +38,21 @@ class CORE_EXPORT TrackEvent final : public Event { DEFINE_WRAPPERTYPEINFO(); public: + TrackEvent(); + TrackEvent(const AtomicString& type, const TrackEventInit* initializer); + TrackEvent(const AtomicString& type, TrackBase* track) + : Event(type, Bubbles::kNo, Cancelable::kNo), track_(track) {} ~TrackEvent() override; - static TrackEvent* Create() { return new TrackEvent; } + static TrackEvent* Create() { return MakeGarbageCollected<TrackEvent>(); } static TrackEvent* Create(const AtomicString& type, - const TrackEventInit& initializer) { - return new TrackEvent(type, initializer); + const TrackEventInit* initializer) { + return MakeGarbageCollected<TrackEvent>(type, initializer); } - template <typename T> - static TrackEvent* Create(const AtomicString& type, T* track) { - return new TrackEvent(type, track); + static TrackEvent* Create(const AtomicString& type, TrackBase* track) { + return MakeGarbageCollected<TrackEvent>(type, track); } const AtomicString& InterfaceName() const override; @@ -59,12 +62,6 @@ class CORE_EXPORT TrackEvent final : public Event { void Trace(blink::Visitor*) override; private: - TrackEvent(); - TrackEvent(const AtomicString& type, const TrackEventInit& initializer); - template <typename T> - TrackEvent(const AtomicString& type, T* track) - : Event(type, Bubbles::kNo, Cancelable::kNo), track_(track) {} - Member<TrackBase> track_; }; diff --git a/chromium/third_party/blink/renderer/core/html/track/track_list_base.h b/chromium/third_party/blink/renderer/core/html/track/track_list_base.h index 0ddbf151553..ebfc9ac6d80 100644 --- a/chromium/third_party/blink/renderer/core/html/track/track_list_base.h +++ b/chromium/third_party/blink/renderer/core/html/track/track_list_base.h @@ -37,9 +37,9 @@ class TrackListBase : public EventTargetWithInlineData { return nullptr; } - DEFINE_ATTRIBUTE_EVENT_LISTENER(change); - DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack); - DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack); + DEFINE_ATTRIBUTE_EVENT_LISTENER(change, kChange); + DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack, kAddtrack); + DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack, kRemovetrack); // EventTarget interface ExecutionContext* GetExecutionContext() const override { @@ -51,7 +51,7 @@ class TrackListBase : public EventTargetWithInlineData { void Add(T* track) { track->SetMediaElement(media_element_); tracks_.push_back(track); - ScheduleEvent(TrackEvent::Create(EventTypeNames::addtrack, track)); + ScheduleEvent(TrackEvent::Create(event_type_names::kAddtrack, track)); } void Remove(WebMediaPlayer::TrackId track_id) { @@ -61,7 +61,7 @@ class TrackListBase : public EventTargetWithInlineData { tracks_[i]->SetMediaElement(nullptr); ScheduleEvent( - TrackEvent::Create(EventTypeNames::removetrack, tracks_[i].Get())); + TrackEvent::Create(event_type_names::kRemovetrack, tracks_[i].Get())); tracks_.EraseAt(i); return; } @@ -76,7 +76,7 @@ class TrackListBase : public EventTargetWithInlineData { } void ScheduleChangeEvent() { - ScheduleEvent(Event::Create(EventTypeNames::change)); + ScheduleEvent(Event::Create(event_type_names::kChange)); } void Trace(blink::Visitor* visitor) override { diff --git a/chromium/third_party/blink/renderer/core/html/track/video_track.h b/chromium/third_party/blink/renderer/core/html/track/video_track.h index 1e922dea2bc..3f836c9a67b 100644 --- a/chromium/third_party/blink/renderer/core/html/track/video_track.h +++ b/chromium/third_party/blink/renderer/core/html/track/video_track.h @@ -21,10 +21,16 @@ class CORE_EXPORT VideoTrack final : public ScriptWrappable, public TrackBase { const AtomicString& label, const AtomicString& language, bool selected) { - return new VideoTrack(id, IsValidKindKeyword(kind) ? kind : g_empty_atom, - label, language, selected); + return MakeGarbageCollected<VideoTrack>( + id, IsValidKindKeyword(kind) ? kind : g_empty_atom, label, language, + selected); } + VideoTrack(const String& id, + const AtomicString& kind, + const AtomicString& label, + const AtomicString& language, + bool selected); ~VideoTrack() override; void Trace(blink::Visitor*) override; @@ -46,12 +52,6 @@ class CORE_EXPORT VideoTrack final : public ScriptWrappable, public TrackBase { static bool IsValidKindKeyword(const String&); private: - VideoTrack(const String& id, - const AtomicString& kind, - const AtomicString& label, - const AtomicString& language, - bool selected); - bool selected_; }; diff --git a/chromium/third_party/blink/renderer/core/html/track/video_track_list.cc b/chromium/third_party/blink/renderer/core/html/track/video_track_list.cc index b782edd1c69..a84e34adf44 100644 --- a/chromium/third_party/blink/renderer/core/html/track/video_track_list.cc +++ b/chromium/third_party/blink/renderer/core/html/track/video_track_list.cc @@ -10,7 +10,7 @@ namespace blink { VideoTrackList* VideoTrackList::Create(HTMLMediaElement& media_element) { - return new VideoTrackList(media_element); + return MakeGarbageCollected<VideoTrackList>(media_element); } VideoTrackList::~VideoTrackList() = default; @@ -19,7 +19,7 @@ VideoTrackList::VideoTrackList(HTMLMediaElement& media_element) : TrackListBase<VideoTrack>(&media_element) {} const AtomicString& VideoTrackList::InterfaceName() const { - return EventTargetNames::VideoTrackList; + return event_target_names::kVideoTrackList; } int VideoTrackList::selectedIndex() const { diff --git a/chromium/third_party/blink/renderer/core/html/track/video_track_list.h b/chromium/third_party/blink/renderer/core/html/track/video_track_list.h index 2d1b95c75d9..fbe37cf3618 100644 --- a/chromium/third_party/blink/renderer/core/html/track/video_track_list.h +++ b/chromium/third_party/blink/renderer/core/html/track/video_track_list.h @@ -16,6 +16,7 @@ class CORE_EXPORT VideoTrackList final : public TrackListBase<VideoTrack> { public: static VideoTrackList* Create(HTMLMediaElement&); + explicit VideoTrackList(HTMLMediaElement&); ~VideoTrackList() override; int selectedIndex() const; @@ -28,9 +29,6 @@ class CORE_EXPORT VideoTrackList final : public TrackListBase<VideoTrack> { void Trace(blink::Visitor* visitor) override { TrackListBase<VideoTrack>::Trace(visitor); } - - private: - explicit VideoTrackList(HTMLMediaElement&); }; } // namespace blink diff --git a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_cue.cc b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_cue.cc index a147bf0f02e..df6990bb286 100644 --- a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_cue.cc +++ b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_cue.cc @@ -30,7 +30,7 @@ #include "third_party/blink/renderer/core/html/track/vtt/vtt_cue.h" #include "third_party/blink/renderer/bindings/core/v8/double_or_auto_keyword.h" -#include "third_party/blink/renderer/core/css_property_names.h" +#include "third_party/blink/renderer/core/css/css_property_names.h" #include "third_party/blink/renderer/core/css_value_keywords.h" #include "third_party/blink/renderer/core/dom/document_fragment.h" #include "third_party/blink/renderer/core/dom/events/event.h" @@ -530,8 +530,8 @@ class VTTTextRunIterator : public TextRunIterator { // Within a cue, paragraph boundaries are only denoted by Type B characters, // such as U+000A LINE FEED (LF), U+0085 NEXT LINE (NEL), // and U+2029 PARAGRAPH SEPARATOR. - return WTF::Unicode::Category(Current()) & - WTF::Unicode::kSeparator_Paragraph; + return WTF::unicode::Category(Current()) & + WTF::unicode::kSeparator_Paragraph; } }; diff --git a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_cue.h b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_cue.h index 59271258e49..2d2df08047c 100644 --- a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_cue.h +++ b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_cue.h @@ -62,14 +62,14 @@ struct VTTDisplayParameters { class VTTCueBox final : public HTMLDivElement { public: static VTTCueBox* Create(Document& document) { - return new VTTCueBox(document); + return MakeGarbageCollected<VTTCueBox>(document); } + explicit VTTCueBox(Document&); + void ApplyCSSProperties(const VTTDisplayParameters&); private: - explicit VTTCueBox(Document&); - LayoutObject* CreateLayoutObject(const ComputedStyle&) override; // The computed line position for snap-to-lines layout, and NaN for @@ -86,9 +86,10 @@ class VTTCue final : public TextTrackCue { double start_time, double end_time, const String& text) { - return new VTTCue(document, start_time, end_time, text); + return MakeGarbageCollected<VTTCue>(document, start_time, end_time, text); } + VTTCue(Document&, double start_time, double end_time, const String& text); ~VTTCue() override; VTTRegion* region() const { return region_; } @@ -157,8 +158,6 @@ class VTTCue final : public TextTrackCue { void Trace(blink::Visitor*) override; private: - VTTCue(Document&, double start_time, double end_time, const String& text); - Document& GetDocument() const; VTTCueBox* GetDisplayTree(); diff --git a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_element.cc b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_element.cc index 4e705cf4b64..1ca3c8f1ad0 100644 --- a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_element.cc +++ b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_element.cc @@ -71,7 +71,7 @@ VTTElement::VTTElement(VTTNodeType node_type, Document* document) web_vtt_node_type_(node_type) {} VTTElement* VTTElement::Create(VTTNodeType node_type, Document* document) { - return new VTTElement(node_type, document); + return MakeGarbageCollected<VTTElement>(node_type, document); } Element* VTTElement::CloneWithoutAttributesAndChildren( @@ -88,39 +88,39 @@ HTMLElement* VTTElement::CreateEquivalentHTMLElement(Document& document) { case kVTTNodeTypeClass: case kVTTNodeTypeLanguage: case kVTTNodeTypeVoice: - html_element = document.CreateRawElement(HTMLNames::spanTag, + html_element = document.CreateRawElement(html_names::kSpanTag, CreateElementFlags::ByParser()); - html_element->setAttribute(HTMLNames::titleAttr, + html_element->setAttribute(html_names::kTitleAttr, getAttribute(VoiceAttributeName())); - html_element->setAttribute(HTMLNames::langAttr, + html_element->setAttribute(html_names::kLangAttr, getAttribute(LangAttributeName())); break; case kVTTNodeTypeItalic: - html_element = document.CreateRawElement(HTMLNames::iTag, + html_element = document.CreateRawElement(html_names::kITag, CreateElementFlags::ByParser()); break; case kVTTNodeTypeBold: - html_element = document.CreateRawElement(HTMLNames::bTag, + html_element = document.CreateRawElement(html_names::kBTag, CreateElementFlags::ByParser()); break; case kVTTNodeTypeUnderline: - html_element = document.CreateRawElement(HTMLNames::uTag, + html_element = document.CreateRawElement(html_names::kUTag, CreateElementFlags::ByParser()); break; case kVTTNodeTypeRuby: - html_element = document.CreateRawElement(HTMLNames::rubyTag, + html_element = document.CreateRawElement(html_names::kRubyTag, CreateElementFlags::ByParser()); break; case kVTTNodeTypeRubyText: - html_element = document.CreateRawElement(HTMLNames::rtTag, + html_element = document.CreateRawElement(html_names::kRtTag, CreateElementFlags::ByParser()); break; default: NOTREACHED(); } - html_element->setAttribute(HTMLNames::classAttr, - getAttribute(HTMLNames::classAttr)); + html_element->setAttribute(html_names::kClassAttr, + getAttribute(html_names::kClassAttr)); return ToHTMLElement(html_element); } @@ -132,7 +132,7 @@ void VTTElement::SetIsPastNode(bool is_past_node) { SetNeedsStyleRecalc( kLocalStyleChange, StyleChangeReasonForTracing::CreateWithExtraData( - StyleChangeReason::kPseudoClass, StyleChangeExtraData::g_past)); + style_change_reason::kPseudoClass, style_change_extra_data::g_past)); } } // namespace blink diff --git a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_element.h b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_element.h index d7abc856c1c..7e4f9f3fe0b 100644 --- a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_element.h +++ b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_element.h @@ -48,6 +48,9 @@ class VTTElement final : public Element { static VTTElement* Create(const QualifiedName&, Document*); HTMLElement* CreateEquivalentHTMLElement(Document&); + VTTElement(const QualifiedName&, Document*); + VTTElement(VTTNodeType, Document*); + Element* CloneWithoutAttributesAndChildren(Document&) const override; void SetVTTNodeType(VTTNodeType type) { @@ -77,9 +80,6 @@ class VTTElement final : public Element { } private: - VTTElement(const QualifiedName&, Document*); - VTTElement(VTTNodeType, Document*); - unsigned is_past_node_ : 1; unsigned web_vtt_node_type_ : 4; diff --git a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_parser.cc b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_parser.cc index 4a36c646621..42c93811aa4 100644 --- a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_parser.cc +++ b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_parser.cc @@ -45,7 +45,7 @@ namespace blink { -using namespace HTMLNames; +using namespace html_names; const unsigned kFileIdentifierLength = 6; const unsigned kRegionIdentifierLength = 6; @@ -542,7 +542,7 @@ void VTTTreeBuilder::ConstructTreeFromToken(Document& document) { VTTElement* child = VTTElement::Create(node_type, &document); if (!token_.Classes().IsEmpty()) - child->setAttribute(classAttr, token_.Classes()); + child->setAttribute(kClassAttr, token_.Classes()); if (node_type == kVTTNodeTypeVoice) { child->setAttribute(VTTElement::VoiceAttributeName(), diff --git a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_parser.h b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_parser.h index e3ef84fd4ab..209228dc495 100644 --- a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_parser.h +++ b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_parser.h @@ -71,14 +71,16 @@ class VTTParser final : public GarbageCollectedFinalized<VTTParser> { }; static VTTParser* Create(VTTParserClient* client, Document& document) { - return new VTTParser(client, document); + return MakeGarbageCollected<VTTParser>(client, document); } + + VTTParser(VTTParserClient*, Document&); ~VTTParser() = default; static inline bool IsRecognizedTag(const AtomicString& tag_name) { - return tag_name == HTMLNames::iTag || tag_name == HTMLNames::bTag || - tag_name == HTMLNames::uTag || tag_name == HTMLNames::rubyTag || - tag_name == HTMLNames::rtTag; + return tag_name == html_names::kITag || tag_name == html_names::kBTag || + tag_name == html_names::kUTag || tag_name == html_names::kRubyTag || + tag_name == html_names::kRtTag; } static inline bool IsASpace(UChar c) { // WebVTT space characters are U+0020 SPACE, U+0009 CHARACTER @@ -113,8 +115,6 @@ class VTTParser final : public GarbageCollectedFinalized<VTTParser> { void Trace(blink::Visitor*); private: - VTTParser(VTTParserClient*, Document&); - Member<Document> document_; ParseState state_; diff --git a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_region.cc b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_region.cc index bf337576d58..44d1347d995 100644 --- a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_region.cc +++ b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_region.cc @@ -94,7 +94,7 @@ VTTRegion::VTTRegion() viewport_anchor_(DoublePoint(kDefaultAnchorPointX, kDefaultAnchorPointY)), scroll_(kDefaultScroll), current_top_(0), - scroll_timer_(Platform::Current()->CurrentThread()->GetTaskRunner(), + scroll_timer_(Thread::Current()->GetTaskRunner(), this, &VTTRegion::ScrollTimerFired) {} diff --git a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_region.h b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_region.h index 320934d34f3..44958e7088c 100644 --- a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_region.h +++ b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_region.h @@ -49,8 +49,9 @@ class VTTRegion final : public ScriptWrappable { DEFINE_WRAPPERTYPEINFO(); public: - static VTTRegion* Create() { return new VTTRegion; } + static VTTRegion* Create() { return MakeGarbageCollected<VTTRegion>(); } + VTTRegion(); ~VTTRegion() override; const String& id() const { return id_; } @@ -90,8 +91,6 @@ class VTTRegion final : public ScriptWrappable { void Trace(blink::Visitor*) override; private: - VTTRegion(); - void PrepareRegionDisplayTree(); // The timer is needed to continue processing when cue scrolling ended. diff --git a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_scanner.cc b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_scanner.cc index 95d3acebfcc..a6ded6dd91d 100644 --- a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_scanner.cc +++ b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_scanner.cc @@ -33,8 +33,8 @@ namespace blink { -VTTScanner::VTTScanner(const String& line) : is8_bit_(line.Is8Bit()) { - if (is8_bit_) { +VTTScanner::VTTScanner(const String& line) : is_8bit_(line.Is8Bit()) { + if (is_8bit_) { data_.characters8 = line.Characters8(); end_.characters8 = data_.characters8 + line.length(); } else { @@ -52,13 +52,13 @@ bool VTTScanner::Scan(char c) { bool VTTScanner::Scan(const LChar* characters, wtf_size_t characters_count) { wtf_size_t match_length = - is8_bit_ + is_8bit_ ? static_cast<wtf_size_t>(end_.characters8 - data_.characters8) : static_cast<wtf_size_t>(end_.characters16 - data_.characters16); if (match_length < characters_count) return false; bool matched; - if (is8_bit_) + if (is_8bit_) matched = WTF::Equal(data_.characters8, characters, characters_count); else matched = WTF::Equal(data_.characters16, characters, characters_count); @@ -76,7 +76,7 @@ bool VTTScanner::ScanRun(const Run& run, const String& to_match) { if (to_match.length() > match_length) return false; bool matched; - if (is8_bit_) + if (is_8bit_) matched = WTF::Equal(to_match.Impl(), data_.characters8, match_length); else matched = WTF::Equal(to_match.Impl(), data_.characters16, match_length); @@ -98,7 +98,7 @@ String VTTScanner::ExtractString(const Run& run) { DCHECK_GE(run.end(), run.Start()); DCHECK_LE(run.end(), end()); String s; - if (is8_bit_) + if (is_8bit_) s = String(data_.characters8, run.length()); else s = String(data_.characters16, run.length()); @@ -107,7 +107,7 @@ String VTTScanner::ExtractString(const Run& run) { } String VTTScanner::RestOfInputAsString() { - Run rest(GetPosition(), end(), is8_bit_); + Run rest(GetPosition(), end(), is_8bit_); return ExtractString(rest); } @@ -119,7 +119,7 @@ unsigned VTTScanner::ScanDigits(unsigned& number) { } bool valid_number; wtf_size_t num_digits = run_of_digits.length(); - if (is8_bit_) { + if (is_8bit_) { number = CharactersToUInt(data_.characters8, num_digits, WTF::NumberParsingOptions::kNone, &valid_number); } else { @@ -141,7 +141,7 @@ unsigned VTTScanner::ScanDigits(unsigned& number) { bool VTTScanner::ScanDouble(double& number) { Run integer_run = CollectWhile<IsASCIIDigit>(); SeekTo(integer_run.end()); - Run decimal_run(GetPosition(), GetPosition(), is8_bit_); + Run decimal_run(GetPosition(), GetPosition(), is_8bit_); if (Scan('.')) { decimal_run = CollectWhile<IsASCIIDigit>(); SeekTo(decimal_run.end()); @@ -155,9 +155,9 @@ bool VTTScanner::ScanDouble(double& number) { } size_t length_of_double = - Run(integer_run.Start(), GetPosition(), is8_bit_).length(); + Run(integer_run.Start(), GetPosition(), is_8bit_).length(); bool valid_number; - if (is8_bit_) { + if (is_8bit_) { number = CharactersToDouble(integer_run.Start(), length_of_double, &valid_number); } else { diff --git a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_scanner.h b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_scanner.h index 2532e7ce8da..a84847617d5 100644 --- a/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_scanner.h +++ b/chromium/third_party/blink/renderer/core/html/track/vtt/vtt_scanner.h @@ -61,8 +61,8 @@ class CORE_EXPORT VTTScanner { STACK_ALLOCATED(); public: - Run(Position start, Position end, bool is8_bit) - : start_(start), end_(end), is8_bit_(is8_bit) {} + Run(Position start, Position end, bool is_8bit) + : start_(start), end_(end), is_8bit_(is_8bit) {} Position Start() const { return start_; } Position end() const { return end_; } @@ -73,7 +73,7 @@ class CORE_EXPORT VTTScanner { private: Position start_; Position end_; - bool is8_bit_; + bool is_8bit_; }; // Check if the input pointer points at the specified position. @@ -161,13 +161,13 @@ class CORE_EXPORT VTTScanner { const LChar* characters8; const UChar* characters16; } end_; - bool is8_bit_; + bool is_8bit_; DISALLOW_COPY_AND_ASSIGN(VTTScanner); }; inline wtf_size_t VTTScanner::Run::length() const { - if (is8_bit_) + if (is_8bit_) return static_cast<wtf_size_t>(end_ - start_); return static_cast<wtf_size_t>(reinterpret_cast<const UChar*>(end_) - reinterpret_cast<const UChar*>(start_)); @@ -180,7 +180,7 @@ inline bool VTTScanner::Scan(const char (&characters)[charactersCount]) { template <bool characterPredicate(UChar)> inline void VTTScanner::SkipWhile() { - if (is8_bit_) + if (is_8bit_) WTF::SkipWhile<LChar, LCharPredicateAdapter<characterPredicate>>( data_.characters8, end_.characters8); else @@ -190,7 +190,7 @@ inline void VTTScanner::SkipWhile() { template <bool characterPredicate(UChar)> inline void VTTScanner::SkipUntil() { - if (is8_bit_) + if (is_8bit_) WTF::SkipUntil<LChar, LCharPredicateAdapter<characterPredicate>>( data_.characters8, end_.characters8); else @@ -200,28 +200,28 @@ inline void VTTScanner::SkipUntil() { template <bool characterPredicate(UChar)> inline VTTScanner::Run VTTScanner::CollectWhile() { - if (is8_bit_) { + if (is_8bit_) { const LChar* current = data_.characters8; WTF::SkipWhile<LChar, LCharPredicateAdapter<characterPredicate>>( current, end_.characters8); - return Run(GetPosition(), current, is8_bit_); + return Run(GetPosition(), current, is_8bit_); } const UChar* current = data_.characters16; WTF::SkipWhile<UChar, characterPredicate>(current, end_.characters16); - return Run(GetPosition(), reinterpret_cast<Position>(current), is8_bit_); + return Run(GetPosition(), reinterpret_cast<Position>(current), is_8bit_); } template <bool characterPredicate(UChar)> inline VTTScanner::Run VTTScanner::CollectUntil() { - if (is8_bit_) { + if (is_8bit_) { const LChar* current = data_.characters8; WTF::SkipUntil<LChar, LCharPredicateAdapter<characterPredicate>>( current, end_.characters8); - return Run(GetPosition(), current, is8_bit_); + return Run(GetPosition(), current, is_8bit_); } const UChar* current = data_.characters16; WTF::SkipUntil<UChar, characterPredicate>(current, end_.characters16); - return Run(GetPosition(), reinterpret_cast<Position>(current), is8_bit_); + return Run(GetPosition(), reinterpret_cast<Position>(current), is_8bit_); } inline void VTTScanner::SeekTo(Position position) { @@ -231,12 +231,12 @@ inline void VTTScanner::SeekTo(Position position) { inline UChar VTTScanner::CurrentChar() const { DCHECK_LT(GetPosition(), end()); - return is8_bit_ ? *data_.characters8 : *data_.characters16; + return is_8bit_ ? *data_.characters8 : *data_.characters16; } inline void VTTScanner::Advance(unsigned amount) { DCHECK_LT(GetPosition(), end()); - if (is8_bit_) + if (is_8bit_) data_.characters8 += amount; else data_.characters16 += amount; |