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

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

Issue 201123004: Ignore MediaController in the closed captions button logic (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/html/MediaController.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) 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 { } 88 virtual void enterFullscreen() OVERRIDE { }
89 89
90 virtual bool hasAudio() const OVERRIDE; 90 virtual bool hasAudio() const OVERRIDE;
91 virtual bool hasVideo() const OVERRIDE; 91 virtual bool hasVideo() const OVERRIDE;
92 virtual bool hasClosedCaptions() const OVERRIDE;
93 virtual void setClosedCaptionsVisible(bool) OVERRIDE;
94 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;
102 99
103 void clearExecutionContext() { m_executionContext = 0; } 100 void clearExecutionContext() { m_executionContext = 0; }
104 101
(...skipping 22 matching lines...) Expand all
127 bool m_paused; 124 bool m_paused;
128 double m_defaultPlaybackRate; 125 double m_defaultPlaybackRate;
129 double m_volume; 126 double m_volume;
130 mutable double m_position; 127 mutable double m_position;
131 bool m_muted; 128 bool m_muted;
132 ReadyState m_readyState; 129 ReadyState m_readyState;
133 PlaybackState m_playbackState; 130 PlaybackState m_playbackState;
134 Vector<RefPtr<Event> > m_pendingEvents; 131 Vector<RefPtr<Event> > m_pendingEvents;
135 Timer<MediaController> m_asyncEventTimer; 132 Timer<MediaController> m_asyncEventTimer;
136 mutable Timer<MediaController> m_clearPositionTimer; 133 mutable Timer<MediaController> m_clearPositionTimer;
137 bool m_closedCaptionsVisible;
138 OwnPtr<Clock> m_clock; 134 OwnPtr<Clock> m_clock;
139 ExecutionContext* m_executionContext; 135 ExecutionContext* m_executionContext;
140 Timer<MediaController> m_timeupdateTimer; 136 Timer<MediaController> m_timeupdateTimer;
141 double m_previousTimeupdateTime; 137 double m_previousTimeupdateTime;
142 }; 138 };
143 139
144 } // namespace WebCore 140 } // namespace WebCore
145 141
146 #endif 142 #endif
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/html/MediaController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698