| Index: third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.h b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| index 398261d8050064351961621bbb08c804255e1de3..03867a1ae2c128c77753bf2700d060d68ac19aca 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| +++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| @@ -1,5 +1,6 @@
|
| /*
|
| - * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
|
| + * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights
|
| + * reserved.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions
|
| @@ -216,7 +217,8 @@ class CORE_EXPORT HTMLMediaElement : public HTMLElement,
|
| void textTracksChanged();
|
| void notifyMediaPlayerOfTextTrackChanges();
|
|
|
| - // Implements the "forget the media element's media-resource-specific tracks" algorithm in the HTML5 spec.
|
| + // Implements the "forget the media element's media-resource-specific tracks"
|
| + // algorithm in the HTML5 spec.
|
| void forgetResourceSpecificTracks();
|
|
|
| void didAddTrackElement(HTMLTrackElement*);
|
| @@ -289,7 +291,8 @@ class CORE_EXPORT HTMLMediaElement : public HTMLElement,
|
| // Returns the "effective media volume" value as specified in the HTML5 spec.
|
| double effectiveMediaVolume() const;
|
|
|
| - // Predicates also used when dispatching wrapper creation (cf. [SpecialWrapFor] IDL attribute usage.)
|
| + // Predicates also used when dispatching wrapper creation (cf.
|
| + // [SpecialWrapFor] IDL attribute usage.)
|
| virtual bool isHTMLAudioElement() const { return false; }
|
| virtual bool isHTMLVideoElement() const { return false; }
|
|
|
| @@ -397,9 +400,8 @@ class CORE_EXPORT HTMLMediaElement : public HTMLElement,
|
| void checkIfSeekNeeded();
|
| void addPlayedRange(double start, double end);
|
|
|
| - void scheduleEvent(
|
| - const AtomicString&
|
| - eventName); // FIXME: Rename to scheduleNamedEvent for clarity.
|
| + // FIXME: Rename to scheduleNamedEvent for clarity.
|
| + void scheduleEvent(const AtomicString& eventName);
|
|
|
| // loading
|
| void invokeLoadAlgorithm();
|
| @@ -451,8 +453,9 @@ class CORE_EXPORT HTMLMediaElement : public HTMLElement,
|
| bool stoppedDueToErrors() const;
|
| bool couldPlayIfEnoughData() const;
|
|
|
| - // Generally the presence of the loop attribute should be considered to mean playback
|
| - // has not "ended", as "ended" and "looping" are mutually exclusive. See
|
| + // Generally the presence of the loop attribute should be considered to mean
|
| + // playback has not "ended", as "ended" and "looping" are mutually exclusive.
|
| + // See
|
| // https://html.spec.whatwg.org/multipage/embedded-content.html#ended-playback
|
| enum class LoopCondition { Included, Ignored };
|
| bool endedPlayback(LoopCondition = LoopCondition::Included) const;
|
| @@ -480,10 +483,11 @@ class CORE_EXPORT HTMLMediaElement : public HTMLElement,
|
| enum DirectionOfPlayback { Backward, Forward };
|
| DirectionOfPlayback getDirectionOfPlayback() const;
|
|
|
| - // Creates placeholder AudioTrack and/or VideoTrack objects when WebMemediaPlayer objects
|
| - // advertise they have audio and/or video, but don't explicitly signal them via
|
| - // addAudioTrack() and addVideoTrack().
|
| - // FIXME: Remove this once all WebMediaPlayer implementations properly report their track info.
|
| + // Creates placeholder AudioTrack and/or VideoTrack objects when
|
| + // WebMemediaPlayer objects advertise they have audio and/or video, but don't
|
| + // explicitly signal them via addAudioTrack() and addVideoTrack().
|
| + // FIXME: Remove this once all WebMediaPlayer implementations properly report
|
| + // their track info.
|
| void createPlaceholderTracksIfNecessary();
|
|
|
| // Sets the selected/enabled tracks if they aren't set before we initially
|
| @@ -647,7 +651,8 @@ class CORE_EXPORT HTMLMediaElement : public HTMLElement,
|
| ExceptionCode m_playPromiseErrorCode;
|
|
|
| // This is a weak reference, since m_audioSourceNode holds a reference to us.
|
| - // TODO(Oilpan): Consider making this a strongly traced pointer with oilpan where strong cycles are not a problem.
|
| + // TODO(Oilpan): Consider making this a strongly traced pointer with oilpan
|
| + // where strong cycles are not a problem.
|
| GC_PLUGIN_IGNORE("http://crbug.com/404577")
|
| WeakMember<AudioSourceProviderClient> m_audioSourceNode;
|
|
|
|
|