Source/core/html/MediaController.h - Issue 196793021: Ignore MediaController in the video fullscreen button logic

Side by Side Diff: Source/core/html/MediaController.h

Issue 196793021: Ignore MediaController in the video fullscreen button logic (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: rebase Created 6 years, 9 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 | Annotate | Revision Log

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011 Apple Inc. All rights reserved.	2 * Copyright (C) 2011 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 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
78	78

79 virtual bool muted() const OVERRIDE { return m_muted; }	79 virtual bool muted() const OVERRIDE { return m_muted; }

80 virtual void setMuted(bool) OVERRIDE;	80 virtual void setMuted(bool) OVERRIDE;

81	81

82 typedef HTMLMediaElement::ReadyState ReadyState;	82 typedef HTMLMediaElement::ReadyState ReadyState;

83 ReadyState readyState() const { return m_readyState; }	83 ReadyState readyState() const { return m_readyState; }

84	84

85 enum PlaybackState { WAITING, PLAYING, ENDED };	85 enum PlaybackState { WAITING, PLAYING, ENDED };

86 const AtomicString& playbackState() const;	86 const AtomicString& playbackState() const;

87	87

88 virtual void enterFullscreen() OVERRIDE { }

89

90 virtual bool hasAudio() const OVERRIDE;	88 virtual bool hasAudio() const OVERRIDE;

91 virtual bool hasVideo() const OVERRIDE;

92 virtual bool hasClosedCaptions() const OVERRIDE;	89 virtual bool hasClosedCaptions() const OVERRIDE;

93 virtual void setClosedCaptionsVisible(bool) OVERRIDE;	90 virtual void setClosedCaptionsVisible(bool) OVERRIDE;

94 virtual bool closedCaptionsVisible() const OVERRIDE { return m_closedCaption sVisible; }	91 virtual bool closedCaptionsVisible() const OVERRIDE { return m_closedCaption sVisible; }

95	92

96 virtual void beginScrubbing() OVERRIDE;	93 virtual void beginScrubbing() OVERRIDE;

97 virtual void endScrubbing() OVERRIDE;	94 virtual void endScrubbing() OVERRIDE;

98	95

99 virtual bool canPlay() const OVERRIDE;	96 virtual bool canPlay() const OVERRIDE;

100	97

101 bool isBlocked() const;	98 bool isBlocked() const;

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
137 bool m_closedCaptionsVisible;	134 bool m_closedCaptionsVisible;

138 OwnPtr<Clock> m_clock;	135 OwnPtr<Clock> m_clock;

139 ExecutionContext* m_executionContext;	136 ExecutionContext* m_executionContext;

140 Timer<MediaController> m_timeupdateTimer;	137 Timer<MediaController> m_timeupdateTimer;

141 double m_previousTimeupdateTime;	138 double m_previousTimeupdateTime;

142 };	139 };

143	140

144 } // namespace WebCore	141 } // namespace WebCore

145	142

146 #endif	143 #endif

OLD	NEW

« LayoutTests/media/video-controls-fullscreen.js ('K') | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/html/MediaController.cpp » ('j') | no next file with comments »