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

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

Issue 2018813002: Split Media.Controls.Show in .Video and .Audio. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743
Patch Set: Created 4 years, 7 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 29 matching lines...) Expand all
40 #include "public/platform/WebAudioSourceProviderClient.h" 40 #include "public/platform/WebAudioSourceProviderClient.h"
41 #include "public/platform/WebMediaPlayerClient.h" 41 #include "public/platform/WebMediaPlayerClient.h"
42 #include "public/platform/WebMimeRegistry.h" 42 #include "public/platform/WebMimeRegistry.h"
43 43
44 namespace blink { 44 namespace blink {
45 45
46 class AudioSourceProviderClient; 46 class AudioSourceProviderClient;
47 class AudioTrackList; 47 class AudioTrackList;
48 class ContentType; 48 class ContentType;
49 class CueTimeline; 49 class CueTimeline;
50 class EnumerationHistogram;
50 class Event; 51 class Event;
51 class ExceptionState; 52 class ExceptionState;
52 class HTMLSourceElement; 53 class HTMLSourceElement;
53 class HTMLTrackElement; 54 class HTMLTrackElement;
54 class KURL; 55 class KURL;
55 class MediaControls; 56 class MediaControls;
56 class MediaError; 57 class MediaError;
57 class MediaStreamDescriptor; 58 class MediaStreamDescriptor;
58 class HTMLMediaSource; 59 class HTMLMediaSource;
59 class ScriptState; 60 class ScriptState;
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 void scheduleResolvePlayPromises(); 478 void scheduleResolvePlayPromises();
478 void scheduleRejectPlayPromises(ExceptionCode); 479 void scheduleRejectPlayPromises(ExceptionCode);
479 void scheduleNotifyPlaying(); 480 void scheduleNotifyPlaying();
480 481
481 void resolvePlayPromises(); 482 void resolvePlayPromises();
482 // TODO(mlamouri): this is used for cancellable tasks because we can't pass 483 // TODO(mlamouri): this is used for cancellable tasks because we can't pass
483 // parameters. 484 // parameters.
484 void rejectPlayPromises(); 485 void rejectPlayPromises();
485 void rejectPlayPromises(ExceptionCode, const String&); 486 void rejectPlayPromises(ExceptionCode, const String&);
486 487
488 EnumerationHistogram& showControlsHistogram() const;
489
487 UnthrottledTimer<HTMLMediaElement> m_loadTimer; 490 UnthrottledTimer<HTMLMediaElement> m_loadTimer;
488 UnthrottledTimer<HTMLMediaElement> m_progressEventTimer; 491 UnthrottledTimer<HTMLMediaElement> m_progressEventTimer;
489 UnthrottledTimer<HTMLMediaElement> m_playbackProgressTimer; 492 UnthrottledTimer<HTMLMediaElement> m_playbackProgressTimer;
490 UnthrottledTimer<HTMLMediaElement> m_audioTracksTimer; 493 UnthrottledTimer<HTMLMediaElement> m_audioTracksTimer;
491 Member<TimeRanges> m_playedTimeRanges; 494 Member<TimeRanges> m_playedTimeRanges;
492 Member<GenericEventQueue> m_asyncEventQueue; 495 Member<GenericEventQueue> m_asyncEventQueue;
493 496
494 double m_playbackRate; 497 double m_playbackRate;
495 double m_defaultPlaybackRate; 498 double m_defaultPlaybackRate;
496 NetworkState m_networkState; 499 NetworkState m_networkState;
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 inline bool isHTMLMediaElement(const HTMLElement& element) 668 inline bool isHTMLMediaElement(const HTMLElement& element)
666 { 669 {
667 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 670 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
668 } 671 }
669 672
670 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 673 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
671 674
672 } // namespace blink 675 } // namespace blink
673 676
674 #endif // HTMLMediaElement_h 677 #endif // HTMLMediaElement_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698