Source/core/html/shadow/MediaControls.h - Issue 291163004: Implement media cast buttons

Side by Side Diff: Source/core/html/shadow/MediaControls.h

Issue 291163004: Implement media cast buttons (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Tidy up button name Created 6 years, 4 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

« Source/core/html/shadow/MediaControlElements.cpp ('K') | « Source/core/html/shadow/MediaControlElements.cpp ('k') | Source/core/html/shadow/MediaControls.cpp » ('j') | Source/core/html/shadow/MediaControls.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.	2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.

3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.	3 * Copyright (C) 2011, 2012 Google 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 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57	57

58 void updateVolume();	58 void updateVolume();

59	59

60 void changedClosedCaptionsVisibility();	60 void changedClosedCaptionsVisibility();

61 void refreshClosedCaptionsButtonVisibility();	61 void refreshClosedCaptionsButtonVisibility();

62 void closedCaptionTracksChanged();	62 void closedCaptionTracksChanged();

63	63

64 void enteredFullscreen();	64 void enteredFullscreen();

65 void exitedFullscreen();	65 void exitedFullscreen();

66	66

	67 void startedCasting();

	68 void stoppedCasting();

	69

67 void updateTextTrackDisplay();	70 void updateTextTrackDisplay();

68	71

69 void mediaElementFocused();	72 void mediaElementFocused();

70	73

	74 void refreshCastButtonVisibility();
	acolwell GONE FROM CHROMIUM 2014/08/05 19:36:34 nit: Put this near the other functions related to nit: Put this near the other functions related to casting. aberent 2014/08/22 14:08:34 Done. Show quoted text On 2014/08/05 19:36:34, acolwell wrote: > nit: Put this near the other functions related to casting. Done.
	75

71 virtual void trace(Visitor*) OVERRIDE;	76 virtual void trace(Visitor*) OVERRIDE;

72	77

73 private:	78 private:

74 explicit MediaControls(HTMLMediaElement&);	79 explicit MediaControls(HTMLMediaElement&);

75	80

76 bool initializeControls();	81 bool initializeControls();

77	82

78 void makeOpaque();	83 void makeOpaque();

79 void makeTransparent();	84 void makeTransparent();

80	85

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
114 // Media control elements.	119 // Media control elements.

115 RawPtrWillBeMember<MediaControlOverlayPlayButtonElement> m_overlayPlayButton ;	120 RawPtrWillBeMember<MediaControlOverlayPlayButtonElement> m_overlayPlayButton ;

116 RawPtrWillBeMember<MediaControlOverlayEnclosureElement> m_overlayEnclosure;	121 RawPtrWillBeMember<MediaControlOverlayEnclosureElement> m_overlayEnclosure;

117 RawPtrWillBeMember<MediaControlPlayButtonElement> m_playButton;	122 RawPtrWillBeMember<MediaControlPlayButtonElement> m_playButton;

118 RawPtrWillBeMember<MediaControlCurrentTimeDisplayElement> m_currentTimeDispl ay;	123 RawPtrWillBeMember<MediaControlCurrentTimeDisplayElement> m_currentTimeDispl ay;

119 RawPtrWillBeMember<MediaControlTimelineElement> m_timeline;	124 RawPtrWillBeMember<MediaControlTimelineElement> m_timeline;

120 RawPtrWillBeMember<MediaControlMuteButtonElement> m_muteButton;	125 RawPtrWillBeMember<MediaControlMuteButtonElement> m_muteButton;

121 RawPtrWillBeMember<MediaControlVolumeSliderElement> m_volumeSlider;	126 RawPtrWillBeMember<MediaControlVolumeSliderElement> m_volumeSlider;

122 RawPtrWillBeMember<MediaControlToggleClosedCaptionsButtonElement> m_toggleCl osedCaptionsButton;	127 RawPtrWillBeMember<MediaControlToggleClosedCaptionsButtonElement> m_toggleCl osedCaptionsButton;

123 RawPtrWillBeMember<MediaControlFullscreenButtonElement> m_fullScreenButton;	128 RawPtrWillBeMember<MediaControlFullscreenButtonElement> m_fullScreenButton;

	129 RawPtrWillBeMember<MediaControlCastButtonElement> m_castButton;

	130 RawPtrWillBeMember<MediaControlOverlayCastButtonElement> m_overlayCastButton ;

124 RawPtrWillBeMember<MediaControlTimeRemainingDisplayElement> m_durationDispla y;	131 RawPtrWillBeMember<MediaControlTimeRemainingDisplayElement> m_durationDispla y;

125 RawPtrWillBeMember<MediaControlPanelEnclosureElement> m_enclosure;	132 RawPtrWillBeMember<MediaControlPanelEnclosureElement> m_enclosure;

126	133

127 Timer<MediaControls> m_hideMediaControlsTimer;	134 Timer<MediaControls> m_hideMediaControlsTimer;

128 bool m_isMouseOverControls : 1;	135 bool m_isMouseOverControls : 1;

129 bool m_isPausedForScrubbing : 1;	136 bool m_isPausedForScrubbing : 1;

130 };	137 };

131	138

132 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls());	139 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls());

133	140

134 }	141 }

135	142

136 #endif	143 #endif

OLD	NEW