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

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

Issue 1417683004: Media controls refer to less magic state. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added sliders and whitespace. Created 5 years, 1 month 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) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 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 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 // Sets the selected/enabled tracks if they aren't set before we initially 435 // Sets the selected/enabled tracks if they aren't set before we initially
436 // transition to HAVE_METADATA. 436 // transition to HAVE_METADATA.
437 void selectInitialTracksIfNecessary(); 437 void selectInitialTracksIfNecessary();
438 438
439 // Return true if and only if we require a user gesture before letting 439 // Return true if and only if we require a user gesture before letting
440 // the media play. 440 // the media play.
441 bool isUserGestureRequiredForPlay() const; 441 bool isUserGestureRequiredForPlay() const;
442 void removeUserGestureRequirement(); 442 void removeUserGestureRequirement();
443 void setInitialPlayWithoutUserGestures(bool); 443 void setInitialPlayWithoutUserGestures(bool);
444 444
445 void setNetworkState(NetworkState);
446
445 void audioTracksTimerFired(Timer<HTMLMediaElement>*); 447 void audioTracksTimerFired(Timer<HTMLMediaElement>*);
446 448
447 Timer<HTMLMediaElement> m_loadTimer; 449 Timer<HTMLMediaElement> m_loadTimer;
448 Timer<HTMLMediaElement> m_progressEventTimer; 450 Timer<HTMLMediaElement> m_progressEventTimer;
449 Timer<HTMLMediaElement> m_playbackProgressTimer; 451 Timer<HTMLMediaElement> m_playbackProgressTimer;
450 Timer<HTMLMediaElement> m_audioTracksTimer; 452 Timer<HTMLMediaElement> m_audioTracksTimer;
451 PersistentWillBeMember<TimeRanges> m_playedTimeRanges; 453 PersistentWillBeMember<TimeRanges> m_playedTimeRanges;
452 OwnPtrWillBeMember<GenericEventQueue> m_asyncEventQueue; 454 OwnPtrWillBeMember<GenericEventQueue> m_asyncEventQueue;
453 455
454 double m_playbackRate; 456 double m_playbackRate;
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 inline bool isHTMLMediaElement(const HTMLElement& element) 625 inline bool isHTMLMediaElement(const HTMLElement& element)
624 { 626 {
625 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 627 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
626 } 628 }
627 629
628 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 630 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
629 631
630 } // namespace blink 632 } // namespace blink
631 633
632 #endif // HTMLMediaElement_h 634 #endif // HTMLMediaElement_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698